harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r415516 - in /incubator/harmony/enhanced/classlib/trunk: build.xml make/build-test.xml make/build.xml make/properties.xml modules/luni-kernel/make/build.xml modules/security-kernel/make/build.xml
Date Tue, 20 Jun 2006 06:23:46 GMT
Author: hindessm
Date: Mon Jun 19 23:23:46 2006
New Revision: 415516

URL: http://svn.apache.org/viewvc?rev=415516&view=rev
Log:
Moving build.xml to top-level.
Added 'help' target.
Added 'fetch-depends' target.
Added '-Dbuild.module=blah' support - *not* for 'clean' target yet.

Added:
    incubator/harmony/enhanced/classlib/trunk/build.xml
      - copied, changed from r415269, incubator/harmony/enhanced/classlib/trunk/make/build.xml
Removed:
    incubator/harmony/enhanced/classlib/trunk/make/build.xml
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml

Copied: incubator/harmony/enhanced/classlib/trunk/build.xml (from r415269, incubator/harmony/enhanced/classlib/trunk/make/build.xml)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/build.xml?p2=incubator/harmony/enhanced/classlib/trunk/build.xml&p1=incubator/harmony/enhanced/classlib/trunk/make/build.xml&r1=415269&r2=415516&rev=415516&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/build.xml Mon Jun 19 23:23:46 2006
@@ -17,20 +17,57 @@
 <!-- ====================================================================== 
      Build source and lay out results in the required format
      ====================================================================== -->
-<project name="build-contribution" default="default" basedir="..">
+<project name="build-contribution" default="default" basedir=".">
     <description>
     	Build contributed source and lay out results in the required format 
     </description>
 
+    <target name="help">
+        <echo>
+Apache Harmony Ant Build
+
+Usage:
+
+  ant build
+    Compiles the java and native code to produce a jdk in
+    "deploy/jdk".
+
+  ant clean
+    Removes all the files generated by a build.
+
+  ant rebuild
+    Performs a full build - that is 'clean' then 'build'.
+
+  ant test
+    Runs all the tests.
+
+  ant doc
+    Generates the javadoc.
+
+  ant snapshot
+    Produces a archive (tar/zip) of a build.
+
+  ant fetch-depends
+    Fetches dependencies. Note: Some of Harmony's dependencies are
+    licensed under terms other than the Apache License v2.
+
+The 'build' and 'test' targets can be restricted to processing only
+a single module by defining the 'build.module' variable on the ant
+command line.  For example, to run only the luni tests:
+
+  ant -Dbuild.module=luni test
+
+        </echo>
+    </target>
     <!-- import properties for snapshot targets -->
     <import file="${basedir}/make/properties.xml" />
 
-	<!-- ================================
-	     target : rebuild
+    <!-- ================================
+	 target : rebuild
 	     
-	     builds with a clean first
-	     ================================= -->
-	<target name="rebuild" depends="clean,build" />
+	 builds with a clean first
+	 ================================= -->
+    <target name="rebuild" depends="clean,build" />
 	
     <!-- ================================= 
           target: default              
@@ -161,6 +198,10 @@
                 fullpath="Harmony/README.txt"/>
         </zip>
         <checksum file="${deploy.zip}" fileext=".md5"/>
+    </target>
+
+    <target name="fetch-depends">
+        <ant antfile="make/depends.xml" inheritall="false" target="download" />
     </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=415516&r1=415515&r2=415516&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Mon Jun 19 23:23:46 2006
@@ -35,180 +35,39 @@
     <property name="tests.depends.jars" location="deploy/jdk/jre/lib/boot" />
     <property file="make/depends.properties" />
 
