harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r450425 - /incubator/harmony/enhanced/classlib/trunk/make/depends.xml
Date Wed, 27 Sep 2006 13:06:26 GMT
Author: hindessm
Date: Wed Sep 27 06:06:25 2006
New Revision: 450425

URL: http://svn.apache.org/viewvc?view=rev&rev=450425
Log:
Refactor antcalls to use dependencies ("the ant way").
Change "non-public" target names to begin with '-'.
Ensure consistent descriptions on "public" targets to make "ant -p" produce
sane output.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/depends.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=450425&r1=450424&r2=450425
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Wed Sep 27 06:06:25 2006
@@ -28,7 +28,10 @@
     <property file="make/depends.properties" />
     <import file="${basedir}/make/properties.xml" />
 
-    <target name="check">
+    <target name="check" description="Check whether dependencies are available"
+            depends="-check,-create-unsigned-bcprov-jar,-check-win" />
+
+    <target name="-check">
 
 	<check-one-file src="${yoko.url}" dest="${yoko.jar}" />
 
@@ -54,26 +57,26 @@
 	
 	<check-one-file src="${jetty.url}" dest="${jetty.jar}" /> 
 	
-    <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" /> 
+        <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" /> 
   
-    <check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" /> 
+        <check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" /> 
 
 	<uptodate property="bcprov.uptodate"
                   srcfile="${signed.bcprov.jar}"
                   targetfile="${bcprov.jar}" />
-	<antcall target="create-unsigned-bcprov-jar" />
-
-        <antcall target="check-win" />
 
     </target>
 
-    <target name="check-win" if="is.windows">
+    <target name="-check-win" if="is.windows">
         
 	<check-one-file src="${msvcr71.url}" dest="${msvcr71.dll}" />
 
     </target>
 
-    <target name="download" description="Download required jars">
+    <target name="download" description="Download required jars"
+            depends="-download,-download-win" />
+
+    <target name="-download">
 
 	<mkdir dir="${yoko.dir}" />
 	<download-one-file src="${yoko.url}" dest="${yoko.jar}"
@@ -126,11 +129,9 @@
         <download-one-file src="${servlet-api.url}" dest="${servlet-api.jar}"
                            md5="${servlet-api.md5}" />
 
-        <antcall target="download-win" />
-
     </target>
 
-    <target name="download-win" if="is.windows">
+    <target name="-download-win" if="is.windows">
         
 	<mkdir dir="${msvcr71.dir}" />
 	<download-one-file src="${msvcr71.url}" dest="${msvcr71.dll}"
@@ -150,7 +151,7 @@
             <condition property="md5.verified" value="true">
                 <equals arg1="${new.md5}" arg2="@{md5}" />
             </condition>
-            <antcall target="remove-file-if-bad">
+            <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
             </antcall>
 	    <fail unless="md5.verified">
@@ -166,7 +167,7 @@
         </sequential>
     </macrodef>
 
-    <target name="remove-file-if-bad" unless="md5.verified">
+    <target name="-remove-file-if-bad" unless="md5.verified">
         <delete file="${dest}" />
     </target>
 
@@ -200,7 +201,7 @@
         </sequential>
     </macrodef>
 
-    <target name="create-unsigned-bcprov-jar" unless="bcprov.uptodate">
+    <target name="-create-unsigned-bcprov-jar" unless="bcprov.uptodate">
         <echo>Removing signature from bcprov.jar</echo>
 	<delete dir="${bcprov.dir}/temp" />
 	<unzip src="${signed.bcprov.jar}" dest="${bcprov.dir}/temp">



Mime
View raw message