Refactored version number specifications for all sub-components like

JOGL and Newt into make/versions.xml. Cleaned up and simplified jar
creation targets in build-jogl.xml, build-nativewindow.xml, and
build-newt.xml. Fixed nativewindowRIversion, which was incorrectly
referring to VERSION instead of only BASEVERSION.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1968 232f8b59-042b-4e1e-8c03-345bb8c30851

6 files changed, 111 insertions, 126 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index eb265765e..7fbf265eb 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -72,12 +72,7 @@
    -->
 <project name="JOGL" basedir="." default="all">
 
-  <!-- This is the version of JOGL you are building -->
-  <property name="base_version" value="1.2.0-rc1"/>
-    
-  <!-- Uncomment this property definition to cause a full release build to be done -->
-  <!-- without needing to specify the RI target on the command line  -->
-  <property name="RImanifestfile" value="joglRIversion" />
+  <import file="versions.xml" />
 
   <!-- Pull in GlueGen cpptasks build file -->
   <property name="gluegen.root" value="../../gluegen" />
@@ -494,7 +489,7 @@
         <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" />
         <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" />
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
-        <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${base_version} Specification" />
+        <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" />
         <property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
         <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
 
@@ -1631,21 +1626,31 @@
     <!--
        - Build the jogl.jar files.
       -->
-    <target name="jar" depends="java.compile,cond-if-RImanifest,cond-else-RImanifest"/>
+    <target name="jar" depends="java.compile,build-jars"/>
 
-    <target name="check-RIcond">
-      <condition property="RIcond-is-true">
-         <isset property="RImanifestfile"/>
+    <target name="setup-manifestfile">
+      <condition property="manifestfile" value="joglRIversion">
+        <isset property="jogl.ri" />
+      </condition>
+      <condition property="manifestfile" value="joglversion">
+        <not>
+          <isset property="jogl.ri" />
+        </not>
       </condition>
     </target>
 
-    <target name="cond-if-RImanifest" depends="check-RIcond" if="RIcond-is-true">
-        <copy file="joglRIversion"
+    <target name="build-jars" depends="setup-manifestfile">
+        <tstamp>
+             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
+        </tstamp>
+        <copy file="${manifestfile}"
           tofile="tempversion"
           overwrite="true">
           <filterset>
-              <filter token="VERSION" value="${base_version}-pre-${timestamp}"/>
-              <filter token="BASEVERSION" value="${base_version}"/>
+              <!-- This token only exists in the non-RI version of the manifest -->
+              <filter token="VERSION" value="${jogl_base_version}-pre-${timestamp}"/>
+              <!-- This token exists in both the RI and non-RI versions of the manifest -->
+              <filter token="BASEVERSION" value="${jogl_base_version}"/>
           </filterset>
         </copy>
 
@@ -1769,30 +1774,6 @@
         </jar>
         <delete file="tempversion"/>
     </target>
-  
- 
-    <target name="cond-else-RImanifest" depends="check-RIcond" unless="RIcond-is-true">
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
-        </tstamp>
-        <copy file="joglversion"
-          tofile="tempversion"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${base_version}-pre-${timestamp}"/>
-              <filter token="BASEVERSION" value="${base_version}"/>
-          </filterset>
-        </copy>
-        <jar manifest="tempversion" destfile="${jogl.jar}">
-            <fileset dir="${classes}">
-                <include name="javax/media/opengl/**" />
-                <include name="com/sun/gluegen/runtime/**" />
-                <include name="com/sun/opengl/**" />
-                <include name="com/sun/javafx/**" />
-            </fileset>
-        </jar>
-        <delete file="tempversion"/>
-    </target>
 
     <!-- ================================================================== -->
     <!--
@@ -2164,11 +2145,11 @@
          includes="${jogl.tmp.version}/**" />
     </target>
 
-    <target name="setup-version-RI" if="RImanifestfile">
+    <target name="setup-version-RI" if="jogl.ri">
         <property name="tmp.version" value="${base_version}" />
     </target>
 
-    <target name="setup-version-non-RI" unless="RImanifestfile">
+    <target name="setup-version-non-RI" unless="jogl.ri">
         <tstamp>
              <format property="timestamp" pattern="yyyyMMdd"/>
         </tstamp>
