harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r937882 - in /harmony/enhanced/java/branches/mrh: ./ classlib/ classlib/make/ drlvm/make/vm/ jdktools/ jdktools/make/ jdktools/modules/jdktools/ jdktools/modules/jdktools/make/ jdktools/modules/jpda/ jdktools/modules/jpda/make/ jdktools/mod...
Date Sun, 25 Apr 2010 21:25:41 GMT
Author: hindessm
Date: Sun Apr 25 21:25:39 2010
New Revision: 937882

URL: http://svn.apache.org/viewvc?rev=937882&view=rev
Log:
Reduce copying by building directly in to target/hdk.
Simplify jdktools build.

Added:
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/depends.properties   (with props)
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/depends.properties   (with props)
    harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/depends.properties   (with props)
Removed:
    harmony/enhanced/java/branches/mrh/jdktools/make/build-java.xml
    harmony/enhanced/java/branches/mrh/jdktools/make/build-native.xml
    harmony/enhanced/java/branches/mrh/jdktools/make/build-test.xml
Modified:
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/classlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/hythr.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/interpreter.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmi.xml
    harmony/enhanced/java/branches/mrh/jdktools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties
    harmony/enhanced/java/branches/mrh/jdktools/make/properties.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml
    harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Sun Apr 25 21:25:39 2010
@@ -41,15 +41,14 @@ Thanks.
     <!-- debug or release version -->
     <property name="hy.cfg" value="release" />
 
+    <property name="hy.hdk" location="target/hdk" />
+
     <!-- property to identify when components are being built by the 
          federated build -->
     <property name="is.federated.build" value="true" />
 
     <property name="vm.dir" value="drlvm" />
     <property name="vm.dir.loc" location="${vm.dir}" />
-    <condition property="is.svn.vm" value="true">
-        <available file="${vm.dir.loc}/.svn" type="dir" />
-    </condition>
 
     <property name="hy.local.zlib" value="false" />
 
@@ -343,22 +342,21 @@ Usage:
     <target name="assemble-artifacts"
         depends="init,
                  assemble-stuff,
+                 assemble-hdk-doc,
                  chmod-stuff"/>
 
     <target name="assemble-stuff">
         <!-- create the top-level hdk directory -->
         <mkdir dir="${target.dir}/hdk"/>
 
-        <!-- copy the classlib/deploy tree as the hdk
-             filtering out specific files overriden by the VM -->
-        <copy todir="${target.dir}/hdk">
-            <fileset dir="classlib/deploy">
-                <excludesfile
+        <!-- delete files that the VM wants to override -->
+        <delete>
+            <fileset dir="${target.dir}">
+                <includesfile
                      name="${vm.dir.loc}/make/classlib.override.file.patterns"
                      />
-                <include name="**/*" />
             </fileset>
-        </copy>
+        </delete>
 
         <!-- now copy the drlvm/build/deploy/jre/bin/default -->
         <!-- plus specific file that the VM overrides -->
@@ -372,11 +370,6 @@ Usage:
             <fileset dir="${vm.dir.loc}/deploy"
                 includesfile="${vm.dir.loc}/make/classlib.override.file.patterns" />
         </copy>
-
-        <!-- now copy the jdktools/deploy/jdk -->
-        <copy todir="${target.dir}/hdk/jdk/">
-            <fileset dir="jdktools/deploy/jdk" />
-        </copy>
     </target>
 
     <target name="chmod-stuff" if="is.unix">
@@ -430,6 +423,7 @@ Usage:
 
     <propertyset id="required.props">
         <propertyref name="hy.cfg" />
+        <propertyref name="hy.hdk" />
         <propertyref name="hy.local.zlib" />
         <propertyref name="use.libstdc++5" />
         <propertyref name="harmony.java.version" />
@@ -443,15 +437,15 @@ Usage:
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
         </ant>
-        <!-- hack to make sure the vm doesn't use the classlib
+        <!-- hack to make sure the federated build doesn't use the classlib
              LICENSE/NOTICE files as they don't cover ICU4C
           -->
-        <copy todir="classlib/deploy" overwrite="true">
-            <fileset dir=".">
+        <delete>
+            <fileset dir="${hy.hdk}">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
-        </copy>                                                             
+        </delete>
     </target>
 
     <target name="auto-fetch-classlib-libs" if="auto.fetch">
@@ -482,7 +476,7 @@ Usage:
     <target name="init-classlib-hdk">
         <ant antfile="classlib/build.xml"
                 target="-init-hdk" inheritAll="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
@@ -544,7 +538,7 @@ Usage:
 
     <target name="fetch-commonresources">
         <ant antfile="common_resources/build.xml" target="fetch-depends" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
@@ -555,7 +549,8 @@ Usage:
     <!-- ============================================================== -->
     <target name="build-jdktools" depends="auto-fetch-jdktools-libs">
         <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
@@ -563,19 +558,22 @@ Usage:
 
     <target name="auto-fetch-jdktools-libs" if="auto.fetch">
         <ant target="fetch-jdktools-libs" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="fetch-jdktools-libs">
         <ant antfile="jdktools/build.xml" target="fetch-depends" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="clean-jdktools">
         <ant antfile="jdktools/build.xml" target="clean" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
@@ -590,27 +588,6 @@ Usage:
     </target>
 
 
