Reverts r8373 "Renamed the 'dartc' launch script to 'dart_analysis'"

compiler/dartc.xml

Index: compiler/dartc.xml
diff --git a/compiler/build.xml b/compiler/dartc.xml
similarity index 71%
copy from compiler/build.xml
copy to compiler/dartc.xml
index 0bff03fd959262b9552d32d53492b7dd8850e36b..3d5761b5bfab93b88124d214620d54aff654fd81 100644
--- a/compiler/build.xml
+++ b/compiler/dartc.xml
@@ -4,13 +4,6 @@
   BSD-style license that can be found in the LICENSE file.
  -->
 <project default="dist">
-  <!--
-      EDIT DARTC.XML FIRST.  This file is no longer used to build
-      dartc proper.  It is only here to avoid breaking dartium.gyp
-      short term.  Change dartc.xml to get everything working, 
-      then update this file to match.
-  -->
-
   <import file="sources.xml"/>
   <import file="test_sources.xml"/>
 
@@ -28,7 +21,7 @@
 
   <property name="build.test.classes.dir" value="${build.dir}/test/classes"/>
 
-  <property name="dart_analyzer.jar" value="${build.dir}/dart_analyzer.jar"/>
+  <property name="dartc.jar" value="${build.dir}/dartc.jar"/>
 
   <property name="dist.dir" value="${build.dir}/dist"/>
 
@@ -64,6 +57,8 @@
     <pathelement location="${third_party.dir}/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar"/>
     <pathelement location="${third_party.dir}/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar"/>
     <pathelement location="${third_party.dir}/hamcrest/v1_3/hamcrest-library-1.3.0RC2.jar"/>
+    <pathelement location="${third_party.dir}/fest/fest-util-1.1.6.jar"/>
+    <pathelement location="${third_party.dir}/fest/fest-assert-1.4.jar"/>
   </path>
 
   <target name="compile" description="Compiles all of the java source and copies resources to the classes directory.">
@@ -86,9 +81,12 @@
     <copy todir="${build.classes.dir}">
       <filelist refid="java_resources"/>
     </copy>
-
   </target>
 
+  <!--
+    We rely on GYP to call these targets when the dartc dependencies change, hence this
+    ant file cannot be used standalone.
+  -->
   <target name="compile-tests" depends="compile" description="Compiles all of the java tests and copies the resources to the test classes directory." >
     <mkdir dir="${build.test.classes.dir}"/>
     <javac destdir="${build.test.classes.dir}"
@@ -108,55 +106,55 @@
     </copy>
   </target>
 
-  <target name="dart_analyzer.jar" depends="compile" 
-      description="Creates a jar for dartc without bundling the dependencies.">
-    <jar destfile="${dart_analyzer.jar}" basedir="${build.classes.dir}" manifest="dart_analyzer.mf"/>
+  <target name="dartc.jar" depends="compile" description="Creates a jar for dartc without bundling the dependencies.">
+    <jar destfile="${dartc.jar}" basedir="${build.classes.dir}" manifest="dartc.mf"/>
   </target>
 
-  <target name="dist" depends="dart_analyzer.jar" description="Creates a directory that contains a standalone distribution.">
+  <target name="dist" depends="dartc.jar" description="Creates a directory that contains a standalone distribution for dartc.">
     <!--
       Ensure the necessary subdirectories exist.
     -->
     <mkdir dir="${dist.dir}/bin"/>
-    <mkdir dir="${dist.dir}/util"/>
-    <mkdir dir="${dist.dir}/util/analyzer"/>
+    <mkdir dir="${dist.dir}/lib"/>
 
     <!--
       Copy the dart jar to the lib folder.
     -->
-    <copy file="${dart_analyzer.jar}" todir="${dist.dir}/util/analyzer"/>
+    <copy file="${dartc.jar}" todir="${dist.dir}/lib"/>
 
     <!--
-      Re-root the classpaths from third_party into the library folder of the distro.
+      Re-root the classpaths from third_party into the lib folder of the distro.
     -->
-    <pathconvert property="analyzer.classpath.runtime.unix" targetos="unix" refid="classpath.runtime">
-      <regexpmapper from="${third_party.dir}/(.*)" to="$DART_ANALYZER_LIBS/\1"/>
+    <pathconvert property="dartc.classpath.runtime.unix" targetos="unix" refid="classpath.runtime">
+      <regexpmapper from="${third_party.dir}/(.*)" to="$DARTC_LIBS/\1"/>
     </pathconvert>
 
-    <copy file="scripts/dart_analyzer.sh" tofile="${dist.dir}/bin/dart_analyzer">
+    <copy file="scripts/dartc.sh" tofile="${dist.dir}/bin/dartc">
       <filterset>
-        <filter token="CLASSPATH" value="$DART_ANALYZER_LIBS/dart_analyzer.jar:${analyzer.classpath.runtime.unix}"/>
+        <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:${dartc.classpath.runtime.unix}"/>
       </filterset>
     </copy>
-    <chmod file="${dist.dir}/bin/dart_analyzer" perm="a+rx"/>
+    <chmod file="${dist.dir}/bin/dartc" perm="a+rx"/>
 
    <!--
       TODO: The following files are not strictly due to dist, move them out.
     -->
     <copy todir="${build.dir}">
       <fileset dir="scripts">
-        <include name="analyzer_metrics.sh"/>
+        <include name="dartc_run.sh"/>
+        <include name="dartc_metrics.sh"/>
       </fileset>
       <filterset>
-        <filter token="CLASSPATH" value="$DARTC_LIBS/dart_analyzer.jar:${analyzer.classpath.runtime.unix}"/>
+        <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:${dartc.classpath.runtime.unix}"/>
       </filterset>
     </copy>
-    <chmod file="${build.dir}/analyzer_metrics.sh" perm="a+rx"/>
+    <chmod file="${build.dir}/dartc_run.sh" perm="a+rx"/>
+    <chmod file="${build.dir}/dartc_metrics.sh" perm="a+rx"/>
 
     <!--
-      Copy of all of the dependencies to the lib folder.
+      Copy of all of the dartc dependencies to the lib folder.
     -->
-    <copy todir="${dist.dir}/util/analyzer">
+    <copy todir="${dist.dir}/lib">
       <path refid="classpath.runtime"/>
       <regexpmapper from="${third_party.dir}/(.*)" to="\1"/>
     </copy>