@@ -2372,7 +2353,7 @@
         <!-- Set property for using the RI manifest file so jogl.jar is versioned
            - properly
           -->
-          <property name="RImanifestfile" value="joglRIversion" />
+          <property name="jogl.ri" value="true" />
           <antcall target="all" inheritRefs="true" />
     </target>
 </project>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 496382113..d74ed7e03 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -61,12 +61,7 @@
    -->
 <project name="NativeWindow" basedir="." default="all">
 
-  <!-- This is the version of JOGL you are building -->
-  <property name="base_version" value="1.0.0-rc1"/>
-    
-  <!-- Uncomment this property definition to cause a full release build to be done -->
-  <!-- without needing to specify the RI target on the command line  -->
-  <property name="RImanifestfile" value="nativewindowRIversion" />
+  <import file="versions.xml" />
 
   <!-- Pull in GlueGen cpptasks build file -->
   <property name="gluegen.root" value="../../gluegen" />
@@ -289,7 +284,7 @@
         <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" />
         <property name="javadoc.dev" value="${project.root}/javadoc_nativewindow_dev" />
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
-        <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${base_version} Specification" />
+        <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${nativewindow_base_version} Specification" />
         <property name="javadoc.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" />
         <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*" />
 
@@ -786,21 +781,29 @@
     <!--
        - Build the nativewindow.jar files.
       -->
-    <target name="jar" depends="java.compile,cond-if-RImanifest,cond-else-RImanifest"/>
+    <target name="jar" depends="java.compile,build-jars"/>
 
-    <target name="check-RIcond">
-      <condition property="RIcond-is-true">
-         <isset property="RImanifestfile"/>
+    <target name="setup-manifestfile">
+      <condition property="manifestfile" value="nativewindowRIversion">
+        <isset property="nativewindow.ri" />
+      </condition>
+      <condition property="manifestfile" value="nativewindowversion">
+        <not>
+          <isset property="nativewindow.ri" />
+        </not>
       </condition>
     </target>
 
-    <target name="cond-if-RImanifest" depends="check-RIcond" if="RIcond-is-true">
-        <copy file="nativewindowRIversion"
+    <target name="build-jars" depends="setup-manifestfile">
+        <tstamp>
+             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
+        </tstamp>
+        <copy file="${manifestfile}"
           tofile="tempversion"
           overwrite="true">
           <filterset>
-              <filter token="VERSION" value="${base_version}-pre-${timestamp}"/>
-              <filter token="BASEVERSION" value="${base_version}"/>
+              <filter token="VERSION" value="${nativewindow_base_version}-pre-${timestamp}"/>
+              <filter token="BASEVERSION" value="${nativewindow_base_version}"/>
           </filterset>
         </copy>
 
@@ -820,29 +823,7 @@
                 <include name="com/sun/gluegen/runtime/**" />
             </fileset>
         </jar>
-        <delete file="tempversion"/>
-    </target>
-  
- 
-    <target name="cond-else-RImanifest" depends="check-RIcond" unless="RIcond-is-true">
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
-        </tstamp>
-        <copy file="nativewindowversion"
-          tofile="tempversion"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${base_version}-pre-${timestamp}"/>
-              <filter token="BASEVERSION" value="${base_version}"/>
-          </filterset>
-        </copy>
-        <jar manifest="tempversion" destfile="${nativewindow.jar}">
-            <fileset dir="${classes}">
-                <include name="javax/media/nativewindow/**" />
-                <include name="com/sun/gluegen/runtime/**" />
-                <include name="com/sun/nativewindow/**" />
-            </fileset>
-        </jar>
+
         <delete file="tempversion"/>
     </target>
 
@@ -1146,14 +1127,14 @@
     </target>
 
     <target name="setup-version-RI" if="RImanifestfile">
-        <property name="tmp.version" value="${base_version}" />
+        <property name="tmp.version" value="${nativewindow_base_version}" />
     </target>
 
     <target name="setup-version-non-RI" unless="RImanifestfile">
         <tstamp>
              <format property="timestamp" pattern="yyyyMMdd"/>
         </tstamp>
