harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r559002 - /harmony/enhanced/trunk/build.xml
Date Tue, 24 Jul 2007 10:27:03 GMT
Author: hindessm
Date: Tue Jul 24 03:27:01 2007
New Revision: 559002

URL: http://svn.apache.org/viewvc?view=rev&rev=559002
Log:
Splitting the build_vm_windows target into build and clean parts to
be consistent with the unix targets.  (And changing the order to match
the execution order as the unix targets do.)

Modified:
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?view=diff&rev=559002&r1=559001&r2=559002
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Tue Jul 24 03:27:01 2007
@@ -345,8 +345,9 @@
     <!-- ================================================================================
-->
     <target name="build_vm" depends="init,build_vm_unix,build_vm_windows"/>
 
-    <target name="build_vm_unix" if="is.unix" depends="build_vm_unix_auto_update, build_vm_unix_clean,
build_vm_unix_build">
-    </target>
+    <target name="build_vm_unix"
+            depends="build_vm_unix_auto_update, build_vm_unix_clean, build_vm_unix_build"
+            if="is.unix" />
 
     <target name="build_vm_unix_update" depends="init" if="is.unix">
         <exec executable="sh" dir="working_vm/build" failonerror="true">
@@ -377,33 +378,39 @@
         </exec>
     </target>
 
-    <target name="build_vm_windows" depends="build_vm_windows_auto_update" unless="is.unix">
+    <target name="build_vm_windows"
+            depends="build_vm_windows_auto_update, build_vm_windows_clean, build_vm_windows_build"
+            unless="is.unix" />
 
+    <target name="build_vm_windows_update" unless="is.unix">
         <exec executable="cmd" dir="working_vm/build" failonerror="true">
-            <arg line="/c build.bat clean -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="/c build.bat update -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
             <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="${hy.cfg}"/>
             <env key="CXX" value="msvc"/>
         </exec>
+    </target>
+
+    <target name="build_vm_windows_auto_update" if="auto.fetch">
+        <ant target="build_vm_windows_update" inheritall="true"/>
+    </target>
+
+    <target name="build_vm_windows_clean" depends="init" unless="is.unix">
         <exec executable="cmd" dir="working_vm/build" failonerror="true">
-            <arg line="/c build.bat -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="/c build.bat clean -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
             <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="${hy.cfg}"/>
             <env key="CXX" value="msvc"/>
         </exec>
     </target>
 
-    <target name="build_vm_windows_update" unless="is.unix">
+    <target name="build_vm_windows_build" depends="init" unless="is.unix">
         <exec executable="cmd" dir="working_vm/build" failonerror="true">
-            <arg line="/c build.bat update -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="/c build.bat -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
             <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="${hy.cfg}"/>
             <env key="CXX" value="msvc"/>
         </exec>
-    </target>
-
-    <target name="build_vm_windows_auto_update" if="auto.fetch">
-        <ant target="build_vm_windows_update" inheritall="true"/>
     </target>
 
     <!-- ================================================================================
-->



Mime
View raw message