harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r450769 - /incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
Date Thu, 28 Sep 2006 09:12:41 GMT
Author: hindessm
Date: Thu Sep 28 02:12:40 2006
New Revision: 450769

URL: http://svn.apache.org/viewvc?view=rev&rev=450769
Log:
Replace antcall tasks with dependencies.
Add descriptions to "public" tasks - though none are intended to be called
directly.  But I think it means 'ant -p' says something useful.
Move other descriptions to comments.
Rename "non-public" targets to begin with '-' so they can't be called directly.

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

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=450769&r1=450768&r2=450769
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Sep 28 02:12:40 2006
@@ -45,20 +45,31 @@
     <!-- ================================= 
           target: build
          ================================= -->
-    <target name="build" depends="compile, layout" />
+    <target name="build" depends="-compile, -layout"
+            description="Compile Java source and construct deploy directory." />
 
     <!-- ================================= 
           target: clean            
          ================================= -->
-    <target name="clean" depends="clean-bin, clean-layout" />
+    <target name="clean" depends="-clean-bin, -clean-layout"
+        description="Remove compiled classes and delete the deploy directory."/>
 
 
     <!-- ================================= 
-          target: clean-bin              
+          target: -clean-bin
+          Delete all built classes
          ================================= -->
-    <target name="clean-bin" description="Delete all built classes">
+    <target name="-clean-bin"
+            depends="-copy-kernel-patternsets,
+                     -modules-clean-bin,
+                     -clean-kernel-patternsets,
+                     -clean-bin-catch-all"/>
+
+    <target name="-modules-clean-bin">
         <call-modules target="clean" />
-        <antcall target="clean-kernel-patternsets" />
+    </target>
+
+    <target name="-clean-bin-catch-all">
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${build.output}">
                 <include name="**/**" />
@@ -66,7 +77,7 @@
         </delete>
     </target>
 
-    <target name="copy-kernel-patternsets">
+    <target name="-copy-kernel-patternsets">
         <mkdir dir="${hy.hdk}/build/patternsets" />
         <copy file="modules/luni-kernel/make/patternset.txt"
               tofile="${hy.hdk}/build/patternsets/luni-kernel.txt" />
@@ -74,15 +85,15 @@
               tofile="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </target>
 
-    <target name="clean-kernel-patternsets">
+    <target name="-clean-kernel-patternsets">
         <delete dir="${hy.hdk}/build/patternsets" />
     </target>
 
     <!-- =================================
-          target: compile
+          target: -compile
          ================================= -->
-    <target name="compile" depends="copy-kernel-patternsets, prepare-depends"
-            description="Compile the source">
+    <target name="-compile"
+            depends="-copy-kernel-patternsets,-prepare-depends">
         <mkdir dir="${build.output}" />
 
         <javac fork="yes" 
@@ -141,11 +152,11 @@
 
 
     <!-- ================================= 
-          target: layout              
+          target: -layout              
+          Construct the correct directory structure for the class libs
          ================================= -->
-    <target name="layout" 
-        depends="compile" 
-        description="Construct the correct directory structure for the class libs">
+    <target name="-layout" depends="-compile">
+        
         <!-- Create the structure -->
         <mkdir dir="${hy.jdk}/jre/bin" />
         <mkdir dir="${hy.jdk}/jre/lib/boot" />
@@ -199,9 +210,9 @@
 
 
     <!-- ================================= 
-          target: clean-layout              
+          target: -clean-layout              
          ================================= -->
-    <target name="clean-layout">
+    <target name="-clean-layout">
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${hy.jdk}">
                 <exclude name="jre/bin/default/**" />
@@ -211,10 +222,13 @@
         </delete>
     </target>
 
-    <target name="prepare-depends"
-            description="Check for jars required to compile prefs">
-        
-      <ant antfile="make/depends.xml" inheritall="false" target="check"/>
+    <!-- =================================
+         target: -prepare-depends
+         Check for jars required to compile prefs
+         ================================= --> 
+    <target name="-prepare-depends">
+
+        <ant antfile="make/depends.xml" inheritall="false" target="check"/>
 
     </target>
 



Mime
View raw message