harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948972 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/make/ classlib/modules/archive/make/ classlib/modules/awt/make/ classlib/modules/imageio/make/ classlib/modules/luni/make/ classlib/modules/pre...
Date Thu, 27 May 2010 20:26:34 GMT
Author: hindessm
Date: Thu May 27 20:26:33 2010
New Revision: 948972

URL: http://svn.apache.org/viewvc?rev=948972&view=rev
Log:
Merging changes from trunk@948965.

Added:
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/depends/bcel/
      - copied from r948853, harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/bcel/
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/depends/bcel/META-INF/
      - copied from r948853, harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/bcel/META-INF/
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/depends/bcel/META-INF/MANIFEST.MF
      - copied unchanged from r948853, harmony/enhanced/java/trunk/jdktools/modules/jdktools/depends/bcel/META-INF/MANIFEST.MF
Removed:
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/depends/manifests/
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/build.xml
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/build.xml
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/make/properties.xml
    harmony/enhanced/java/branches/java6/classlib/modules/archive/make/exclude.linux.x86.drl.interm
    harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.windows.x86_64.drl
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.drl
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.ibm
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.ibm
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.drl
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.ibm
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86_64.drl
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86.drl
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86_64.drl
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86.drl
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86_64.drl
    harmony/enhanced/java/branches/java6/common_resources/   (props changed)
    harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
    harmony/enhanced/java/branches/java6/debian/control
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 20:26:33 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-946978
+/harmony/enhanced/java/trunk:929253-948965
 /harmony/enhanced/trunk:810871-929252

Modified: harmony/enhanced/java/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/build.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Thu May 27 20:26:33 2010
@@ -107,8 +107,7 @@ Usage:
     
     <target name="bundle-src" 
         description="assemble source snapshot"
-        depends="clean,
-                 setup,
+        depends="setup,
                  copy-src,
                  bundle-src-tgz,
                  bundle-src-zip" />
@@ -721,15 +720,20 @@ Usage:
         </condition>
         <property name="harmony.arch" value="${os.arch}" />
 
+        <condition property="version.prefix" value="select-">
+            <istrue value="${hy.select}" />
+        </condition>
+        <property name="version.prefix" value="" />
+
         <property name="harmony.deploy.suffix" value="-snapshot" />
 
         <property name="harmony.java.version" value="6.0" />
 
         <property name="deploy.file.prefix"
-                  value="apache-harmony-${harmony.java.version}-" />
+            value="apache-harmony-${version.prefix}${harmony.java.version}-" />
 
         <property name="archive.dir.prefix"
-                  value="harmony-${harmony.java.version}-" />
+            value="harmony-${version.prefix}${harmony.java.version}-" />
 
         <property name="deploy.hdk.file.prefix"
                  value="${deploy.file.prefix}hdk-r${harmony.version}" />

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 20:26:33 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-946978
+/harmony/enhanced/java/trunk/classlib:929253-948965
 /harmony/enhanced/trunk/classlib:810871-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Modified: harmony/enhanced/java/branches/java6/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/build.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/build.xml Thu May 27 20:26:33 2010
@@ -78,11 +78,11 @@ module:
     <property name="tests.output" location="build/test_report" />
     <property name="tests.support.output" location="build/test_support" />
     <property name="tests.report.dir" value="${tests.output}/html"/>
-    <property file="make/depends.properties" />
 
     <!-- import properties for snapshot targets -->
     <import file="make/properties.xml" />
     <import file="make/depends.xml" />
+    <property file="make/depends.properties" />
 
     <condition property="needs.vme.v3.hack" value="true">
         <or>

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 20:26:33 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-946978
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-948965
 /harmony/enhanced/trunk/classlib/depends/libs:810871-929252

Modified: harmony/enhanced/java/branches/java6/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/properties.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/properties.xml Thu May 27 20:26:33
2010
@@ -286,6 +286,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"
@@ -1073,6 +1080,7 @@ Alternatively, you can switch to another
                 </fileset>
             </auxClasspath>
             <sourcePath path="src/main/java" />
+            <sourcePath path="src/main/java5" />
             <sourcePath path="src/main/java/common" />
             <sourcePath path="src/main/java/${hy.os.family}" />
             <class location="@{jarFile}" />

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/make/exclude.linux.x86.drl.interm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/make/exclude.linux.x86.drl.interm?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/make/exclude.linux.x86.drl.interm
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/make/exclude.linux.x86.drl.interm
Thu May 27 20:26:33 2010
@@ -1,3 +0,0 @@
-#2921
-org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
-org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.linux.x86_64.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.linux.x86_64.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.linux.x86_64.drl
Thu May 27 20:26:33 2010
@@ -13,9 +13,3 @@ java/awt/font/TextMeasurerTest.java
 java/awt/font/LineBreakMeasurerTest.java
 java/awt/ButtonRTest.java
 java/awt/KeyboardFocusManagerRTest.java
-
-#HARMONY-4181
-java/awt/geom/AreaTest.java
-
-#HARMONY-4307
-org/apache/harmony/awt/ListenerListTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.windows.x86_64.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.windows.x86_64.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/make/exclude.windows.x86_64.drl
Thu May 27 20:26:33 2010
@@ -12,9 +12,3 @@ java/awt/image/MultiPixelPackedSampleMod
 java/awt/image/SinglePixelPackedSampleModelTest.java
 org/apache/harmony/awt/gl/MultiRectAreaLineCashTest.java
 org/apache/harmony/awt/tests/nativebridge/PointerPointerTest.java
