harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948805 - in /harmony/enhanced/java/trunk: classlib/make/ common_resources/make/ jdktools/modules/jdktools/ jdktools/modules/jdktools/depends/bcel/ jdktools/modules/jdktools/depends/manifests/bcel-5.2/ jdktools/modules/jretools/ jdktools/mo...
Date Thu, 27 May 2010 12:36:35 GMT
Author: hindessm
Date: Thu May 27 12:36:34 2010
New Revision: 948805

URL: http://svn.apache.org/viewvc?rev=948805&view=rev
Log:
Make -Dhy.select=true build compile.
I had to fix some minor problems with the bcel jar not being copied by
jdktools/modules/jdktools/build.xml that already existed but went unnoticed
because classlib/modules/orb/build.xml copied it correctly.
While fixing that I also removed bcel-5.2 from the manifest path to
avoid having to do "svn move" if/when we update it.

Added:
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/bcel/
      - copied from r947186, harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/manifests/bcel-5.2/
Removed:
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/manifests/bcel-5.2/
Modified:
    harmony/enhanced/java/trunk/classlib/make/properties.xml
    harmony/enhanced/java/trunk/common_resources/make/depends.properties
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml
    harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml

Modified: harmony/enhanced/java/trunk/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/properties.xml?rev=948805&r1=948804&r2=948805&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/properties.xml Thu May 27 12:36:34 2010
@@ -283,6 +283,13 @@
     </condition>
     <property name="jpeg.home" value="/usr" />
     
+    <condition property="is.select" value="true">
+        <istrue value="${hy.select}" />
+    </condition>
+    <condition property="is.not.select" value="true">
+        <not><istrue value="${hy.select}" /></not>
+    </condition>
+
     <!-- default property for poll-modules macro - i.e. all modules -->
     <property name="build.module" value="*" />
     <condition property="exclude.module"

Modified: harmony/enhanced/java/trunk/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/depends.properties?rev=948805&r1=948804&r2=948805&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/common_resources/make/depends.properties Thu May 27 12:36:34
2010
@@ -144,9 +144,11 @@ yoko-rmi-spec.url=http://people.apache.o
 yoko-rmi-spec.md5=8ef16849448ecccabc0f1aac8b840e9c
 
 # bcel is needed by yoko-rmi
-bcel.dir=${depends.jars}/bcel-5.2
-bcel.jar=${bcel.dir}/bcel-5.2.jar
-bcel.url=${maven2.base}/org/apache/bcel/bcel/5.2/bcel-5.2.jar
+bcel.version=5.2
+bcel.base=bcel-${bcel.version}
+bcel.dir=${depends.jars}/${bcel.base}
+bcel.jar=${bcel.dir}/${bcel.base}.jar
+bcel.url=${maven2.base}/org/apache/bcel/bcel/${bcel.version}/${bcel.base}.jar
 bcel.md5=43d54687362fc2991d61201c453a8286
 
 jetty.dir=${depends.jars}/jetty

Modified: harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml?rev=948805&r1=948804&r2=948805&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml Thu May 27 12:36:34 2010
@@ -36,11 +36,10 @@
         <check-one-file src="${icu.url}" dest="${icu.jar}" />
         <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
         <check-one-file src="${bcel.jar}" dest="${bcel.jar}" />
-        <copy todir="${hy.hdk}/jdk/jre/lib/boot">
-            <fileset dir="${depends.jars}">
-                <patternset includes="${bcel.version}/*.jar" />
-            </fileset>
-            <fileset dir="depends/manifests"/>
+        <mkdir dir="${hy.hdk}/jdk/jre/lib/boot/${bcel.base}" />
+        <copy todir="${hy.hdk}/jdk/jre/lib/boot/${bcel.base}">
+            <fileset file="${bcel.jar}" />
+            <fileset dir="depends/bcel" />
         </copy>
     </target>
     
@@ -112,6 +111,13 @@
                 <pathelement path="${ant.library.dir}/ant-launcher.jar" />
                 <pathelement path="${ant.library.dir}/ant-nodeps.jar" />
             </classpath>
+
+            <exclude name="org/apache/harmony/tools/appletviewer/**"
+                     if="is.select"/>
+            <exclude name="org/apache/harmony/tools/rmi*/**" if="is.select"/>
+            <exclude name="org/apache/harmony/tools/serialver/**"
+                     if="is.select"/>
+
         </hy.javac>
     </target>
 
@@ -179,6 +185,8 @@
                 <src>
                     <pathelement location="src/test/java" />
                 </src>
+                <exclude name="org/apache/harmony/tests/tools/serialver/**"
+                         if="is.select"/>
                 <classpath>
                     <pathelement path="${hy.jdk}/lib/tools.jar"/>
                 </classpath>

Modified: harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml?rev=948805&r1=948804&r2=948805&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml Thu May 27 12:36:34 2010
@@ -76,6 +76,10 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
+
+            <exclude name="org/apache/harmony/jretools/policytool/**"
+                     if="is.select"/>
+
         </hy.javac>
     </target>
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml?rev=948805&r1=948804&r2=948805&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml Thu May 27 12:36:34 2010
@@ -31,7 +31,7 @@
     <target name="-test-module" depends="run-tests" />
 
     <target name="build-native" unless="skip.native.build"
-            depends="-compile-native,-copy-native-exe,
+            depends="-compile-native,-copy-native-exe,-copy-native-not-select,
                      -copy-native-exe-windows,-copy-native-data" />
 
     <!-- compile universal samsa binary -->
@@ -64,9 +64,6 @@
         <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="${hy.jdk}/bin/appletviewer${exe.suffix}"
/>
-        <chmod file="${hy.jdk}/bin/appletviewer${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" />
 
@@ -82,16 +79,6 @@
         <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="${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="${hy.jdk}/bin/serialver${exe.suffix}" />
-        <chmod file="${hy.jdk}/bin/serialver${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" />
 
@@ -101,7 +88,30 @@
     	<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="${hy.jre}/bin/policytool${exe.suffix}" />
+    </target>
+
+    <!-- copy samsa executable for different tools -->
+    <target name="-copy-native-not-select" unless="skip.native.build"
+            if="is.not.select">
+
+        <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="${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="${hy.jdk}/bin/serialver${exe.suffix}" />
+        <chmod file="${hy.jdk}/bin/serialver${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>



Mime
View raw message