harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r830350 - in /harmony/enhanced/jdktools/trunk/modules: jdktools/ jdktools/make/ jpda/ jpda/make/ jretools/ jretools/make/ samsa/ samsa/make/
Date Tue, 27 Oct 2009 21:32:14 GMT
Author: hindessm
Date: Tue Oct 27 21:32:13 2009
New Revision: 830350

URL: http://svn.apache.org/viewvc?rev=830350&view=rev
Log:
Repeating refactoring previously carried out in classlib.

Removed:
    harmony/enhanced/jdktools/trunk/modules/jdktools/make/hyproperties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/make/hyproperties.xml
    harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/make/hyproperties.xml
Modified:
    harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/jretools/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jretools/build.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml

Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml?rev=830350&r1=830349&r2=830350&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml Tue Oct 27 21:32:13 2009
@@ -20,28 +20,18 @@
     <description>Build for Tools component</description>
 
     <!-- import common properties -->
-    <property name="tests.build.output" location="../../build/tests" />
     <import file="${basedir}/../../make/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
+    <property name="hy.hdk" location="../../deploy" />
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <!-- filename for tests exclude list -->
-    <property name="tools.exclude.file" location="${hy.hdk}/build/jdktools.tools.exclude"
/>
-
-    <fileset id="classes" dir="${hy.build}">
-        <or>
-            <present targetdir="${hy.tools.src.main.java}" />
-            <present targetdir="${hy.tools.src.main.java}">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-        </or>
-    </fileset>
-    
+    <property name="tools.exclude.file"
+              location="${hy.hdk}/build/jdktools.tools.exclude" />
+   
     <target name="check-depends">
         <check-one-file src="${jdt.jdi.jar.url}"
                         dest="${jdt.jdi.jar}" />
@@ -57,8 +47,8 @@
     </target>
 
 
-    <target name="build" depends="check-depends, build-java, copy-resources, build-jar"
/>
-    <target name="build-java" depends="compile-java, copy-resources, build-jar" />
+    <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" />
@@ -83,21 +73,17 @@
 
         <delete file="${jdktools.deploy.dir}/lib/tools.jar" />
         <delete file="${jdktools.deploy.dir}/lib/tools-src.jar" />
-        <delete includeemptydirs="true" failonerror="false">
-            <!--fileset refid="classes" /-->
-            <fileset dir="${hy.build}" />
-            <fileset dir="${tests.build.output}/classes" />
-        </delete>
+        <delete dir="bin" includeemptydirs="true" failonerror="false" />
     </target>
 
     <target name="compile-java">
         <echo message="Compiling TOOLS classes" />
         <ensure-javac/>
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="bin/main" />
 
         <hy.javac sourcepath=""
-               srcdir="${hy.tools.src.main.java}"
-               destdir="${hy.build}">
+               srcdir="src/main/java"
+               destdir="bin/main">
 
             <bootclasspath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
@@ -115,22 +101,18 @@
         </hy.javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.tools.src.main.java}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
     <target name="build-jar" depends="svn-info">
         <mkdir dir="${jdktools.deploy.dir}/lib" />
 
         <jar destfile="${jdktools.deploy.dir}/lib/tools.jar"
-             manifest="${hy.tools}/META-INF/MANIFEST.MF">
+             manifest="META-INF/MANIFEST.MF">
+
+            <fileset dir="bin/main" />
+
+            <fileset dir="src/main/java">
+                <exclude name="**/*.java" />
+            </fileset>
 
-            <fileset refid="classes" />
             <zipfileset src="${jdt.jdi.jar}">
                 <exclude name="com/sun/jdi/Bootstrap.class"/>
                 <exclude name="META-INF/*"/>
@@ -145,7 +127,7 @@
         </jar>
 
         <jar destfile="${jdktools.deploy.dir}/lib/tools-src.jar">
-            <fileset dir="${hy.tools.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -158,12 +140,12 @@
     <target name="build-tests">
         <echo message="Compiling TOOLS tests" />
         <ensure-javac/>
-        <mkdir dir="${tests.build.output}/classes" />
+        <mkdir dir="bin/test" />
 
-        <hy.javac srcdir="${hy.tools.src.test.java}"
-               destdir="${tests.build.output}/classes"
-               sourcepath=""
-               debug="on">
+        <hy.javac srcdir="src/test/java"
+                  destdir="bin/test"
+                  sourcepath=""
+                  debug="on">
 
             <bootclasspath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
@@ -174,7 +156,7 @@
                 <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
                 <pathelement path="${junit.jar}"/>
             </classpath>
-            <classpath location="${tests.build.output}/classes" />
+            <classpath location="bin/test" />
 
             <!-- temporarely exclude one test that breaks compilation -->
             <exclude name="**/javah/Test02.java"/>
@@ -209,7 +191,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${tests.build.output}/classes"/>
+                <pathelement path="bin/test"/>
                 <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
             </classpath>
 
