You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/03/09 00:21:45 UTC
svn commit: r920563 [2/2] - in /harmony/enhanced/classlib/branches/java6: ./
depends/libs/ make/ modules/accessibility/ modules/annotation/
modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/
modules/concurrent/ modules/concurren...
Modified: harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sound/build.xml?rev=920563&r1=920562&r2=920563&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sound/build.xml Mon Mar 8 23:21:43 2010
@@ -89,26 +89,15 @@
</target>
<target name="build-jar" depends="svn-info,class-patternset">
- <jar destfile="${hy.jdk}/jre/lib/boot/sound.jar"
- manifest="META-INF/MANIFEST.MF"
- compress="${hy.jar.compress}">
+ <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/sound.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
<fileset refid="resources" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
+ </hy.jar.bin>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
-
- <jar destfile="${hy.jdk}/jre/lib/boot/sound-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/sound-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="test-jar" depends="svn-info,compile-tests">
@@ -116,13 +105,9 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
- <jar destfile="${tests.hdk.dir}/sound_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/sound_tests.jar">
<fileset dir="bin/test" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
<mkdir dir="${tests.excludes.hdk.dir}"/>
<copy todir="${tests.excludes.hdk.dir}">
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/build.xml?rev=920563&r1=920562&r2=920563&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/build.xml Mon Mar 8 23:21:43 2010
@@ -103,26 +103,15 @@
</target>
<target name="build-jar" depends="svn-info,class-patternset">
- <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
- manifest="META-INF/MANIFEST.MF"
- compress="${hy.jar.compress}">
+ <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/sql.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
<fileset refid="resources" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
+ </hy.jar.bin>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
-
- <jar destfile="${hy.jdk}/jre/lib/boot/sql-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/sql-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="test-jar" depends="svn-info,compile-tests">
@@ -130,13 +119,9 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
- <jar destfile="${tests.hdk.dir}/sql_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/sql_tests.jar">
<fileset dir="bin/test" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
<mkdir dir="${tests.excludes.hdk.dir}"/>
<copy todir="${tests.excludes.hdk.dir}">
Modified: harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml?rev=920563&r1=920562&r2=920563&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml Mon Mar 8 23:21:43 2010
@@ -89,26 +89,15 @@
</target>
<target name="build-jar" depends="svn-info,class-patternset">
- <jar destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
- manifest="META-INF/MANIFEST.MF"
- compress="${hy.jar.compress}">
+ <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
<fileset refid="resources" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
+ </hy.jar.bin>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
-
- <jar destfile="${hy.jdk}/jre/lib/boot/suncompat-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/suncompat-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="test-jar" depends="svn-info,compile-tests">
@@ -116,13 +105,9 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
- <jar destfile="${tests.hdk.dir}/suncompat_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/suncompat_tests.jar">
<fileset dir="bin/test" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
<mkdir dir="${tests.excludes.hdk.dir}"/>
<copy todir="${tests.excludes.hdk.dir}">
Modified: harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/build.xml?rev=920563&r1=920562&r2=920563&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/build.xml Mon Mar 8 23:21:43 2010
@@ -102,27 +102,16 @@
</target>
<target name="build-jar" depends="svn-info,class-patternset">
- <jar destfile="${hy.jdk}/jre/lib/boot/swing.jar"
- manifest="META-INF/MANIFEST.MF"
- compress="${hy.jar.compress}">
+ <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/swing.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
<fileset refid="hidden.classes" />
<fileset refid="common.resources" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
+ </hy.jar.bin>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
-
- <jar destfile="${hy.jdk}/jre/lib/boot/swing-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/swing-src.jar">
<fileset dir="src/main/java/common" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="test-jar" depends="svn-info,compile-tests">
@@ -130,13 +119,9 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
- <jar destfile="${tests.hdk.dir}/swing_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/swing_tests.jar">
<fileset dir="bin/test" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
<mkdir dir="${tests.excludes.hdk.dir}"/>
<copy todir="${tests.excludes.hdk.dir}">
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 8 23:21:43 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-920295
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-920556
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 8 23:21:43 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-920295
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-920556
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 8 23:21:43 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-920295
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-920556
Modified: harmony/enhanced/classlib/branches/java6/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/text/build.xml?rev=920563&r1=920562&r2=920563&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/text/build.xml Mon Mar 8 23:21:43 2010
@@ -89,26 +89,15 @@
</target>
<target name="build-jar" depends="svn-info,class-patternset">
- <jar destfile="${hy.jdk}/jre/lib/boot/text.jar"
- manifest="META-INF/MANIFEST.MF"
- compress="${hy.jar.compress}">
+ <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/text.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
<fileset refid="resources" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
+ </hy.jar.bin>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
-
- <jar destfile="${hy.jdk}/jre/lib/boot/text-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/text-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="test-jar" depends="svn-info,compile-tests">
@@ -116,13 +105,9 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
- <jar destfile="${tests.hdk.dir}/text_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/text_tests.jar">
<fileset dir="bin/test" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
<mkdir dir="${tests.excludes.hdk.dir}"/>
<copy todir="${tests.excludes.hdk.dir}">
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml?rev=920563&r1=920562&r2=920563&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml Mon Mar 8 23:21:43 2010
@@ -89,26 +89,15 @@
</target>
<target name="build-jar" depends="svn-info,class-patternset">
- <jar destfile="${hy.jdk}/jre/lib/boot/x-net.jar"
- manifest="META-INF/MANIFEST.MF"
- compress="${hy.jar.compress}">
+ <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/x-net.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
<fileset refid="resources" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
+ </hy.jar.bin>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
-
- <jar destfile="${hy.jdk}/jre/lib/boot/x-net-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/x-net-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="test-jar" depends="svn-info,compile-tests">
@@ -116,36 +105,21 @@
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
- <jar destfile="${tests.hdk.dir}/x-net_test_support.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/x-net_test_support.jar">
<fileset dir="bin/test/support" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
- <jar destfile="${tests.hdk.dir}/x-net_api_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/x-net_api_tests.jar">
<fileset dir="bin/test/api" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
- <jar destfile="${tests.hdk.dir}/x-net_impl_boot_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/x-net_impl_boot_tests.jar">
<fileset dir="bin/test/impl.injected" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
- <jar destfile="${tests.hdk.dir}/x-net_impl_tests.jar">
+ </hy.jar.bin>
+
+ <hy.jar.bin destfile="${tests.hdk.dir}/x-net_impl_tests.jar">
<fileset dir="bin/test/impl" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.bin>
<mkdir dir="${tests.excludes.hdk.dir}" />
<copy todir="${tests.excludes.hdk.dir}">