harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r939087 - in /harmony/enhanced/java/branches/mrh/jdktools/modules: jdktools/build.xml samsa/build.xml
Date Wed, 28 Apr 2010 21:01:11 GMT
Author: hindessm
Date: Wed Apr 28 21:01:10 2010
New Revision: 939087

URL: http://svn.apache.org/viewvc?rev=939087&view=rev
Log:
Add more skip.*.build checks.

Modified:
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml?rev=939087&r1=939086&r2=939087&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml Wed Apr 28 21:01:10
2010
@@ -28,7 +28,7 @@
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
 
-    <target name="check-depends">
+    <target name="check-depends" unless="skip.java.build">
         <check-one-file src="${jdt.jdi.jar.url}"
                         dest="${jdt.jdi.jar}" />
         <check-one-file src="${jdt.jdimodel.jar.url}"
@@ -44,7 +44,7 @@
         </copy>
     </target>
     
-    <target name="fetch-depends">
+    <target name="fetch-depends" unless="skip.java.build">
         <fetch dep="jdt.jdi.jar"/>
         <fetch dep="jdt.jdimodel.jar"/>
         <fetch dep="icu"/>
@@ -54,7 +54,7 @@
                            src="${bcel.url}" md5="${bcel.md5}"/>
     </target>
 
-    <target name="build"
+    <target name="build" unless="skip.java.build"
             depends="check-depends,-build-jar,-copy-jars,-test-jar" />
 
     <target name="test" depends="-test-module">
@@ -191,6 +191,6 @@
 
     <target name="-run-tests" depends="-test-jar">
         <ant dir="${tests.hdk.dir}" target="test-module" />
-     </target>
+    </target>
 
 </project>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml?rev=939087&r1=939086&r2=939087&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml Wed Apr 28 21:01:10
2010
@@ -26,24 +26,27 @@
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <!-- filename for tests exclude list -->
-    <property name="samsa.exclude.file" location="${hy.hdk}/build/jdktools.samsa.exclude"
/>
+    <property name="samsa.exclude.file"
+              location="${hy.hdk}/build/jdktools.samsa.exclude" />
 
-    <target name="build" depends="build-native"/>
-    <target name="clean" depends="clean-native"/>
+    <target name="build" depends="build-native" unless="skip.native.build"/>
+    <target name="clean" depends="clean-native" unless="skip.native.build"/>
     <target name="test" depends="test-module" />
     <target name="test-module" depends="prepare-exclude, run-tests" />
 
-    <target name="build-native" depends="-compile-native, -copy-native-exe, -copy-native-exe-windows,
-copy-native-data" />
+    <target name="build-native" unless="skip.native.build"
+            depends="-compile-native,-copy-native-exe,
+                     -copy-native-exe-windows,-copy-native-data" />
 
     <!-- compile universal samsa binary -->
-    <target name="-compile-native" >
+    <target name="-compile-native" unless="skip.native.build">
 
         <echo message="Compiling SAMSA natives" />
         <make dir="src/main/native/samsa/${hy.os.family}" />
     </target>
 
     <!-- copy samsa executable for different tools -->
-    <target name="-copy-native-exe" >
+    <target name="-copy-native-exe" unless="skip.native.build">
 
         <property name="hy.samsa.exe"
                   location="${hy.hdk}/lib/samsa${exe.suffix}" />
@@ -109,7 +112,8 @@
     </target>
 
     <!-- copy windows javaw executable -->
-    <target name="-copy-native-exe-windows" if="is.windows" >
+    <target name="-copy-native-exe-windows" unless="skip.native.build"
+            if="is.windows">
         <property name="hy.samsaw.exe"
                   location="${hy.hdk}/lib/samsaw${exe.suffix}" />
 
@@ -120,7 +124,7 @@
     </target>
 
     <!-- copy samsa configuration data for different tools -->
-    <target name="-copy-native-data" >
+    <target name="-copy-native-data" unless="skip.native.build">
 
         <copy todir="${hy.jdk}/bin/data" overwrite="yes">
             <fileset dir="src/main/resources/data/">
@@ -214,12 +218,10 @@
 	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
-
-
     </target>
 
     <!-- Clean natives -->
-    <target name="clean-native">
+    <target name="clean-native" unless="skip.native.build">
         <echo message="Cleaning SAMSA natives" />
         <make dir="src/main/native/samsa/${hy.os.family}"
               target="clean" />



Mime
View raw message