harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r452891 - in /incubator/harmony/enhanced: drlvm/trunk/build/make/build.xml trunk/build.xml
Date Wed, 04 Oct 2006 14:05:05 GMT
Author: geirm
Date: Wed Oct  4 07:05:04 2006
New Revision: 452891

URL: http://svn.apache.org/viewvc?view=rev&rev=452891
Log:
Alternative fix as proposed by HARMONY-1085.

The DRLVM build just uses a flag to determine if the 
copy should happen for the "canonical" directory
to copy from.  It isn't set by default.

The federated build script passes this flag to have a 
known place to pick up the material.


Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
    incubator/harmony/enhanced/trunk/build.xml

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=452891&r1=452890&r2=452891
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Wed Oct  4 07:05:04 2006
@@ -54,11 +54,13 @@
 
 <project name="build" default="build">
 
-    <property name="canonical.deploy.dir" location="../deploy" />
-
     <property file="../drlvm.properties"/>
     <property file="${user.home}/drlvm.properties"/>
 
+    <!-- flag and location for final 'copy to build/deploy directory' step -->
+    <!-- <property name="deploy.canonical.flag" value="false"/> -->
+    <property name="canonical.deploy.dir" location="../deploy" />
+    
     <!-- ===============================================================
         Define locations of external dependencies
       ================================================================== -->
@@ -487,12 +489,13 @@
 -->
     </target>
 
-    <!-- place things into canonical 'deploy' directory
-    so irrespective of the platform, compiler or release/debug
-    there's a predicable place to find the output -->
-
-    <target name="deploy.canonical">
-        <delete dir="${canonical.deploy.dir}" />
+    <!-- ==================================================================
+      place things into canonical 'deploy' directory
+      so irrespective of the platform, compiler or release/debug
+      there's a predicable place to find the output 
+      ================================================================== -->
+    <target name="deploy.canonical" if="deploy.canonical.flag">
+        <delete dir="${canonical.deploy.dir}" failonerror="false" />
 
         <mkdir dir="${canonical.deploy.dir}" />
 

Modified: incubator/harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/trunk/build.xml?view=diff&rev=452891&r1=452890&r2=452891
==============================================================================
--- incubator/harmony/enhanced/trunk/build.xml (original)
+++ incubator/harmony/enhanced/trunk/build.xml Wed Oct  4 07:05:04 2006
@@ -263,6 +263,7 @@
     <target name="build_vm_unix_update" depends="init" if="is.unix">
         <exec executable="sh" dir="working_vm/build" >
             <arg line="build.sh update -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="release"/>
         </exec>
     </target>
@@ -270,6 +271,7 @@
     <target name="build_vm_unix_clean"  depends="init" if="is.unix">
         <exec executable="sh" dir="working_vm/build" >
             <arg line="build.sh clean -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="release"/>
         </exec>
     </target>
@@ -277,6 +279,7 @@
     <target name="build_vm_unix_build" depends="init" if="is.unix">
         <exec executable="sh" dir="working_vm/build" >
             <arg line="build.sh -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="release"/>
         </exec>
     </target>
@@ -285,16 +288,19 @@
 
         <exec executable="cmd" dir="working_vm/build" >
             <arg line="/c build.bat update -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="release"/>
             <env key="CXX" value="msvc"/>
         </exec>
         <exec executable="cmd" dir="working_vm/build" >
             <arg line="/c build.bat clean -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="release"/>
             <env key="CXX" value="msvc"/>
         </exec>
         <exec executable="cmd" dir="working_vm/build" >
             <arg line="/c build.bat -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
+            <arg line="-Ddeploy.canonical.flag=true"/>
             <env key="BUILD_CFG" value="release"/>
             <env key="CXX" value="msvc"/>
         </exec>



Mime
View raw message