-        <property name="tmp.version" value="${base_version}-pre-${timestamp}" />
+        <property name="tmp.version" value="${nativewindow_base_version}-pre-${timestamp}" />
     </target>
 
     <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.windows-amd64,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86,dist.check.solamd64,setup-version-RI,setup-version-non-RI">
@@ -1342,7 +1323,7 @@
         <!-- Set property for using the RI manifest file so nativewindow.jar is versioned
            - properly
           -->
-          <property name="RImanifestfile" value="nativewindowRIversion" />
+          <property name="nativewindow.ri" value="true" />
           <antcall target="all" inheritRefs="true" />
     </target>
 </project>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index a1b1baaea..0ca802f53 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -58,12 +58,7 @@
    -->
 <project name="NEWT" basedir="." default="all">
 
-  <!-- This is the version of JOGL you are building -->
-  <property name="base_version" value="0.0.0-rc0"/>
-    
-  <!-- Uncomment this property definition to cause a full release build to be done -->
-  <!-- without needing to specify the RI target on the command line  -->
-  <property name="RImanifestfile" value="newtRIversion" />
+  <import file="versions.xml" />
 
   <!-- Pull in GlueGen cpptasks build file -->
   <property name="gluegen.root" value="../../gluegen" />
@@ -217,7 +212,7 @@
         <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" />
         <property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" />
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
-        <property name="javadoc.windowtitle" value="NEWT API -- ${base_version} Specification" />
+        <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
         <property name="javadoc.spec.packagenames" value="com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
 
@@ -532,21 +527,29 @@
     <!--
        - Build the newt.jar files.
       -->
-    <target name="jar" depends="java.compile,cond-if-RImanifest,cond-else-RImanifest"/>
+    <target name="jar" depends="java.compile,build-jars"/>
 
-    <target name="check-RIcond">
-      <condition property="RIcond-is-true">
-         <isset property="RImanifestfile"/>
+    <target name="setup-manifestfile">
+      <condition property="manifestfile" value="newtRIversion">
+        <isset property="newt.ri" />
+      </condition>
+      <condition property="manifestfile" value="newtversion">
+        <not>
+          <isset property="newt.ri" />
+        </not>
       </condition>
     </target>
 
-    <target name="cond-if-RImanifest" depends="check-RIcond" if="RIcond-is-true">
-        <copy file="newtRIversion"
+    <target name="build-jars" depends="setup-manifestfile">
+        <tstamp>
+             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
+        </tstamp>
+        <copy file="${manifestfile}"
           tofile="tempversion"
           overwrite="true">
           <filterset>
-              <filter token="VERSION" value="${base_version}-pre-${timestamp}"/>
-              <filter token="BASEVERSION" value="${base_version}"/>
+              <filter token="VERSION" value="${newt_base_version}-pre-${timestamp}"/>
+              <filter token="BASEVERSION" value="${newt_base_version}"/>
           </filterset>
         </copy>
 
@@ -567,27 +570,7 @@
                 <include name="com/sun/javafx/newt/**" />
             </fileset>
         </jar>
-        <delete file="tempversion"/>
-    </target>
-  
- 
-    <target name="cond-else-RImanifest" depends="check-RIcond" unless="RIcond-is-true">
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
-        </tstamp>
-        <copy file="newtversion"
-          tofile="tempversion"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${base_version}-pre-${timestamp}"/>
-              <filter token="BASEVERSION" value="${base_version}"/>
-          </filterset>
-        </copy>
-        <jar manifest="tempversion" destfile="${newt.jar}">
-            <fileset dir="${classes}">
-                <include name="com/sun/javafx/newt/**" />
-            </fileset>
-        </jar>
+
         <delete file="tempversion"/>
     </target>
 
@@ -860,14 +843,14 @@
     </target>
 
     <target name="setup-version-RI" if="RImanifestfile">
-        <property name="tmp.version" value="${base_version}" />
+        <property name="tmp.version" value="${newt_base_version}" />
     </target>
 
     <target name="setup-version-non-RI" unless="RImanifestfile">
         <tstamp>
              <format property="timestamp" pattern="yyyyMMdd"/>
         </tstamp>
