Incooperate gluegen.build.number in ZIP archive name and in JAR manifests

4 files changed, 36 insertions, 11 deletions

diff --git a/make/Manifest b/make/Manifest
index 6dd4840..4c27362 100755
--- a/make/Manifest
+++ b/make/Manifest
@@ -1,2 +1,10 @@
+Manifest-Version: 1.0
+Specification-Title: GlueGen Java Bindings Generator
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp community
+Implementation-Title: GlueGen Compile-Time
+Implementation-Version: @VERSION@
+Implementation-Vendor: JogAmp community
+Implementation-Vendor-Id: com.jogamp
 Main-Class: com.jogamp.gluegen.GlueGen
 Class-Path: antlr.jar
diff --git a/make/Manifest-rt b/make/Manifest-rt
index 7570c4a..776b2f8 100755
--- a/make/Manifest-rt
+++ b/make/Manifest-rt
@@ -1,6 +1,9 @@
 Manifest-Version: 1.0
+Specification-Title: GlueGen Java Bindings Generator
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp community
 Implementation-Title: GlueGen Run-Time
-Implementation-Version: @BASEVERSION@
+Implementation-Version: @VERSION@
 Implementation-Vendor: JogAmp community
 Extension-Name: com.jogamp.common
 Implementation-Vendor-Id: com.jogamp
diff --git a/make/Manifest-rt.cdc b/make/Manifest-rt.cdc
index 50c2021..1a99edc 100755
--- a/make/Manifest-rt.cdc
+++ b/make/Manifest-rt.cdc
@@ -1,6 +1,9 @@
 Manifest-Version: 1.0
+Specification-Title: GlueGen Java Bindings Generator
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp community
 Implementation-Title: GlueGen Run-Time CDC
-Implementation-Version: @BASEVERSION@
+Implementation-Version: @VERSION@
 Implementation-Vendor: JogAmp community
 Extension-Name: com.jogamp.common
 Implementation-Vendor-Id: com.jogamp
diff --git a/make/build.xml b/make/build.xml
index 3df306f..f5a4228 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -19,13 +19,6 @@
       </condition>
   </fail>
 
-  <!-- This is the version of GlueGen you are building -->
-  <property name="gluegen_base_version" value="2.0"/>
-   <tstamp>
-       <format property="version.timestamp" pattern="yyyyMMddHHmm"/>
-   </tstamp>
-  <property name="gluegen.version" value="${gluegen_base_version}-${version.timestamp}" />
-
   <import file="gluegen-cpptasks.xml" />
 
   <condition property="rootrel.build" value="build">
@@ -55,7 +48,14 @@
     <property name="gluegen.lib.dir" value="${build}/obj"/>
 
     <property file="${build}/artifact.properties"/>
-    <property name="gluegen.build.number" value="manual-build"/>
+    <property name="gluegen.build.number" value="manual"/>
+
+    <!-- This is the version of GlueGen you are building -->
+    <property name="gluegen_base_version" value="2.0"/>
+    <tstamp>
+        <format property="version.timestamp" pattern="yyyyMMdd"/>
+    </tstamp>
+    <property name="gluegen.version" value="${gluegen_base_version}-b${gluegen.build.number}-${version.timestamp}" />
 
     <!-- The generated source directories. -->
     <property name="src.generated"          value="${build}/gensrc" />
@@ -599,8 +599,17 @@
       <classpath refid="antlr.classpath" />
     </javac>
 
+    <copy file="Manifest"
+          tofile="${build}/Manifest.temp"
+          overwrite="true">
+        <filterset>
+            <filter token="VERSION" value="${gluegen.version}"/>
+            <filter token="BASEVERSION" value="${gluegen_base_version}"/>
+        </filterset>
+    </copy>
+
     <!-- Build gluegen.jar. -->
-    <jar destfile="${build}/gluegen.jar" manifest="Manifest">
+    <jar destfile="${build}/gluegen.jar" manifest="${build}/Manifest.temp">
       <fileset dir="${classes}">
         <include name="**/*.class" />
       </fileset>
@@ -610,6 +619,7 @@
           tofile="${build}/Manifest-rt.temp"
           overwrite="true">
         <filterset>
+            <filter token="VERSION" value="${gluegen.version}"/>
             <filter token="BASEVERSION" value="${gluegen_base_version}"/>
         </filterset>
     </copy>
@@ -618,6 +628,7 @@
           tofile="${build}/Manifest-rt.cdc.temp"
           overwrite="true">
         <filterset>
+            <filter token="VERSION" value="${gluegen.version}"/>
             <filter token="BASEVERSION" value="${gluegen_base_version}"/>
         </filterset>
     </copy>