@@ -221,7 +203,7 @@
             <batchtest todir="${tests.output}" haltonfailure="no"
                                    unless="test.case">
 
-                <fileset dir="${hy.tools.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
 

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?rev=830350&r1=830349&r2=830350&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Tue Oct 27 21:32:13 2009
@@ -24,17 +24,16 @@
     <import file="../../make/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+    <property name="hy.hdk" location="../../deploy" />
+    <property name="hy.build" location="bin/main" />
     
     <!-- filename for tests exclude list -->
     <property name="jpda.exclude.file" location="${hy.hdk}/build/jdktools.jpda.exclude"
/>
 
     <fileset id="classes" dir="${hy.build}">
         <or>
-            <present targetdir="${hy.jpda.src.main.java}" />
-            <present targetdir="${hy.jpda.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -80,7 +79,7 @@
         <mkdir dir="${hy.build}" />
 
         <hy.javac sourcepath=""
-               srcdir="${hy.jpda.src.main.java}"
+               srcdir="src/main/java"
                destdir="${hy.build}">
 
             <!-- HDK class library -->
@@ -103,7 +102,7 @@
         <mkdir dir="${jdktools.deploy.dir}/lib" />
 
         <jar destfile="${jdktools.deploy.dir}/lib/jdtstub.jar"
-             manifest="${hy.jpda}/META-INF/MANIFEST.MF">
+             manifest="META-INF/MANIFEST.MF">
 
             <fileset refid="classes" />
 
@@ -116,7 +115,7 @@
         </jar>
 
         <jar destfile="${jdktools.deploy.dir}/lib/jdtstub-src.jar">
-            <fileset dir="${hy.jpda.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -144,14 +143,14 @@
         <echo message="Compiling JPDA natives" />
 
         <!-- Build agent shared lib -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent">
+        <make dir="src/main/native/jdwp/${hy.os.family}/agent">
             <make-elements>
                 <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
             </make-elements>
         </make>
         
         <!-- Build socket transport shared lib -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_socket">
+        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_socket">
             <make-elements>
                 <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
             </make-elements>
@@ -160,7 +159,7 @@
 
     <target name="-build-native-windows" if="is.windows">
         <!-- Build shared memory transport shared lib on Windows -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_shmem">
+        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_shmem">
             <make-elements>
                 <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
             </make-elements>
@@ -191,14 +190,14 @@
 
     <target name="-clean-native-common">
         <echo message="Cleaning JPDA natives" />
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent"
+        <make dir="src/main/native/jdwp/${hy.os.family}/agent"
               target="clean">
             <make-elements>
                 <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
             </make-elements>
         </make>
 
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_socket"
+        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_socket"
               target="clean">
             <make-elements>
                 <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
@@ -207,7 +206,7 @@
     </target>
 
     <target name="-clean-native-windows" if="is.windows">
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport/dt_shmem"
+        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_shmem"
               target="clean">
             <make-elements>
                 <arg line="TOOLSDLLPATH=${jdktools.deploy.dir}/jre/bin/" />
@@ -221,7 +220,7 @@
         <ensure-javac/>
         <mkdir dir="${tests.build.output}/classes" />
         <hy.javac
-            srcdir="${hy.jpda.src.test}"
+            srcdir="src/test/java"
             destdir="${tests.build.output}/classes"
             sourcepath=""
             debug="on">
@@ -288,7 +287,7 @@
             <!-- short running tests-->
             <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
 
-                <fileset dir="${hy.jpda.src.test}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
 
@@ -303,7 +302,7 @@
 
             <!-- long running tests-->
             <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
-                <fileset dir="${hy.jpda.src.test}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
 

Propchange: harmony/enhanced/jdktools/trunk/modules/jretools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 27 21:32:13 2009
@@ -0,0 +1 @@
+bin

Modified: harmony/enhanced/jdktools/trunk/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml?rev=830350&r1=830349&r2=830350&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jretools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/build.xml Tue Oct 27 21:32:13 2009
@@ -20,30 +20,17 @@
     <description>Build for Tools component</description>
 
     <!-- import common properties -->
-    <property name="tests.build.output" location="../../build/tests" />
     <import file="${basedir}/../../make/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+    <property name="hy.hdk" location="../../deploy" />
 
     <!-- filename for tests exclude list -->
-    <property name="tools.exclude.file" location="${hy.hdk}/build/jretools.tools.exclude"
/>
-
-    <fileset id="classes" dir="${hy.build}">
-        <or>
-            <present targetdir="${hy.tools.src.main.java}" />
-            <present targetdir="${hy.tools.src.main.java}">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-        </or>
-    </fileset>
+    <property name="tools.exclude.file"
+              location="${hy.hdk}/build/jretools.tools.exclude" />
     
