harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r381993 - in /incubator/harmony/enhanced/classlib/trunk: make/build-java.xml make/build.xml native-src/build.xml
Date Wed, 01 Mar 2006 11:33:33 GMT
Author: tellison
Date: Wed Mar  1 03:33:29 2006
New Revision: 381993

URL: http://svn.apache.org/viewcvs?rev=381993&view=rev
Log:
Apply patch HARMONY-118 (Separate build and clean phases)

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/native-src/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=381993&r1=381992&r2=381993&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Wed Mar  1 03:33:29 2006
@@ -44,8 +44,12 @@
          ================================= -->
     <target name="default" 
         description="Compile the Java source and package in component archives." 
-        depends="clean, compile, package, layout" />
+        depends="clean, build" />
 
+    <!-- ================================= 
+          target: build
+         ================================= -->
+    <target name="build" depends="compile, package, layout" />
 
     <!-- ================================= 
           target: clean            

Modified: incubator/harmony/enhanced/classlib/trunk/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build.xml?rev=381993&r1=381992&r2=381993&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build.xml Wed Mar  1 03:33:29 2006
@@ -25,20 +25,22 @@
     <!-- ================================= 
           target: default              
          ================================= -->
-    <target name="default">
+    <target name="default" depends="clean, build" />
+
+    <target name="build">
         <echo>
 ========================================
 Building Java component archives...
 ========================================
 </echo>
-        <ant antfile="make/build-java.xml" inheritall="false" />
+        <ant antfile="make/build-java.xml" inheritall="false" target="build"/>
 
         <echo>
 ========================================
 Building native libs and executables...
 ========================================
 </echo>
-        <ant antfile="native-src/build.xml" inheritall="false" />
+        <ant antfile="native-src/build.xml" inheritall="false" target="build"/>
     </target>
 
 
@@ -60,7 +62,12 @@
     <target name="clean">
         <ant antfile="make/build-java.xml" inheritall="false" target="clean" />
         <ant antfile="native-src/build.xml" inheritall="false" target="clean" />
-        <ant antfile="doc/build.xml" inheritall="false" target="clean" />
+        <!-- Removed this for now since svn diff complains with
+             svn: Working copy 'doc/kernel_doc' is missing or not locked
+             if we run it.  We shouldn't really clean things that are in the
+             repository.
+             <ant antfile="doc/build.xml" inheritall="false" target="clean" />
+         -->
     </target>
 
     <!-- ================================= 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=381993&r1=381992&r2=381993&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Wed Mar  1 03:33:29 2006
@@ -28,7 +28,15 @@
          ================================= -->
     <target name="default" 
         description="Compile the native source into component shared libs." 
-        depends="clean-overlay-oss, overlay-oss, make-clean, make-all, clean-layout, layout"
/>
+        depends="clean, build" />
+
+
+
+    <!-- ================================= 
+          target: build
+         ================================= -->
+    <target name="build"
+            depends="overlay-oss, make-all, layout" />
 
 
     <!-- ================================= 



Mime
View raw message