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/08 23:51:30 UTC
svn commit: r920556 [2/2] - in /harmony/enhanced: classlib/trunk/make/
classlib/trunk/modules/accessibility/ classlib/trunk/modules/annotation/
classlib/trunk/modules/applet/ classlib/trunk/modules/archive/
classlib/trunk/modules/auth/ classlib/trunk/m...
Modified: harmony/enhanced/common_resources/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=920556&r1=920555&r2=920556&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/properties.xml (original)
+++ harmony/enhanced/common_resources/trunk/make/properties.xml Mon Mar 8 22:51:29 2010
@@ -358,12 +358,48 @@
</sequential>
</macrodef>
- <presetdef name="hy.javac">
- <javac target="${hy.javac.target}" source="${hy.javac.source}"
- compiler="${hy.javac.compiler}" debug="${hy.javac.debug}"
- memoryMaximumSize="${hy.javac.maxmem}">
- <compilerarg line="${build.compilerarg}" />
- </javac>
- </presetdef>
+ <presetdef name="hy.javac">
+ <javac target="${hy.javac.target}" source="${hy.javac.source}"
+ compiler="${hy.javac.compiler}" debug="${hy.javac.debug}"
+ memoryMaximumSize="${hy.javac.maxmem}">
+ <compilerarg line="${build.compilerarg}" />
+ </javac>
+ </presetdef>
+
+ <presetdef name="hy.jar.bin">
+ <jar compress="${hy.jar.compress}">
+ <manifest>
+ <attribute name="Implementation-Title" value="Apache Harmony"/>
+ <attribute name="Implementation-Vendor"
+ value="The Apache Software Foundation"/>
+ <attribute name="Implementation-Vendor-Id"
+ value="org.apache.harmony"/>
+ <attribute name="Implementation-URL"
+ value="http://harmony.apache.org"/>
+ <attribute name="Implementation-Version" value="${svn.info}"/>
+ <attribute name="X-Compile-Source-JDK"
+ value="${hy.javac.source}"/>
+ <attribute name="X-Compile-Target-JDK"
+ value="${hy.javac.target}"/>
+ </manifest>
+ <metainf refid="hy.required.metainf-files"/>
+ </jar>
+ </presetdef>
+
+ <presetdef name="hy.jar.src">
+ <jar compress="${hy.jar.compress}">
+ <manifest>
+ <attribute name="Implementation-Title" value="Apache Harmony"/>
+ <attribute name="Implementation-Vendor"
+ value="The Apache Software Foundation"/>
+ <attribute name="Implementation-Vendor-Id"
+ value="org.apache.harmony"/>
+ <attribute name="Implementation-URL"
+ value="http://harmony.apache.org"/>
+ <attribute name="Implementation-Version" value="${svn.info}"/>
+ </manifest>
+ <metainf refid="hy.required.metainf-files"/>
+ </jar>
+ </presetdef>
</project>
Modified: harmony/enhanced/drlvm/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/build-java.xml?rev=920556&r1=920555&r2=920556&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/build-java.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/build-java.xml Mon Mar 8 22:51:29 2010
@@ -50,14 +50,14 @@
<javac-elements/>
</compile-java>
<mkdir dir="${drlvm.bin.dir}"/>
- <jar jarfile="${drlvm.bin.dir}/@{component}.jar" manifest="@{manifest}">
+ <hy.jar.bin jarfile="${drlvm.bin.dir}/@{component}.jar"
+ manifest="@{manifest}">
<fileset dir="${drlvm.semi.dir}/@{component}/classes"/>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
- <jar jarfile="${drlvm.bin.dir}/@{component}-src.jar" manifest="@{manifest}">
+ </hy.jar.bin>
+ <hy.jar.src jarfile="${drlvm.bin.dir}/@{component}-src.jar"
+ manifest="@{manifest}">
<fileset dir="@{src}" includes="**/*.java"/>
- <metainf refid="hy.required.metainf-files"/>
- </jar>
+ </hy.jar.src>
</sequential>
</macrodef>
</project>
Modified: harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml?rev=920556&r1=920555&r2=920556&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml Mon Mar 8 22:51:29 2010
@@ -104,8 +104,8 @@
<target name="build-jar" depends="svn-info">
<mkdir dir="${jdktools.deploy.dir}/lib" />
- <jar destfile="${jdktools.deploy.dir}/lib/tools.jar"
- manifest="META-INF/MANIFEST.MF">
+ <hy.jar.bin destfile="${jdktools.deploy.dir}/lib/tools.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset dir="bin/main" />
@@ -118,23 +118,11 @@
<exclude name="META-INF/*"/>
</zipfileset>
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf file="${hy.hdk}/NOTICE"/>
- <metainf file="${hy.hdk}/LICENSE"/>
- </jar>
+ </hy.jar.bin>
- <jar destfile="${jdktools.deploy.dir}/lib/tools-src.jar">
+ <hy.jar.src destfile="${jdktools.deploy.dir}/lib/tools-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf file="${hy.hdk}/NOTICE"/>
- <metainf file="${hy.hdk}/LICENSE"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="build-tests">
Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?rev=920556&r1=920555&r2=920556&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Mon Mar 8 22:51:29 2010
@@ -101,28 +101,14 @@
<target name="build-jar" depends="svn-info">
<mkdir dir="${jdktools.deploy.dir}/lib" />
- <jar destfile="${jdktools.deploy.dir}/lib/jdtstub.jar"
- manifest="META-INF/MANIFEST.MF">
-
+ <hy.jar.bin destfile="${jdktools.deploy.dir}/lib/jdtstub.jar"
+ manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
+ </hy.jar.bin>
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf file="${hy.hdk}/NOTICE"/>
- <metainf file="${hy.hdk}/LICENSE"/>
- </jar>
-
- <jar destfile="${jdktools.deploy.dir}/lib/jdtstub-src.jar">
+ <hy.jar.src destfile="${jdktools.deploy.dir}/lib/jdtstub-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf file="${hy.hdk}/NOTICE"/>
- <metainf file="${hy.hdk}/LICENSE"/>
- </jar>
+ </hy.jar.src>
</target>
<!-- copy all required jars with JDI implementation and dependent classes -->
Modified: harmony/enhanced/jdktools/trunk/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml?rev=920556&r1=920555&r2=920556&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jretools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jretools/build.xml Mon Mar 8 22:51:29 2010
@@ -85,9 +85,8 @@
<target name="build-jar" depends="svn-info">
<mkdir dir="${jretools.deploy.dir}/lib" />
- <jar destfile="${jretools.deploy.dir}/lib/tools.jar"
+ <hy.jar.bin destfile="${jretools.deploy.dir}/lib/tools.jar"
manifest="META-INF/MANIFEST.MF">
-
<fileset dir="bin/main" />
<fileset dir="src/main/java">
@@ -98,24 +97,11 @@
<exclude name="com/sun/jdi/Bootstrap.class"/>
<exclude name="META-INF/*"/>
</zipfileset>
+ </hy.jar.bin>
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf file="${hy.hdk}/NOTICE"/>
- <metainf file="${hy.hdk}/LICENSE"/>
- </jar>
-
- <jar destfile="${jretools.deploy.dir}/lib/tools-src.jar">
+ <hy.jar.src destfile="${jretools.deploy.dir}/lib/tools-src.jar">
<fileset dir="src/main/java" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
-
- <metainf file="${hy.hdk}/NOTICE"/>
- <metainf file="${hy.hdk}/LICENSE"/>
- </jar>
+ </hy.jar.src>
</target>
<target name="build-tests">