From 940c76f21f611065ad32dd46346efc9a1f63969d Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Sun, 19 Apr 2015 20:51:48 -0700
Subject: build: remove separate generated manifest files

Put all the manifest information in the ant build file.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 build.xml              | 39 ++++++++++++++++++++++++---------------
 src/classes/J3dVersion |  9 ---------
 2 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 src/classes/J3dVersion

diff --git a/build.xml b/build.xml
index ebe3737..6bc22a2 100644
--- a/build.xml
+++ b/build.xml
@@ -38,19 +38,6 @@
   <target name="gen">
     <mkdir dir="${gen.dir}"/>
 
-    <copy todir="${gen.dir}"  overwrite="true">
-      <fileset dir="${src.dir}/classes"          includes="J3dVersion"/>
-      <fileset dir="${j3dtools.src.dir}/classes" includes="ToolsVersion"/>
-      <filterset>
-        <filter token="VERSION_BASE"    value="${version_base}"/>
-        <filter token="SPEC_TITLE"      value="${build.spec.title}"/>
-        <filter token="SPEC_VENDOR"     value="${build.spec.vendor}"/>
-        <filter token="IMPL_TITLE"      value="${build.impl.title}"/>
-        <filter token="IMPL_VENDOR"     value="${build.impl.vendor}"/>
-        <filter token="IMPL_VENDOR_ID"  value="${build.impl.vendor.id}"/>
-      </filterset>
-    </copy>
-
     <copy todir="${class.dir}/javax">
       <fileset dir="." includes="COPYRIGHT.txt"/>
       <fileset dir="." includes="LICENSE.txt"/>
@@ -103,12 +90,34 @@
   
   <target name="jar" depends="compile">
     <jar jarfile="${build.dir}/jars/j3dcore.jar"
-         manifest="${gen.dir}/J3dVersion" update="no" compress="false">
+         update="no" compress="false">
+      <manifest>
+        <attribute name="Manifest-Version"          value="1.0"/>
+        <attribute name="Specification-Title"       value="${build.spec.title}"/>
+        <attribute name="Specification-Version"     value="1.6"/>
+        <attribute name="Specification-Vendor"      value="${build.spec.vendor}"/>
+        <attribute name="Implementation-Title"      value="${build.impl.title}"/>
+        <attribute name="Implementation-Version"    value="${version_base}"/>
+        <attribute name="Implementation-Vendor"     value="${build.impl.vendor}"/>
+        <attribute name="Extension-Name"            value="javax.media.j3d"/>
+        <attribute name="Implementation-Vendor-Id"  value="${build.impl.vendor.id}"/>
+      </manifest>
       <fileset dir="${class.dir}" includes="javax/**/*"/>
     </jar>
 
     <jar jarfile="${build.dir}/jars/j3dutils.jar"
-         manifest="${gen.dir}/ToolsVersion" update="no" compress="false">
+         update="no" compress="false">
+      <manifest>
+        <attribute name="Manifest-Version"          value="1.0"/>
+        <attribute name="Specification-Title"       value="${build.spec.title}"/>
+        <attribute name="Specification-Version"     value="1.6"/>
+        <attribute name="Specification-Vendor"      value="${build.spec.vendor}"/>
+        <attribute name="Implementation-Title"      value="3D Utilities"/>
+        <attribute name="Implementation-Version"    value="${version_base}"/>
+        <attribute name="Implementation-Vendor"     value="${build.impl.vendor}"/>
+        <attribute name="Extension-Name"            value="javax.media.j3d"/>
+        <attribute name="Implementation-Vendor-Id"  value="${build.impl.vendor.id}"/>
+      </manifest>
       <fileset dir="${class.dir}" includes="com/**/*"/>
     </jar>
     
diff --git a/src/classes/J3dVersion b/src/classes/J3dVersion
deleted file mode 100644
index 4c43271..0000000
--- a/src/classes/J3dVersion
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Specification-Title: @SPEC_TITLE@
-Specification-Version: 1.6
-Specification-Vendor: @SPEC_VENDOR@
-Implementation-Title: @IMPL_TITLE@
-Implementation-Version: @VERSION_BASE@
-Implementation-Vendor: @IMPL_VENDOR@
-Extension-Name: javax.media.j3d
-Implementation-Vendor-Id: @IMPL_VENDOR_ID@
-- 
cgit v1.2.3