MANIFEST.MF improvements.
git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk@920556 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/jdktools/build.xml b/modules/jdktools/build.xml
index b6b096b..78d6bf2 100644
--- a/modules/jdktools/build.xml
+++ b/modules/jdktools/build.xml
@@ -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>
+ </hy.jar.bin>
- <metainf file="${hy.hdk}/NOTICE"/>
- <metainf file="${hy.hdk}/LICENSE"/>
- </jar>
-
- <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">
diff --git a/modules/jpda/build.xml b/modules/jpda/build.xml
index 01b631e..7922f18 100644
--- a/modules/jpda/build.xml
+++ b/modules/jpda/build.xml
@@ -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 -->
diff --git a/modules/jretools/build.xml b/modules/jretools/build.xml
index b98e153..614a0ab 100644
--- a/modules/jretools/build.xml
+++ b/modules/jretools/build.xml
@@ -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">