-
-#HARMONY-4181
-java/awt/geom/AreaTest.java
-
-#HARMONY-4307
-org/apache/harmony/awt/ListenerListTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86.ibm.interm
Thu May 27 20:26:33 2010
@@ -1,2 +0,0 @@
-# HARMONY-3135, fails intermittently due some issues in libpng (probably)
-javax/imageio/ImageIOTest.java
\ No newline at end of file

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86_64.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86_64.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/exclude.linux.x86_64.drl
Thu May 27 20:26:33 2010
@@ -1 +0,0 @@
-javax/imageio/ImageIOTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.drl
Thu May 27 20:26:33 2010
@@ -1,4 +0,0 @@
-org/apache/harmony/luni/tests/java/lang/ThreadTest.java
-
-# HARMONY-4043 (was duplicate HARMONY-4753)
-org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.ibm?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.ibm
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86.ibm
Thu May 27 20:26:33 2010
@@ -1,5 +1,3 @@
-org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
 org/apache/harmony/luni/tests/java/lang/PackageTest.java
-org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.drl
Thu May 27 20:26:33 2010
@@ -1,6 +1,2 @@
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java
-org/apache/harmony/luni/tests/java/lang/ThreadTest.java
 org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
-
-# HARMONY-4043 (was duplicate HARMONY-4753)
-org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.ibm?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.ibm
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.linux.x86_64.ibm
Thu May 27 20:26:33 2010
@@ -1,4 +1,2 @@
-org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
-org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.drl
Thu May 27 20:26:33 2010
@@ -1,2 +0,0 @@
-# HARMONY-4043 (was duplicate HARMONY-4753)
-org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.ibm?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.ibm
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86.ibm
Thu May 27 20:26:33 2010
@@ -1,3 +1 @@
-org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
-org/apache/harmony/luni/tests/java/lang/PackageTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86_64.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86_64.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/make/exclude.windows.x86_64.drl
Thu May 27 20:26:33 2010
@@ -1,5 +1 @@
 org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
-org/apache/harmony/luni/tests/java/util/ArrayListTest.java
-
-# HARMONY-4043 (was duplicate HARMONY-4753)
-org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86.drl
Thu May 27 20:26:33 2010
@@ -1,2 +0,0 @@
-#HARMONY-4289
-org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86_64.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86_64.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.linux.x86_64.drl
Thu May 27 20:26:33 2010
@@ -1,2 +0,0 @@
-#HARMONY-4289
-org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86.drl
Thu May 27 20:26:33 2010
@@ -1,2 +0,0 @@
-#HARMONY-3617
-org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java

Modified: harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86_64.drl?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86_64.drl
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/exclude.windows.x86_64.drl
Thu May 27 20:26:33 2010
@@ -1,2 +0,0 @@
-#HARMONY-3617
-org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java

Propchange: harmony/enhanced/java/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 20:26:33 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh/common_resources:935751-941490
-/harmony/enhanced/java/trunk/common_resources:929253-946978
+/harmony/enhanced/java/trunk/common_resources:929253-948965
 /harmony/enhanced/trunk/common_resources:476396-929252
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.properties?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.properties Thu May
27 20:26:33 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/branches/java6/debian/control
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/debian/control?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/debian/control (original)
+++ harmony/enhanced/java/branches/java6/debian/control Thu May 27 20:26:33 2010
@@ -2,7 +2,7 @@ Source: harmony-6.0
 Section: devel
 Priority: extra
 Maintainer: Mark Hindess <mark.hindess@googlemail.com>
-Build-Depends: debhelper (>= 5), ecj-bootstrap | libecj-java, junit, ant (>= 1.7.0),
subversion, ant-optional, liblcms1-dev, libjpeg62-dev, libpng-dev, libxft-dev, libxml2-dev,
libxtst-dev, libxext-dev
+Build-Depends: debhelper (>= 5), ecj-bootstrap | libecj-java, junit, ant (>= 1.7.0),
subversion, ant-optional, liblcms1-dev, libjpeg62-dev, libpng-dev, libxft-dev, libxtst-dev,
libxext-dev
 Standards-Version: 3.7.2
 
 Package: harmony-6.0-drlvm

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 20:26:33 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-946978
+/harmony/enhanced/java/trunk/drlvm:929253-948965
 /harmony/enhanced/trunk/drlvm:810871-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml Thu May 27 20:26:33 2010
@@ -46,9 +46,8 @@
             <libset libs="harmonyvm,hythr" dir="${drlvm.shlib.dir}" />
             <libset libs="port,apr-1" dir="${drlvm.lib.dir}" />
             
-            <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread" if="is.linux"/>
+            <syslibset type="shared" libs="m,dl,stdc++,z,pthread" if="is.linux"/>
             <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>
-            <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
             <linkerarg value="--export-dynamic" if="is.freebsd"/>
             
             <linkerarg value="--version-script=${vm.home}/em/build/em.exp" if="is.unix"/>

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml Thu May 27 20:26:33 2010
@@ -195,9 +195,8 @@
                 <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm.def" if="is.windows.x86"/>
                 <linkerarg value="--version-script=${vm.home}/vmcore/build/vmcore.exp"
if="is.unix"/>
                 
-                <syslibset type="shared" libs="m,dl,stdc++,xml2,pthread,gcc_s,rt" if="is.linux"/>
+                <syslibset type="shared" libs="m,dl,stdc++,pthread,gcc_s,rt" if="is.linux"/>
                 <syslibset type="shared" libs="m,stdc++,pthread" if="is.freebsd"/>

-                <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
                 <linkerarg value="--export-dynamic" if="is.freebsd"/>
             </linker>
         </link-lib>        

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 20:26:33 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-946978
+/harmony/enhanced/java/trunk/jdktools:929253-948965
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:810871-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml Thu May 27 20:26:33
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/branches/java6/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml Thu May 27 20:26:33
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/branches/java6/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml?rev=948972&r1=948971&r2=948972&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml Thu May 27 20:26:33
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