Revert "Replace create_standalone_js.py with a custom GWT linker"

build.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!--
  Copyright 2014 The Chromium Authors. All rights reserved.
  Use of this source code is governed by a BSD-style license that can be
  found in the LICENSE file.
 -->
 <project name="DomDistiller" default="build" basedir=".">
   <property environment="env"/>
   <!-- Arguments to gwtc and devmode targets -->
   <property name="gwt.args" value="-XclosureCompiler -XnoclassMetadata -XnocheckCasts -style OBF" />
@@ skipping 115 matching lines @@
       <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
       <jvmarg value="-Xmx256M"/>
       <!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->
       <arg line="${gwt.shared.args}"/>
       <arg line="${gwt.args}"/>
       <arg line="${gwt.custom.args}"/>
       <arg value="DomDistiller"/>
     </java>
   </target>
 
-  <target name="extractwrappedjs" depends="gwtc"
+  <target name="extractjs" depends="gwtc" description="Extract standalone JavaScript from compiled JavaScript">
+    <exec executable="python" failonerror="true">
+      <arg value="create_standalone_js.py"/>
+      <arg line="--module domdistiller"/>
+      <arg value="--auto"/>
+    </exec>
+  </target>
+
+  <target name="extractwrappedjs" depends="extractjs"
       description="Create wrapped standalone JavaScript from compiled JavaScript for direct inclusion in Chrome">
     <exec executable="python" failonerror="true">
       <arg value="create_wrapped_standalone_js.py"/>
       <arg value="--templatefile=war/wrapped_domdistiller_template.js"/>
-      <arg value="--infile=war/domdistiller/domdistiller.nocache.js"/>
+      <arg value="--infile=out/domdistiller.js"/>
       <arg value="--outfile=out/domdistiller_wrapped.js"/>
     </exec>
   </target>
 
-  <target name="package" depends="gwtc, extractwrappedjs, gwtc.jstests"
+  <target name="package" depends="extractjs, extractwrappedjs, extractjs.jstests"
       description="Copy the main build artifacts into the out/package directory" >
     <mkdir dir="out/extension"/>
     <mkdir dir="out/package"/>
     <mkdir dir="out/package/js"/>
     <mkdir dir="out/package/proto"/>
     <mkdir dir="out/package/python"/>
     <mkdir dir="out/package/test"/>
     <mkdir dir="out/package/test/data"/>
+    <mkdir dir="out/package/test/data/out"/>
     <mkdir dir="out/package/test/data/war"/>
 
-    <copy file="war/domdistiller/domdistiller.nocache.js" tofile="out/package/js/domdistiller.js" />
+    <copy file="out/domdistiller.js" todir="out/package/js" />
     <copy file="out/domdistiller_wrapped.js" todir="out/package/js" />
     <copy todir="out/package/proto">
       <fileset dir="proto"/>
     </copy>
     <copy file="out/proto/python/google/protobuf/compiler/plugin_pb2.py" todir="out/package/python" />
 
-    <copy file="war/domdistiller/domdistiller.nocache.js" tofile="out/extension/domdistiller.js" />
+    <copy file="out/domdistiller.js" todir="out/extension" />
     <copy todir="out/extension">
       <fileset dir="extension"/>
     </copy>
 
-    <copy file="war/domdistillerjstest/domdistillerjstest.nocache.js" todir="out/package/test/data/war/domdistillerjstest" />
+    <copy file="out/domdistillerjstest.js" todir="out/package/test/data/out" />
     <copy file="war/test.html" todir="out/package/test/data/war" />
   </target>
 
 
   <target name="protoc.tests" depends="protoc.plugin.base" description="Generate test proto code">
     <mkdir dir="out/test/proto" />
     <apply executable="protoc" failonerror="true" relative="true">
       <arg value="--plugin=protoc-gen-gwt_overlay=protoc_plugins/gwt_overlay.py"/>
       <arg value="--gwt_overlay_out=out/test/proto"/>
       <arg value="--proto_path=test/proto"/>
@@ skipping 27 matching lines @@
       <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
       <jvmarg value="-Xmx256M"/>
       <!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->
       <arg line="${gwt.shared.args}"/>
       <arg line="${gwt.test.args}"/>
       <arg line="${gwt.custom.args}"/>
       <arg value="DomDistillerJsTest"/>
     </java>
   </target>
 
+  <target name="extractjs.jstests" depends="gwtc.jstests" description="Extract standalone JavaScript from compiled JavaScript">
+    <exec executable="python" failonerror="true">
+      <arg value="create_standalone_js.py"/>
+      <arg line="--module domdistillerjstest"/>
+      <arg value="--auto"/>
+      <arg value="--sourcemaps"/>
+    </exec>
+  </target>
 
   <!-- Run jstests for the Linux platform -->
   <target name="-jstests.linux" if="isLinux">
     <exec executable="xvfb-run" failonerror="true">
       <env key="PATH" path="${basedir}/buildtools:${env.PATH}"/>
       <arg value="--auto-servernum"/>
       <arg value="-s"/>
       <arg value="-screen 0 1024x768x24"/>
       <arg value="./run_jstests.py"/>
       <arg line="--filter=${test.filter}
@@ skipping 13 matching lines @@
         --debug_level ${test.debug_level}
         --shuffle ${test.shuffle}
         --repeat ${test.repeat}"/>
     </exec>
   </target>
 
   <!-- Run jstests -->
   <target name="-jstests" depends="-jstests.linux, -jstests.mac" />
 
   <target name="test"
-    depends="gwtc.jstests, -jstests"
+    depends="extractjs.jstests, -jstests"
     description="Run tests">
   </target>
 
   <target name="runtest"
     depends="-jstests"
     description="Run tests without recompilation">
   </target>
 
   <target name="build" depends="gwtc" description="Build this project" />
 
@@ skipping 12 matching lines @@
     <delete dir="war/domdistillerjstest" failonerror="false" />
     <delete file="war/DomDistiller.war" failonerror="false" />
     <delete dir="gwt-unitCache" failonerror="false" />
     <delete dir="out" failonerror="false" />
     <delete failonerror="false" includeemptydirs="true">
       <fileset dir="war" includes="*JUnit/**"/>
     </delete>
   </target>
 
 </project>