-	<!-- this list of components to test will grow to eventually be all modules -->
-	<target name="test-all"
-		depends="clean, test-annotation, test-archive, test-auth, test-beans, test-crypto, test-jndi,
test-logging, test-luni, test-math, test-nio, test-nio_char, test-prefs, test-regex, test-rmi,
test-security, test-sql, test-text, test-xnet, gen-report, check-test-result">
-	</target>
-
-	<target name="clean">
-		<delete dir="${tests.output}" />
-	</target>
-
-	<target name="test-annotation" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module annotation"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/annotation" target="test" />
-
-	</target>
-
-	<target name="test-luni" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module luni"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/luni" target="test"/>
-	</target>
-
-	<target name="test-archive" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module archive"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/archive" target="test" />
-
-	</target>
-
-	<target name="test-xnet" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module x-net"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/x-net" target="test" />
-
-	</target>
-
-	<target name="test-crypto" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module crypto"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/crypto" target="test" />
-
-	</target>
-
-	<target name="test-auth" depends="compile-support">
-		<echo message="=================================="/>
-		<echo message="Running tests for module auth"/>
-		<echo message="=================================="/>
-
-		<ant antfile="make/build.xml" dir="modules/auth" target="test" />
-
-	</target>
-
-	<target name="test-text" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module text"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/text" target="test" />
-
-	</target>
-
-	<target name="test-nio" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module nio"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/nio" target="test" />
-
-	</target>
-
-	<target name="test-nio_char" depends="compile-support">
-        <echo message="=================================="/>
-        <echo message="Running tests for module nio_char"/>
-        <echo message="=================================="/>
-
-        <ant antfile="make/build.xml" dir="modules/nio_char" target="test" />
-
-	</target>
-
-	<target name="test-jndi" depends="compile-support">
-            <echo message="=================================="/>
-            <echo message="Running tests for module jndi"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/jndi" target="test" />
-	</target>
-
-	<target name="test-logging" depends="compile-support">
-            <echo message="=================================="/>
-            <echo message="Running tests for module logging"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/logging" target="test" />
-	</target>
-
-	<target name="test-prefs" depends="compile-support">
-            <echo message="=================================="/>
-            <echo message="Running tests for module prefs"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/prefs" target="test" />
-	</target>
-
-	<target name="test-sql" depends="compile-support">
-            <echo message="=================================="/>
-            <echo message="Running tests for module sql"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/sql" target="test" />
-	</target>
-
-	<target name="test-beans" depends="compile-support">
-            <echo message="=================================="/>
-            <echo message="Running tests for module beans"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/beans" target="test" />
-	</target>
-
-	<target name="test-math">
-            <echo message="=================================="/>
-            <echo message="Running tests for module math"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/math" target="test" />
-	</target>
-
-	<target name="test-regex">
-            <echo message="=================================="/>
-            <echo message="Running tests for module regex"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/regex" target="test" />
-	</target>
-
-	<target name="test-rmi">
-            <echo message="=================================="/>
-            <echo message="Running tests for module rmi"/>
-            <echo message="=================================="/>
-            <ant antfile="make/build.xml" dir="modules/${hy.rmi.module}" target="test"
/>
-	</target>
+    <!-- this list of components to test will grow to eventually be all modules -->
+    <target name="test-all"
+	    depends="clean, test-modules, gen-report, check-test-result">
+    </target>
 
-	<target name="test-security" depends="compile-support">
-	
-            <echo message="=================================="/>
-            <echo message="Running tests for module security"/>
-            <echo message="=================================="/>
-
-            <ant antfile="make/build.xml" dir="modules/security" target="test"/>
-	</target>
-
-	<target name="gen-report">
-		<junitreport todir="${tests.output}">
-		  <fileset dir="${tests.output}">
-		    <include name="TEST*-*.xml"/>
-		  </fileset>
-		  <report format="frames" todir="${tests.output}/html"/>
-		</junitreport>
-
-		<!-- use this property just to get the slashes to display right in the echo -->
-		<property name="display-location" location="${tests.output}/html/index.html"/>
-		<echo message="The test report is in ${display-location}"/>
+    <target name="clean">
+	<delete dir="${tests.output}" />
+    </target>
+
+    <target name="test-modules" depends="compile-support">
+        <call-modules target="test" />
+    </target>
+
+    <target name="gen-report">
+	<junitreport todir="${tests.output}">
+	    <fileset dir="${tests.output}">
+		<include name="TEST*-*.xml"/>
+	    </fileset>
+	    <report format="frames" todir="${tests.output}/html"/>
+	</junitreport>
+
+	<!-- use this property just to get the slashes to display right in the echo -->
+	<property name="display-location" location="${tests.output}/html/index.html"/>
+	<echo message="The test report is in ${display-location}"/>
     </target>
 
     <target name="compile-support" depends="copy-test-resources, check-support-jars"