-    <target name="build" depends="build-java, copy-resources, build-jar" />
-    <target name="build-java" depends="compile-java, copy-resources, build-jar" />
+    <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" />
@@ -68,21 +55,17 @@
 
         <delete file="${jretools.deploy.dir}/lib/tools.jar" />
         <delete file="${jretools.deploy.dir}/lib/tools-src.jar" />
-        <delete includeemptydirs="true" failonerror="false">
-            <!--fileset refid="classes" /-->
-            <fileset dir="${hy.build}" />
-            <fileset dir="${tests.build.output}/classes" />
-        </delete>
+        <delete dir="bin" includeemptydirs="true" failonerror="false" />
     </target>
 
     <target name="compile-java">
         <echo message="Compiling TOOLS classes" />
         <ensure-javac/>
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="bin/main" />
 
         <hy.javac sourcepath=""
-               srcdir="${hy.tools.src.main.java}"
-               destdir="${hy.build}">
+               srcdir="src/main/java"
+               destdir="bin/main">
 
             <bootclasspath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
@@ -99,22 +82,18 @@
         </hy.javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.tools.src.main.java}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
     <target name="build-jar" depends="svn-info">
         <mkdir dir="${jretools.deploy.dir}/lib" />
 
         <jar destfile="${jretools.deploy.dir}/lib/tools.jar"
-             manifest="${hy.tools}/META-INF/MANIFEST.MF">
+             manifest="META-INF/MANIFEST.MF">
+
+            <fileset dir="bin/main" />
 
-            <fileset refid="classes" />
+            <fileset dir="src/main/java">
+                <exclude name="**/*.java" />
+            </fileset>
+            
             <zipfileset src="${jdt.jdi.jar}">
                 <exclude name="com/sun/jdi/Bootstrap.class"/>
                 <exclude name="META-INF/*"/>
@@ -129,7 +108,7 @@
         </jar>
 
         <jar destfile="${jretools.deploy.dir}/lib/tools-src.jar">
-            <fileset dir="${hy.tools.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -142,12 +121,12 @@
     <target name="build-tests">
         <echo message="Compiling TOOLS tests" />
         <ensure-javac/>
-        <mkdir dir="${tests.build.output}/classes" />
+        <mkdir dir="bin/test" />
 
-        <hy.javac srcdir="${hy.tools.src.test.java}"
-               destdir="${tests.build.output}/classes"
-               sourcepath=""
-               debug="on">
+        <hy.javac srcdir="src/test/java"
+                  destdir="bin/test"
+                  sourcepath=""
+                  debug="on">
 
             <bootclasspath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
@@ -158,7 +137,7 @@
                 <pathelement path="${jretools.deploy.dir}/lib/tools.jar"/>
                 <pathelement path="${junit.jar}"/>
             </classpath>
-            <classpath location="${tests.build.output}/classes" />
+            <classpath location="bin/test" />
 
             <!-- temporarely exclude one test that breaks compilation -->
             <exclude name="**/javah/Test02.java"/>
@@ -193,7 +172,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${tests.build.output}/classes"/>
+                <pathelement path="bin/test"/>
                 <pathelement path="${jretools.deploy.dir}/lib/tools.jar"/>
             </classpath>
 
@@ -205,7 +184,7 @@
             <batchtest todir="${tests.output}" haltonfailure="no"
                                    unless="test.case">
 
-                <fileset dir="${hy.tools.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
 

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/build.xml?rev=830350&r1=830349&r2=830350&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/build.xml Tue Oct 27 21:32:13 2009
@@ -26,9 +26,6 @@
 
     <property name="tests.output" location="../../build/test_report" />
 
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
     <!-- filename for tests exclude list -->
     <property name="samsa.exclude.file" location="${hy.hdk}/build/jdktools.samsa.exclude"
/>
 
@@ -50,7 +47,7 @@
         <echo message="Compiling SAMSA natives" />
         <echo message="harmony.jdktools=${harmony.jdktools}" />
             
-        <make dir="${hy.samsa.src.main.native}/samsa/${hy.os.family}" />
+        <make dir="src/main/native/samsa/${hy.os.family}" />
 
     </target>
 
@@ -132,7 +129,7 @@
     <target name="-copy-native-data" >
 
         <copy todir="${jdktools.deploy.dir}/bin/data" overwrite="yes">
-            <fileset dir="${hy.samsa.src.main.resources}/data/">
+            <fileset dir="src/main/resources/data/">
                 <include name="*.dat" />
             </fileset>
         </copy>
@@ -230,7 +227,7 @@
     <!-- Clean natives -->
     <target name="clean-native">
         <echo message="Cleaning SAMSA natives" />
-        <make dir="${hy.samsa.src.main.native}/samsa/${hy.os.family}"
+        <make dir="src/main/native/samsa/${hy.os.family}"
               target="clean" />
     </target>
 



Mime
View raw message