harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r946981 - in /harmony/enhanced/java/branches/java6: ./ build.xml classlib/ classlib/depends/libs/ common_resources/ drlvm/ jdktools/
Date Fri, 21 May 2010 12:15:06 GMT
Author: hindessm
Date: Fri May 21 12:15:06 2010
New Revision: 946981

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

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/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/common_resources/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 21 12:15:06 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-946842
+/harmony/enhanced/java/trunk:929253-946978
 /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=946981&r1=946980&r2=946981&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Fri May 21 12:15:06 2010
@@ -171,12 +171,20 @@ Usage:
                         prefix="${archive.dir.prefix}hdk-${harmony.version}"
                         mode="755">
                 <include name="jdk/jre/bin/java"/>
+                <include name="jdk/jre/bin/keytool"/>
+                <include name="jdk/jre/bin/pack200"/>
+                <include name="jdk/jre/bin/policytool"/>
+                <include name="jdk/jre/bin/unpack200"/>
                 <include name="jdk/bin/*"/>
             </tarfileset>
             <tarfileset dir="${target.dir}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jdk/jre/bin/java"/>
+                <exclude name="jdk/jre/bin/keytool"/>
+                <exclude name="jdk/jre/bin/pack200"/>
+                <exclude name="jdk/jre/bin/policytool"/>
+                <exclude name="jdk/jre/bin/unpack200"/>
                 <exclude name="jdk/bin/*"/>
                 <exclude name="jdk/jre/README"/>
             </tarfileset>
@@ -200,6 +208,10 @@ Usage:
                         filemode="755">
                 <include name="jdk/jre/bin/java.exe"/>
                 <include name="jdk/jre/bin/javaw.exe"/>
+                <include name="jdk/jre/bin/keytool.exe"/>
+                <include name="jdk/jre/bin/pack200.exe"/>
+                <include name="jdk/jre/bin/policytool.exe"/>
+                <include name="jdk/jre/bin/unpack200.exe"/>
                 <include name="jdk/bin/*"/>
             </zipfileset>
             <zipfileset dir="${target.dir}/hdk"
@@ -207,6 +219,10 @@ Usage:
                 <include name="**"/>
                 <exclude name="jdk/jre/bin/java.exe"/>
                 <exclude name="jdk/jre/bin/javaw.exe"/>
+                <exclude name="jdk/jre/bin/keytool.exe"/>
+                <exclude name="jdk/jre/bin/pack200.exe"/>
+                <exclude name="jdk/jre/bin/policytool.exe"/>
+                <exclude name="jdk/jre/bin/unpack200.exe"/>
                 <exclude name="jdk/bin/*"/>
                 <exclude name="jdk/jre/README"/>
             </zipfileset>
@@ -235,12 +251,20 @@ Usage:
                         prefix="${archive.dir.prefix}jdk-${harmony.version}"
                         mode="755">
                 <include name="jre/bin/java"/>
+                <include name="jre/bin/keytool"/>
+                <include name="jre/bin/pack200"/>
+                <include name="jre/bin/policytool"/>
+                <include name="jre/bin/unpack200"/>
                 <include name="bin/*"/>
             </tarfileset>
             <tarfileset dir="${target.dir}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jre/bin/java"/>
+                <exclude name="jre/bin/keytool"/>
+                <exclude name="jre/bin/pack200"/>
+                <exclude name="jre/bin/policytool"/>
+                <exclude name="jre/bin/unpack200"/>
                 <exclude name="bin/*"/>
                 <exclude name="jre/README"/>
             </tarfileset>
@@ -262,6 +286,10 @@ Usage:
                         filemode="755">
                 <include name="jre/bin/java.exe"/>
                 <include name="jre/bin/javaw.exe"/>
+                <include name="jre/bin/keytool.exe"/>
+                <include name="jre/bin/pack200.exe"/>
+                <include name="jre/bin/policytool.exe"/>
+                <include name="jre/bin/unpack200.exe"/>
                 <include name="bin/*"/>
             </zipfileset>
             <zipfileset dir="${target.dir}/hdk/jdk"
@@ -269,6 +297,10 @@ Usage:
                 <include name="**"/>
                 <exclude name="jre/bin/java.exe"/>
                 <exclude name="jre/bin/javaw.exe"/>
+                <exclude name="jre/bin/keytool.exe"/>
+                <exclude name="jre/bin/pack200.exe"/>
+                <exclude name="jre/bin/policytool.exe"/>
+                <exclude name="jre/bin/unpack200.exe"/>
                 <exclude name="bin/*"/>
                 <exclude name="jre/README"/>
             </zipfileset>
@@ -297,11 +329,19 @@ Usage:
                         prefix="${archive.dir.prefix}jre-${harmony.version}"
                         mode="755">
                 <include name="bin/java"/>
+                <include name="bin/keytool"/>
+                <include name="bin/pack200"/>
+                <include name="bin/policytool"/>
+                <include name="bin/unpack200"/>
             </tarfileset>
             <tarfileset dir="${target.dir}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}">
                 <include name="**"/>
                 <exclude name="bin/java"/>
+                <exclude name="bin/keytool"/>
+                <exclude name="bin/pack200"/>
+                <exclude name="bin/policytool"/>
+                <exclude name="bin/unpack200"/>
             </tarfileset>
         </tar>
 
@@ -317,12 +357,20 @@ Usage:
                         filemode="755">
                 <include name="bin/java.exe"/>
                 <include name="bin/javaw.exe"/>
+                <include name="bin/keytool.exe"/>
+                <include name="bin/pack200.exe"/>
+                <include name="bin/policytool.exe"/>
+                <include name="bin/unpack200.exe"/>
             </zipfileset>
             <zipfileset dir="${target.dir}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}">
                 <include name="**"/>
                 <exclude name="bin/java.exe"/>
                 <exclude name="bin/javaw.exe"/>
+                <exclude name="bin/keytool.exe"/>
+                <exclude name="bin/pack200.exe"/>
+                <exclude name="bin/policytool.exe"/>
+                <exclude name="bin/unpack200.exe"/>
             </zipfileset>
         </zip>
         <chksum dir="${target.dir}" file="${deploy.jre.zip}" />

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 21 12:15:06 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-946842
+/harmony/enhanced/java/trunk/classlib:929253-946978
 /harmony/enhanced/trunk/classlib:810871-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 21 12:15:06 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-946842
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-946978
 /harmony/enhanced/trunk/classlib/depends/libs:810871-929252

Propchange: harmony/enhanced/java/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 21 12:15:06 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh/common_resources:935751-941490
-/harmony/enhanced/java/trunk/common_resources:929253-946842
+/harmony/enhanced/java/trunk/common_resources:929253-946978
 /harmony/enhanced/trunk/common_resources:476396-929252
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 21 12:15:06 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-946842
+/harmony/enhanced/java/trunk/drlvm:929253-946978
 /harmony/enhanced/trunk/drlvm:810871-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 21 12:15:06 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-946842
+/harmony/enhanced/java/trunk/jdktools:929253-946978
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:810871-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message