-    	description="Compile the unit test source">
+    	    description="Compile the unit test source">
     	<mkdir dir="${tests.build.output}" />
     	<javac destdir="${tests.build.output}"
-    		source="${hy.javac.source}"
-    		target="${hy.javac.target}"
-    		debug="on">
+    	       source="${hy.javac.source}"
+    	       target="${hy.javac.target}"
+    	       debug="on">
 
             <src path="${support.dir}/src/test/java" />
             <classpath location="${junit.jar}" />
@@ -224,9 +83,9 @@
 	
     <target name="check-test-result">
         <available property="test.errors"
-            file="${tests.output}/test.errors" />
+                   file="${tests.output}/test.errors" />
         <available property="test.failures"
-            file="${tests.output}/test.failures" />
+                   file="${tests.output}/test.failures" />
         <fail if="test.errors" message="There were test errors." />
         <fail if="test.failures" message="There were test failures." />
     </target>
@@ -235,7 +94,7 @@
           target: copy-test-resources              
          ================================= -->
     <target name="copy-test-resources"
-       description="Copy non-Java files from unit test trees to the bin output">
+            description="Copy non-Java files from unit test trees to the bin output">
         <mkdir dir="${tests.build.output}" />
 
         <copy todir="${tests.build.output}" includeemptydirs="false">
@@ -277,9 +136,9 @@
         <path id="classpath.id" location="${tests.build.output}" />
     	
     	<java classname="tests.main.AllTests"
-    		fork="true"
-    		jvm="${harmony.vm.exe}">
-    		
+    	      fork="true"
+    	      jvm="${harmony.vm.exe}">
+    	    
             <jvmarg value="-showversion" />
 
             <!-- Required by various tests that set security manager etc -->
@@ -295,7 +154,7 @@
                 <path refid="classpath.id" />
                 <pathelement location="${junit.jar}" />
             </classpath>
-   		</java>
+   	</java>
     </target>
 
 	

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=415516&r1=415515&r2=415516&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Mon Jun 19 23:23:46 2006
@@ -164,16 +164,34 @@
     <macrodef name="call-modules">
         <attribute name="target" />
         <sequential>
-            <subant target="@{target}">
-                <fileset dir="modules">
-                    <include name="*/make/build.xml" />
-                    <exclude name="rmi*/make/build.xml" />
-                </fileset>
-                <fileset dir="modules">
-                    <include name="${hy.rmi.module}/make/build.xml" />
-                </fileset>
-            </subant>
+            <antcall target="call-modules-all">
+                <param name="target" value="@{target}" />
+            </antcall>
+            <antcall target="call-modules-one">
+                <param name="target" value="@{target}" />
+            </antcall>
         </sequential>
     </macrodef>
+
+    <target name="call-modules-all" unless="build.module">
+        <subant target="${target}">
+            <fileset dir="modules">
+                <include name="*/make/build.xml" />
+                <exclude name="rmi*/make/build.xml" />
+            </fileset>
+            <fileset dir="modules">
+                <include name="${hy.rmi.module}/make/build.xml" />
+            </fileset>
+        </subant>
+    </target>
+
+    <target name="call-modules-one" if="build.module">
+        <subant target="${target}">
+            <fileset dir="modules">
+                <include name="${build.module}/make/build.xml" />
+            </fileset>
+        </subant>
+    </target>
+            
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml?rev=415516&r1=415515&r2=415516&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/build.xml Mon Jun 19
23:23:46 2006
@@ -45,4 +45,8 @@
         <delete file="${stub.jar}" />
     </target>
 
+    <target name="test">
+        <!-- just to match "API" for other modules. -->
+    </target>
+
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml?rev=415516&r1=415515&r2=415516&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/build.xml Mon Jun
19 23:23:46 2006
@@ -45,4 +45,8 @@
         <delete file="${stub.jar}" />
     </target>
 
+    <target name="test">
+        <!-- just to match "API" for other modules. -->
+    </target>
+
 </project>



Mime
View raw message