-    <!-- ============================================================== -->
-    <!-- hard reset - removes checked out classlib and vm tree          -->
-    <!-- ============================================================== -->
-    <target name="reset"
-        description="removes vm and classlib dirs and resets - BE SURE YOU WANT TO DO THIS"
-        depends="clean,reset-vm">
-
-        <!-- delete the working directories -->
-        <delete dir="classlib"/>
-
-        <!-- do an svn update to reset them -->
-        <exec executable="svn" dir="." failonerror="true">
-            <arg line="update" />
-        </exec>
-
-    </target>
-
-    <target name="reset-vm" if="is.svn.vm">
-        <delete dir="${vm.dir.loc}" />
-    </target>
-
     <target name="clean"
         depends="init-classlib-hdk,
                  clean-jdktools,
@@ -863,11 +840,12 @@ harmony.java.version=${harmony.java.vers
     </target>
 
     <target name="test-jdktools" depends="clean-tests">
-        <ant antfile="jdktools/make/build-test.xml"
-             target="test-modules" inheritAll="false" >
+        <ant antfile="jdktools/build.xml"
+             target="-test-modules" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="common.resources" location="common_resources" />
             <property name="keep.working" value="true" />
             <property name="tests.output" location="target/test_report" />
             <property name="test.jre.home" location="target/hdk/jdk/jre" />

Modified: harmony/enhanced/java/branches/mrh/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/build.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/build.xml Sun Apr 25 21:25:39 2010
@@ -467,15 +467,17 @@ Generating snapshot tar
             <tarfileset dir="${basedir}" prefix="Harmony">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
-                <include name="deploy/build/**" />
-                <include name="deploy/include/**" />
-                <include name="deploy/jdk/**" />
-                <exclude name="deploy/jdk/jre/bin/default/**" /> 
-                <exclude name="deploy/jdk/jre/bin/java" /> 
-                <include name="deploy/lib/**" />
             </tarfileset>
-            <tarfileset dir="${basedir}" prefix="Harmony" mode="755">
-                <include name="deploy/jdk/jre/bin/java" />
+            <tarfileset dir="${hy.hdk}" prefix="Harmony">
+                <include name="build/**" />
+                <include name="include/**" />
+                <include name="jdk/**" />
+                <exclude name="jdk/jre/bin/default/**" /> 
+                <exclude name="jdk/jre/bin/java" /> 
+                <include name="lib/**" />
+            </tarfileset>
+            <tarfileset dir="${hy.hdk}" prefix="Harmony" mode="755">
+                <include name="jdk/jre/bin/java" />
             </tarfileset>
             <tarfileset dir="${basedir}/make/resources"
                 includes="README-snapshot.txt"
@@ -498,12 +500,14 @@ Generating snapshot zip
             <zipfileset dir="${basedir}" prefix="Harmony">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
-                <include name="deploy/build/**" />
-                <include name="deploy/include/**" />
-                <include name="deploy/jdk/**" />
-                <exclude name="deploy/jdk/jre/bin/default/**" /> 
-                <exclude name="deploy/jdk/jre/bin/java" /> 
-                <include name="deploy/lib/**" />
+            </zipfileset>
+            <zipfileset dir="${hy.hdk}" prefix="Harmony">
+                <include name="build/**" />
+                <include name="include/**" />
+                <include name="jdk/**" />
+                <exclude name="jdk/jre/bin/default/**" /> 
+                <exclude name="jdk/jre/bin/java" /> 
+                <include name="lib/**" />
             </zipfileset>
             <zipfileset dir="${basedir}/make/resources"
                 includes="README-snapshot.txt"

Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Sun Apr 25 21:25:39 2010
@@ -554,6 +554,7 @@ properties in preference to these:
                 <!-- TODO: modules probably need to work these properties
                      out for themselves in order to reduce coupling -->
                 <property name="hy.test.vm.name" value="${hy.test.vm.name}"/>
+                <property name="hy.hdk" value="${hy.hdk}"/>
                 <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
                     <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
                 </fileset>

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml Sun Apr 25 21:25:39 2010
@@ -51,7 +51,6 @@
         </condition>
         
         <path id="gc.includes">
-            <pathelement location="${drlvm.include.dir}" />
             <dirset dir="${vm.home}">
                 <include name="include" />
                 <include name="port/include" />
@@ -74,6 +73,7 @@
                 <include name="verify" />
                 <include name="finalizer_weakref" />
             </dirset>
+            <pathelement location="${drlvm.include.dir}" />
         </path>
         
         <compiler id="cpp.compiler" extends="common.cpp.compiler">

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/hythr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/hythr.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/hythr.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/hythr.xml Sun Apr 25 21:25:39 2010
@@ -32,9 +32,9 @@
         <make-native libname="hythr" type="shared">
         <compiler id="c.compiler" extends="common.c.compiler">
             <includepath>
-              <pathelement location="${drlvm.include.dir}" />
               <path refid="vm.include"/>
               <pathelement location="${vm.home}/thread/src" />
+              <pathelement location="${drlvm.include.dir}" />
               <pathelement location="${hy.hdk}/include" />
             </includepath>
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/interpreter.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/interpreter.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/interpreter.xml Sun Apr 25 21:25:39 2010
@@ -37,7 +37,6 @@
         </compile-asm>
         
         <path id="int.includes">
-            <pathelement location="${drlvm.include.dir}" />
             <dirset dir="${vm.home}">
                 <include name="include" />
                 <include name="vmcore/include" />
@@ -58,6 +57,7 @@
                 <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
                 <include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
             </dirset>
+            <pathelement location="${drlvm.include.dir}" />
         </path>
         <depend-includes paths="int.includes"/>
         <depend-selector rebuild-flag="int.includes.uptodate" id="int.depends"/>

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/jitrino.xml Sun Apr 25 21:25:39 2010
@@ -50,10 +50,10 @@
                 <include name="vmcore/src/util/win/include" if="is.windows"/>
                 <include name="vmcore/src/util/linux/include" if="is.unix"/>
             </dirset>
-            <pathelement location="${drlvm.include.dir}" />
             <pathelement location="${vm.home}/include" />
             <pathelement location="${vm.home}/vmcore/include" />
             <pathelement location="${vm.home}/port/include" />
+            <pathelement location="${drlvm.include.dir}" />
         </path>
         <depend-includes paths="jit.includes"/>
         <depend-selector rebuild-flag="jit.includes.uptodate" id="jit.depends"/>

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier.xml Sun Apr 25 21:25:39 2010
@@ -25,9 +25,9 @@
         <init-native/>
         <make-native libname="verifier" type="static">
             <includepath>
-                <pathelement location="${drlvm.include.dir}" />
                 <pathelement location="${vm.home}/vmcore/include" />
                 <pathelement location="${vm.home}/include" />
+                <pathelement location="${drlvm.include.dir}" />
             </includepath>
             <compiler extends="common.cpp.compiler">
                 <fileset dir="${vm.home}/vmcore/src/verifier-3363">

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml Sun Apr 25 21:25:39 2010
@@ -112,8 +112,6 @@
         </compile-asm>
 
         <path id="vmcore.includes">
-            <pathelement location="${drlvm.include.dir}" />
-
             <dirset dir="${vm.home}">
                 <include name="include" />
                 <include name="vmcore/include" />
@@ -134,6 +132,7 @@
                 <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
                 <include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
             </dirset>
+            <pathelement location="${drlvm.include.dir}" />
         </path>
         <depend-includes paths="vmcore.includes"/>
         <depend-selector rebuild-flag="vmcore.includes.uptodate" id="vmcore.depends"/>

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmi.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmi.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmi.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmi.xml Sun Apr 25 21:25:39 2010
@@ -26,13 +26,13 @@
         <make-native libname="vmi" type="shared">
             <compiler id="cpp.compiler" extends="common.cpp.compiler">
                 <includepath>
-                    <pathelement location="${drlvm.include.dir}" />
                     <path refid="vm.include"/>
                     <dirset dir="${vm.home}">
                         <include name="vmcore/include" />
                         <include name="vmcore/src/util/win/include" if="is.windows"/>
                         <include name="vmcore/src/util/linux/include" if="is.unix"/>
                     </dirset>
+                    <pathelement location="${drlvm.include.dir}" />
                     <pathelement location="${hy.hdk}/include" />
                 </includepath>
 

Modified: harmony/enhanced/java/branches/mrh/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/build.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/build.xml Sun Apr 25 21:25:39 2010
@@ -20,20 +20,17 @@
      ====================================================================== -->
 <project name="jdktools" default="build" basedir=".">
     <description>
-    	Build jdktools
+        Build jdktools
     </description>
 
-    <import file="make/properties.xml"/>
-        
     <target name="help">
         <echo>
-Apache Harmony Ant Build
+Apache Harmony Tools Build
 
 Usage:
 
   ant build
-    Compiles the java and native code to produce a jdk in
-    "deploy/jdk".
+    Compiles the java and native code and populates the hdk.
 
   ant clean
     Removes all the files generated by a build.
@@ -47,136 +44,84 @@ Usage:
   ant doc
     Generates the javadoc.
 
+  ant fetch-depends
+    Fetches dependencies. Note: Some of Harmony's dependencies are
+    licensed under terms other than the Apache License v2.
+
   ant properties
     Display the common properties that are use in the ant build files.
 
-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:
+The 'build' and 'test' targets can be configured to only build/test a
+single module by setting the 'build.module' property. For example, to
+run the tests for the "jdktools" module:
 
-  ant -Dbuild.module=jdktools test
+  ant test -Dbuild.module=jdktools
 
-        </echo>
-    </target>
-    
-    <target name="rebuild" depends="clean,build"
-        description="Performs a full build - that is 'clean' then 'build'" />
+The 'test' target can further be configured to run a single test by setting
+the 'test.case' property. For example, to run a specific test in the "luni"
+module:
 
-    <target name="build" depends="build-java,build-native"
-        description="Compiles the java and native code to produce a jdk">
+  ant test -Dbuild.module=jdktools -Dtest.case=org/apache/harmony/tests/tools/javac/MainTest
+        </echo>
     </target>
 
-    <target name="clean" depends="clean-java,clean-native,clean-tests"
-            description="Removes all the files generated by a build" />
+    <property file="${user.home}/.harmony-jdktools.properties" />
+    <property name="common.resources" location="../common_resources" />
+    <import file="make/properties.xml" />
 
-    <target name="rebuild-java" depends="clean-java,build-java"
-            description="Like 'rebuild' but for java code only" />
+    <!-- import properties for snapshot targets -->
+    <import file="${hy.hdk}/build/ant/properties.xml" />
 
-    <target name="build-java" 
-            description="Compiles the java code only" >
-        <echo>
-========================================
-Building Java component archives...
-========================================
-        </echo>
-        <ant antfile="make/build-java.xml" inheritall="false" target="build">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <!-- ================================
+	 target : rebuild
+	     
+	 builds with a clean first
+	 ================================= -->
+    <target name="rebuild" depends="clean,build"
+        description="Performs a full build - that is 'clean' then 'build'" />
+	
+    <target name="build" description="Compiles the java, natives and tests">
+        <poll-modules target="build" />
     </target>
 
-    <target name="clean-java" 
-            description="Removes the compiled java code" >
-        <echo>
-========================================
-Cleaning Java component archives...
-========================================
-        </echo>
-        <ant antfile="make/build-java.xml" inheritall="false" target="clean">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <target name="clean"
+            description="Removes all the files generated by a build" >
+        <poll-modules target="clean" />
     </target>
 
-    <target name="rebuild-native" depends="clean-native,build-native"
-            description="Like 'rebuild' but for native code only" />
+    <target name="test" depends="clean-test-output,-test-modules"
+            description="Runs all tests" />
 
-    <target name="build-native" 
-            description="Compiles the native code only" >
-        <echo>
-========================================
-Building native libs and executables...
-========================================
-        </echo>
-        <ant antfile="make/build-native.xml" inheritall="false" target="build">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <target name="-test-modules">
+        <poll-modules target="test" />
     </target>
 
-    <target name="clean-native"
-        description="Removes the compiled native code" >
-        <echo>
-========================================
-Cleaning native libs and executables...
-========================================
-        </echo>
-        <ant antfile="make/build-native.xml" inheritall="false" target="clean">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
-    </target>
-
-    <target name="clean-tests"
-        description="Removes the compiled tests and results" >
-        <echo>
-========================================
-Cleaning compiled tests and results...
-========================================
-        </echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="clean">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <target name="clean-test-output">
+        <delete dir="${tests.output}" />
     </target>
 
-    <target name="test"
-            description="Runs all tests">
+    <target name="findbugs" depends="check-depends"
+            description="Runs FindBugs on all modules">
         <echo>
 ========================================
-Testing jdktools binaries...
+Finding bugs in all class libraries...
 ========================================
 </echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="test-all">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+        <poll-modules target="findbugs" />
     </target>
 
     <target name="check-depends"
             description="Report on whether the dependencies are met">
-        <ant antfile="make/depends.xml" target="check"/>
+        <poll-modules target="check-depends" />
     </target>
 
     <target name="fetch-depends"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
-        <ant antfile="make/depends.xml" target="fetch"/>
+        <poll-modules target="fetch-depends" />
     </target>
 
-    <target name="properties" depends="tools-echo"
-        description="Display the properties that are use in the ant build files"/>
+    <target name="properties" depends="echo"
+        description="Display the properties that are use by this build" />
 
 </project>
 

Modified: harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties Sun Apr 25 21:25:39 2010
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+depends.jars=${depends.dir}/jars
+
 icu=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base-3.3.zip
 icu.url=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/com.ibm.icu.base-3.3.zip
 icu.md5=5b8a0fc0e48431d376c7efd7be8c0f7b

Modified: harmony/enhanced/java/branches/mrh/jdktools/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/make/properties.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/make/properties.xml Sun Apr 25 21:25:39 2010
@@ -19,55 +19,35 @@
 
  -->
 
-<project name="Top-Level property definitions">
+<project name="Top-Level jdktools property definitions">
     <description>
         Ant file of common properties to be imported by other ant files
     </description>
     
-    <dirname property="prop.imported.basedir" file="${ant.file.Top-Level property definitions}"/>
-    <property name="jdktools.base.dir" location="${prop.imported.basedir}/.." />
-    
-    <property file="jdktools.properties"/>
-    <property file="${user.home}/jdktools.properties"/>
+    <fail message="Property 'hy.hdk' is not defined">
+        <condition>
+            <not><isset property="hy.hdk" /></not>
+        </condition>
+    </fail>
 
-    <!-- Test run property -->
-    <property name="hy.test.forkmode" value="perBatch" />
-    <property name="hy.test.vm.name" value="drl"/>
-
-    <!-- set the path root for the classlib : must be relative to the build directory -->
-    <property name="external.classlib.loc" value="${jdktools.base.dir}/../classlib/deploy" />
-    <property name="external.drlvm.loc" value="${jdktools.base.dir}/../drlvm/deploy" />
-    <property name="external.resources.loc" value="${jdktools.base.dir}/../common_resources" />
-    <property name="external.resources" location="${external.resources.loc}" />
-
-    <property name="harmony.jdktools" location="${jdktools.base.dir}"/>
-    <condition property="hy.deploy" value="${hy.hdk}">
-        <isset property="hy.hdk"/>
-    </condition>
-    <property name="hy.deploy" location="${external.drlvm.loc}"/>
-    <property name="hy.hdk" location="${external.classlib.loc}" />
-    <property name="jdktools.deploy.dir" location="${jdktools.base.dir}/deploy/jdk" />
-    <property name="jretools.deploy.dir" location="${jdktools.base.dir}/deploy/jdk/jre" />
-
-    <!-- set the path root for the external resources  -->
-    <property name="common.resources.loc" value="${jdktools.base.dir}/../common_resources" />
-    <property name="common.resources" location="${common.resources.loc}" />
-    <fail>
+    <fail message="Property 'common.resources' is not defined">
         <condition>
-            <not><available file="${common.resources}/make/properties.xml"/></not>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
+
+    <fail message="Property 'hy.hdk' doesn't seem to point to an hdk?">
+        <condition>
+            <not><available file="${hy.hdk}/build/ant/properties.xml" /></not>
+        </condition>
+    </fail>
+
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not>
+                <available file="${common.resources}/make/depends.properties" />
+            </not>
         </condition>
-        Primary dependency is missing: common_resources.
-        You need to check it out from SVN repository or specify it's location:
-        ant -Dcommon.resources.loc=path
     </fail>
-    
-    <import file="${common.resources}/make/properties.xml"/>
-    <import file="${common.resources}/make/depends.xml"/>
-    
-    <property file="${jdktools.base.dir}/make/depends.properties" />
-    
-    <target name="tools-echo" depends="echo"
-            description="Display the properties defined by this ant file" >
-    </target>
 
 </project>

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=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml Sun Apr 25 21:25:39 2010
@@ -16,21 +16,21 @@
     limitations under the License.
 -->
 
-<project name="Tools Build" default="build" basedir=".">
-    <description>Build for Tools component</description>
+<project name="JDK Tools Build" default="build" basedir=".">
+    <description>Build for JDK Tools component</description>
 
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <property name="tests.output" location="../../build/test_report" />
+    <property name="hy.module" value="jdktools" />
     <property name="hy.hdk" location="../../deploy" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+    <import file="../../make/properties.xml" />
+    <property name="depends.dir" location="${common.resources}/depends" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
+    <property file="../../make/depends.properties" />
+    <property file="${common.resources}/make/depends.properties" />
 
     <!-- filename for tests exclude list -->
     <property name="tools.exclude.file"
-              location="${hy.hdk}/build/jdktools.tools.exclude" />
+              location="${hy.hdk}/build/jdktools.exclude" />
    
     <target name="check-depends">
         <check-one-file src="${jdt.jdi.jar.url}"
@@ -56,12 +56,7 @@
                            src="${bcel.url}" md5="${bcel.md5}"/>
     </target>
 
-    <target name="build" depends="check-depends, build-java" />
-    <target name="build-java" depends="compile-java, build-jar" />
-    <target name="build-native" />
-
-    <target name="clean" depends="clean-java" />
-    <target name="clean-native" />
+    <target name="build" depends="check-depends,build-jar,copy-jars" />
 
     <target name="test" depends="test-module">
         <fail message="Some tests failed">
@@ -75,18 +70,19 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="test-module" depends="build-tests, prepare-exclude, run-tests" />
+    <target name="test-module"
+            depends="build-tests,prepare-exclude,run-tests"/>
 
-    <target name="clean-java">
-        <echo message="Cleaning TOOLS classes" />
+    <target name="clean">
+        <echo message="Cleaning ${hy.module} classes" />
 
-        <delete file="${jdktools.deploy.dir}/lib/tools.jar" />
-        <delete file="${jdktools.deploy.dir}/lib/tools-src.jar" />
+        <delete file="${hy.jdk}/lib/tools.jar" />
+        <delete file="${hy.jdk}/lib/tools-src.jar" />
         <delete dir="bin" includeemptydirs="true" failonerror="false" />
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling TOOLS classes" />
+        <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
         <mkdir dir="bin/main" />
 
@@ -113,14 +109,12 @@
         </hy.javac>
     </target>
 
-    <target name="build-jar" depends="svn-info">
-        <mkdir dir="${jdktools.deploy.dir}/lib" />
+    <target name="build-jar" depends="svn-info,compile-java">
+        <mkdir dir="${hy.jdk}/lib" />
 
-        <hy.jar.bin destfile="${jdktools.deploy.dir}/lib/tools.jar"
+        <hy.jar.bin destfile="${hy.jdk}/lib/tools.jar"
                     manifest="META-INF/MANIFEST.MF">
-
             <fileset dir="bin/main" />
-
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
@@ -132,13 +126,20 @@
 
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${jdktools.deploy.dir}/lib/tools-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/lib/tools-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
 
+    <target name="copy-jars">
+        <mkdir dir="${hy.jdk}/lib" />
+        <copy todir="${hy.jdk}/lib" flatten="true">
+            <fileset file="${ecj.jar}"/>
+        </copy>
+    </target>
+
     <target name="build-tests">
-        <echo message="Compiling TOOLS tests" />
+        <echo message="Compiling ${hy.module} tests" />
         <ensure-javac/>
         <mkdir dir="bin/test" />
 
@@ -153,7 +154,7 @@
                 </fileset>
             </bootclasspath>
             <classpath>
-                <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
+                <pathelement path="${hy.jdk}/lib/tools.jar"/>
                 <pathelement path="${junit.jar}"/>
             </classpath>
             <classpath location="bin/test" />
@@ -164,16 +165,16 @@
     </target>
 
     <target name="prepare-exclude">
-        <echo message="TOOLS exclude list: ${tools.exclude.file}" />
-        <prepare-exclude-list moduleName="tools" dir="./make"
+        <echo message="${hy.module} exclude list: ${tools.exclude.file}" />
+        <prepare-exclude-list moduleName="${hy.module}" dir="./make"
                              result="${tools.exclude.file}" />
     </target>
 
     <target name="run-tests" depends="build-tests, prepare-exclude">
 
-        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
+        <property name="test.jre.home" value="${hy.jre}" />
 
-        <echo message="Running TOOLS tests" />
+        <echo message="Running ${hy.module} tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
         <mkdir dir="${tests.output}" />
@@ -192,7 +193,7 @@
 
             <classpath>
                 <pathelement path="bin/test"/>
-                <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
+                <pathelement path="${hy.jdk}/lib/tools.jar"/>
             </classpath>
 
             <formatter type="xml" />
@@ -219,12 +220,12 @@
 
     <target name="touch-failures-file" if="test.failures">
         <echo file="${tests.output}/test.failures"
-            append="true">tools${line.separator}</echo>
+            append="true">${hy.module}${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
         <echo file="${tests.output}/test.errors"
-            append="true">tools${line.separator}</echo>
+            append="true">${hy.module}${line.separator}</echo>
     </target>
 
 </project>

Added: harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/depends.properties?rev=937882&view=auto
==============================================================================
    (empty)

Propchange: harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml Sun Apr 25 21:25:39 2010
@@ -19,18 +19,20 @@
 <project name="JPDA Build" default="build" basedir=".">
     <description>Build for JPDA component</description>
 
-    <!-- import common properties -->
-    <property name="tests.build.output" location="${basedir}/../../build/tests" />
-    <import file="../../make/properties.xml" />
-
-    <property name="tests.output" location="../../build/test_report" />
+    <property name="hy.module" value="jpda" />
     <property name="hy.hdk" location="../../deploy" />
-    <property name="hy.build" location="bin/main" />
+    <import file="../../make/properties.xml" />
+    <property name="depends.dir" location="${common.resources}/depends" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
+    <property file="../../make/depends.properties" />
+    <property file="${common.resources}/make/depends.properties" />
     
     <!-- filename for tests exclude list -->
-    <property name="jpda.exclude.file" location="${hy.hdk}/build/jdktools.jpda.exclude" />
+    <property name="jpda.exclude.file"
+              location="${hy.hdk}/build/jpda.exclude" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="bin/main">
         <or>
             <present targetdir="src/main/java" />
             <present targetdir="src/main/java">
@@ -76,11 +78,11 @@
     <target name="compile-java">
         <echo message="Compiling JPDA classes" />
         <ensure-javac/>
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="bin/main" />
 
         <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="${hy.build}">
+               destdir="bin/main">
 
             <!-- HDK class library -->
             <classpath>
@@ -99,22 +101,22 @@
 
     <!-- create jdtstub.jar to resolve JDI implementation dependency -->
     <target name="build-jar" depends="svn-info">
-        <mkdir dir="${jdktools.deploy.dir}/lib" />
+        <mkdir dir="${hy.jdk}/lib" />
 
-        <hy.jar.bin destfile="${jdktools.deploy.dir}/lib/jdtstub.jar"
+        <hy.jar.bin destfile="${hy.jdk}/lib/jdtstub.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${jdktools.deploy.dir}/lib/jdtstub-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/lib/jdtstub-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
 
     <!-- copy all required jars with JDI implementation and dependent classes -->
     <target name="copy-jars">
-        <mkdir dir="${jdktools.deploy.dir}/lib" />
-        <copy todir="${jdktools.deploy.dir}/lib" flatten="true">
+        <mkdir dir="${hy.jdk}/lib" />
+        <copy todir="${hy.jdk}/lib" flatten="true">
             <fileset file="${icu.jar}"/>
             <fileset file="${jdt.jdimodel.jar}"/>
         </copy>
@@ -131,14 +133,14 @@
         <!-- Build agent shared lib -->
         <make dir="src/main/native/jdwp/${hy.os.family}/agent">
             <make-elements>
-                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
             </make-elements>
         </make>
         
         <!-- Build socket transport shared lib -->
         <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_socket">
             <make-elements>
-                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
             </make-elements>
         </make>
     </target>
@@ -147,7 +149,7 @@
         <!-- Build shared memory transport shared lib on Windows -->
         <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_shmem">
             <make-elements>
-                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
             </make-elements>
         </make>
 
@@ -160,13 +162,13 @@
     <target name="clean-java">
         <echo message="Cleaning JPDA classes" />
 
-        <delete file="${jdktools.deploy.dir}/lib/jdtstub.jar" />
-        <delete file="${jdktools.deploy.dir}/lib/jdtstub-src.jar" />
+        <delete file="${hy.jdk}/lib/jdtstub.jar" />
+        <delete file="${hy.jdk}/lib/jdtstub-src.jar" />
 
         <delete includeemptydirs="true" failonerror="false">
             <!--fileset refid="classes" /-->
-            <fileset dir="${hy.build}" />
-            <fileset dir="${tests.build.output}/classes" />
+            <fileset dir="bin/main" />
+            <fileset dir="bin/test" />
         </delete>
     </target>
 
@@ -179,14 +181,14 @@
         <make dir="src/main/native/jdwp/${hy.os.family}/agent"
               target="clean">
             <make-elements>
-                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
             </make-elements>
         </make>
 
         <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_socket"
               target="clean">
             <make-elements>
-                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
             </make-elements>
         </make>
     </target>
@@ -195,7 +197,7 @@
         <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_shmem"
               target="clean">
             <make-elements>
-                <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
             </make-elements>
         </make>
     </target>
@@ -204,10 +206,10 @@
     <target name="build-tests" >
         <echo message="Compiling JPDA tests" />
         <ensure-javac/>
-        <mkdir dir="${tests.build.output}/classes" />
+        <mkdir dir="bin/test" />
         <hy.javac
             srcdir="src/test/java"
-            destdir="${tests.build.output}/classes"
+            destdir="bin/test"
             sourcepath=""
             debug="on">
 
@@ -220,7 +222,6 @@
             </classpath>
             
             <classpath>
-                <pathelement path="${tests.build.output}/classes"/>
                 <pathelement path="${junit.jar}"/>
             </classpath>
         </hy.javac>
@@ -234,7 +235,7 @@
 
     <target name="run-tests" depends="build-tests, prepare-exclude">
 
-        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
         <property name="test.jre.jvm" value="${test.jre.home}/bin/java" />
         <property name="test.debugger.jvm" value="${test.jre.jvm}" />
         <property name="test.debuggee.jvm" value="${test.jre.jvm}" />
@@ -263,7 +264,7 @@
             <jvmarg value="-Djpda.settings.debuggeeVMExtraOptions=${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${tests.build.output}/classes"/>
+                <pathelement path="bin/test" />
             </classpath>
 
             <formatter type="xml" />

Added: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/depends.properties?rev=937882&view=auto
==============================================================================
    (empty)

Propchange: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml?rev=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/build.xml Sun Apr 25 21:25:39 2010
@@ -16,25 +16,23 @@
     limitations under the License.
 -->
 
-<project name="Tools Build" default="build" basedir=".">
-    <description>Build for Tools component</description>
+<project name="JRE Tools Build" default="build" basedir=".">
+    <description>Build for JRE Tools component</description>
 
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <property name="tests.output" location="../../build/test_report" />
+    <property name="hy.module" value="jretools" />
     <property name="hy.hdk" location="../../deploy" />
+    <import file="../../make/properties.xml" />
+    <property name="depends.dir" location="${common.resources}/depends" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
+    <property file="../../make/depends.properties" />
+    <property file="${common.resources}/make/depends.properties" />
 
     <!-- filename for tests exclude list -->
     <property name="tools.exclude.file"
-              location="${hy.hdk}/build/jretools.tools.exclude" />
+              location="${hy.hdk}/build/jretools.exclude" />
     
-    <target name="build" depends="build-java" />
-    <target name="build-java" depends="compile-java, build-jar" />
-    <target name="build-native" />
-
-    <target name="clean" depends="clean-java" />
-    <target name="clean-native" />
+    <target name="build" depends="build-jar" />
 
     <target name="test" depends="test-module">
         <fail message="Some tests failed">
@@ -48,18 +46,19 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="test-module" depends="build-tests, prepare-exclude, run-tests" />
+    <target name="test-module"
+            depends="build-tests,prepare-exclude,run-tests" />
 
-    <target name="clean-java">
-        <echo message="Cleaning TOOLS classes" />
+    <target name="clean">
+        <echo message="Cleaning ${hy.module} classes" />
 
-        <delete file="${jretools.deploy.dir}/lib/tools.jar" />
-        <delete file="${jretools.deploy.dir}/lib/tools-src.jar" />
+        <delete file="${hy.jre}/lib/tools.jar" />
+        <delete file="${hy.jre}/lib/tools-src.jar" />
         <delete dir="bin" includeemptydirs="true" failonerror="false" />
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling TOOLS classes" />
+        <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
         <mkdir dir="bin/main" />
 
@@ -78,25 +77,24 @@
         </hy.javac>
     </target>
 
-    <target name="build-jar" depends="svn-info">
-        <mkdir dir="${jretools.deploy.dir}/lib" />
+    <target name="build-jar" depends="svn-info,compile-java">
+        <mkdir dir="${hy.jre}/lib" />
 
-        <hy.jar.bin destfile="${jretools.deploy.dir}/lib/tools.jar"
+        <hy.jar.bin destfile="${hy.jre}/lib/tools.jar"
              manifest="META-INF/MANIFEST.MF">
             <fileset dir="bin/main" />
-
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${jretools.deploy.dir}/lib/tools-src.jar">
+        <hy.jar.src destfile="${hy.jre}/lib/tools-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
 
     <target name="build-tests">
-        <echo message="Compiling TOOLS tests" />
+        <echo message="Compiling ${hy.module} tests" />
         <ensure-javac/>
         <mkdir dir="bin/test" />
 
@@ -111,7 +109,7 @@
                 </fileset>
             </bootclasspath>
             <classpath>
-                <pathelement path="${jretools.deploy.dir}/lib/tools.jar"/>
+                <pathelement path="${hy.jre}/lib/tools.jar"/>
                 <pathelement path="${junit.jar}"/>
             </classpath>
             <classpath location="bin/test" />
@@ -122,16 +120,16 @@
     </target>
 
     <target name="prepare-exclude">
-        <echo message="TOOLS exclude list: ${tools.exclude.file}" />
-        <prepare-exclude-list moduleName="tools" dir="./make"
+        <echo message="${hy.module} exclude list: ${tools.exclude.file}" />
+        <prepare-exclude-list moduleName="jretools" dir="./make"
                              result="${tools.exclude.file}" />
     </target>
 
-    <target name="run-tests" depends="build-tests, prepare-exclude">
+    <target name="run-tests" depends="build-tests,prepare-exclude">
 
-        <property name="test.jre.home" value="${jretools.deploy.dir}" />
+        <property name="test.jre.home" value="${hy.jre}" />
 
-        <echo message="Running TOOLS tests" />
+        <echo message="Running ${hy.module} tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
         <mkdir dir="${tests.output}" />
@@ -150,7 +148,7 @@
 
             <classpath>
                 <pathelement path="bin/test"/>
-                <pathelement path="${jretools.deploy.dir}/lib/tools.jar"/>
+                <pathelement path="${hy.jre}/lib/tools.jar"/>
             </classpath>
 
             <formatter type="xml" />
@@ -177,12 +175,12 @@
 
     <target name="touch-failures-file" if="test.failures">
         <echo file="${tests.output}/test.failures"
-            append="true">tools${line.separator}</echo>
+            append="true">${hy.module}${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
         <echo file="${tests.output}/test.errors"
-            append="true">tools${line.separator}</echo>
+            append="true">${hy.module}${line.separator}</echo>
     </target>
 
 </project>

Added: harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/depends.properties?rev=937882&view=auto
==============================================================================
    (empty)

Propchange: harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native

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=937882&r1=937881&r2=937882&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/build.xml Sun Apr 25 21:25:39 2010
@@ -19,24 +19,18 @@
 <project name="Samsa Build" default="build" basedir=".">
     <description>Build for samsa program</description>
 
-    <!-- import common properties -->
-    <import file="../../make/properties.xml" />
-
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
 
-    <property name="tests.output" location="../../build/test_report" />
+    <property name="hy.module" value="jdktools" />
+    <property name="hy.hdk" location="../../deploy" />
+    <import file="../../make/properties.xml" />
+    <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" />
 
     <target name="build" depends="build-native"/>
-    <target name="build-java"/>
-
     <target name="clean" depends="clean-native"/>
-    <target name="clean-java"/>
-
     <target name="test" depends="test-module" />
-    <target name="build-tests" />
     <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" />
@@ -45,10 +39,7 @@
     <target name="-compile-native" >
 
         <echo message="Compiling SAMSA natives" />
-        <echo message="harmony.jdktools=${harmony.jdktools}" />
-            
         <make dir="src/main/native/samsa/${hy.os.family}" />
-
     </target>
 
     <!-- copy samsa executable for different tools -->
@@ -57,63 +48,63 @@
         <property name="hy.samsa.exe"
                   location="${hy.hdk}/lib/samsa${exe.suffix}" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/java${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/java${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/java${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/java${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javac${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/javac${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javac${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javac${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javah${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/javah${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javah${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javah${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javadoc${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/javadoc${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javadoc${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javadoc${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/javap${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/javap${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/javap${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javap${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jarsigner${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/jarsigner${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/appletviewer${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/appletviewer${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/appletviewer${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/keytool${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/keytool${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/keytool${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/unpack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/unpack200${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/unpack200${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/pack200${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/pack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/pack200${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/pack200${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/policytool${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/policytool${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/policytool${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/policytool${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/jar${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/jar${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/jar${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/jar${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/rmic${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/rmic${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/rmid${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/rmid${exe.suffix}" perm="ugo+x" />
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/rmiregistry${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/rmiregistry${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/rmic${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/rmic${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/rmid${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/rmid${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/rmiregistry${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/rmiregistry${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/serialver${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/serialver${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jdk}/bin/serialver${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/serialver${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/keytool${exe.suffix}" />
-        <chmod file="${jretools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/keytool${exe.suffix}" />
+        <chmod file="${hy.jre}/bin/keytool${exe.suffix}" perm="ugo+x" />
 
-        <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/unpack200${exe.suffix}" />
-        <chmod file="${jretools.deploy.dir}/bin/unpack200${exe.suffix}" perm="ugo+x" />
+        <copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/unpack200${exe.suffix}" />
+        <chmod file="${hy.jre}/bin/unpack200${exe.suffix}" perm="ugo+x" />
 
-    	<copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/pack200${exe.suffix}" />
-    	<chmod file="${jretools.deploy.dir}/bin/pack200${exe.suffix}" perm="ugo+x" />
+    	<copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/pack200${exe.suffix}" />
+    	<chmod file="${hy.jre}/bin/pack200${exe.suffix}" perm="ugo+x" />
 
-    	<copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/policytool${exe.suffix}" />
-        <chmod file="${jretools.deploy.dir}/bin/policytool${exe.suffix}" perm="ugo+x" />
+    	<copy file="${hy.samsa.exe}" tofile="${hy.jre}/bin/policytool${exe.suffix}" />
+        <chmod file="${hy.jre}/bin/policytool${exe.suffix}" perm="ugo+x" />
 
     </target>
 
@@ -123,15 +114,15 @@
                   location="${hy.hdk}/lib/samsaw${exe.suffix}" />
 
         <copy file="${hy.samsaw.exe}"
-              tofile="${jdktools.deploy.dir}/bin/javaw${exe.suffix}" />
-        <chmod file="${jdktools.deploy.dir}/bin/javaw${exe.suffix}"
+              tofile="${hy.jdk}/bin/javaw${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/javaw${exe.suffix}"
                perm="ugo+x" />
     </target>
 
     <!-- copy samsa configuration data for different tools -->
     <target name="-copy-native-data" >
 
-        <copy todir="${jdktools.deploy.dir}/bin/data" overwrite="yes">
+        <copy todir="${hy.jdk}/bin/data" overwrite="yes">
             <fileset dir="src/main/resources/data/">
                 <include name="*.dat" />
             </fileset>
@@ -147,7 +138,7 @@
 
     <target name="run-tests" depends="prepare-exclude" >
 
-        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
 
         <echo message="Running SAMSA tests" />
         <echo message="test.jre.home=${test.jre.home}" />



Mime
View raw message