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

1 files changed, 23 insertions, 42 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>