-        <property name="tmp.version" value="${base_version}-pre-${timestamp}" />
+        <property name="tmp.version" value="${newt_base_version}-pre-${timestamp}" />
     </target>
 
     <target name="dist" depends="dist.dir.check,dist.check.windows,dist.check.windows-amd64,dist.check.linux,dist.check.linux-amd64,dist.check.macosx,dist.check.macosxfat,dist.check.solsparc,dist.check.solsparcv9,dist.check.solx86,dist.check.solamd64,setup-version-RI,setup-version-non-RI">
diff --git a/make/build.xml b/make/build.xml
index 51ccc4efd..24bbec09a 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -1,9 +1,9 @@
 
 <project name="JOGL_ALL" basedir="." default="all">
 
+    <import file="versions.xml" />
+
     <target name="init">
-        <property name="base_version_jogl" value="1.2.0-rc1"/>
-        <property name="base_version_nw"   value="1.0.0-rc1"/>
         <property name="project.root" value=".." />
         <condition property="rootrel.build" value="build">
           <not>
@@ -30,11 +30,11 @@
 
         <property name="javadoc.nw.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" />
         <property name="javadoc.nw.spec" value="${project.root}/javadoc_nativewindow_spec" />
-        <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${base_version_nw} Specification" />
+        <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${nativewindow_base_version} Specification" />
         <property name="javadoc.nw.spec.packagenames" value="javax.media.nativewindow.*" />
 
         <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" />
-        <property name="javadoc.spec.windowtitle" value="JOGL API -- JSR-231 ${base_version_jogl} Specification" />
+        <property name="javadoc.spec.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" />
         <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
 
         <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
diff --git a/make/nativewindowRIversion b/make/nativewindowRIversion
index 9bfc9e855..6a29e8a69 100644
--- a/make/nativewindowRIversion
+++ b/make/nativewindowRIversion
@@ -2,7 +2,7 @@ Specification-Title: Native Window Interface API Specification
 Specification-Version: @BASEVERSION@
 Specification-Vendor: Sun Microsystems, Inc.
 Implementation-Title: Native Window Interface Runtime Environment
-Implementation-Version: @VERSION@
+Implementation-Version: @BASEVERSION@
 Implementation-Vendor: Sun Microsystems, Inc.
 Extension-Name: javax.media.nativewindow
 Implementation-Vendor-Id: com.sun
diff --git a/make/versions.xml b/make/versions.xml
new file mode 100644
index 000000000..89b053941
--- /dev/null
+++ b/make/versions.xml
@@ -0,0 +1,40 @@
+<!-- This file is the one canonical location containing the version
+     numbers for the various components such as JOGL and Newt. -->
+
+<project name="versions">
+
+  <!-- This is the base version of JOGL. For official release builds,
+       and nightly builds, this should be in the form "x.y{.z}", for
+       example, "2.0" or "2.1.1". Nightly builds will have a "-pre-"
+       and a timestamp automatically added to this version number. For
+       intermediate release builds, this should be in the form, for
+       example, "2.0-beta1" or "2.0-rc1". For large releases, push
+       betas before release candidates to give the community time to
+       react.-->
+  <property name="jogl_base_version" value="2.0" />
+
+  <!-- Uncomment this property in order to produce a JOGL release
+       build without running the "RI" (Reference Implementation)
+       target in build-jogl.xml. -->
+  <!-- <property name="jogl.ri" value="true" /> -->
+
+  <!-- Base version of the NativeWindow interface, following the same
+       rules as above -->
+  <property name="nativewindow_base_version" value="1.0" />
+
+  <!-- Uncomment this property in order to produce a NativeWindow
+       build without running the "RI" (Reference Implementation)
+       target in build-nativewindow.xml. -->
+  <!-- <property name="nativewindow.ri" value="true" /> -->
+
+  <!-- Base version of the Newt library, following the same
+       rules as above -->
+  <property name="newt_base_version" value="1.0" />
+
+  <!-- Newt isn't covered by a JSR at the moment, so there is little
+       value in having a different reference implementation
+       vs. intermediate build numbering scheme, but for the moment
+       let's keep things symmetric -->
+  <!-- <property name="newt.ri" value="true" /> -->
+
+</project>