Added generation of version.txt files to normal build paths of jogl,

nativewindow, and newt. Fixed detection of whether or not RI build is
in progress and thereby format of version number.


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

4 files changed, 62 insertions, 41 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index c88bbddf7..a1f324d62 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -2151,17 +2151,6 @@
          includes="${jogl.tmp.version}/**" />
     </target>
 
-    <target name="setup-version-RI" if="jogl.ri">
-        <property name="tmp.version" value="${jogl_base_version}" />
-    </target>
-
-    <target name="setup-version-non-RI" unless="jogl.ri">
-        <tstamp>
-             <format property="timestamp" pattern="yyyyMMdd"/>
-        </tstamp>
-        <property name="tmp.version" value="${jogl_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">
         <delete>
             <fileset dir="${jogl.dist.dir}" includes="*.jar" />
@@ -2348,7 +2337,23 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.jogl" />
+    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.jogl,generate.version.txt" />
+
+    <target name="setup-version-RI" if="jogl.ri">
+        <property name="tmp.version" value="${jogl_base_version}" />
+    </target>
+
+    <target name="setup-version-non-RI" unless="jogl.ri">
+        <tstamp>
+             <format property="version.timestamp" pattern="yyyyMMdd"/>
+        </tstamp>
+        <property name="tmp.version" value="${jogl_base_version}-pre-${version.timestamp}" />
+    </target>
+
+    <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI">
+        <!-- Create a version.txt file indicating which version we just built -->
+        <echo message="${tmp.version}" file="${build}/version.txt" />
+    </target>
 
     <!-- ================================================================== -->
     <!--
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 5506e146e..b08b9c4f1 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -1140,17 +1140,6 @@
          includes="${nativewindow.tmp.version}/**" />
     </target>
 
-    <target name="setup-version-RI" if="RImanifestfile">
-        <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="${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">
         <delete>
             <fileset dir="${nativewindow.dist.dir}" includes="*.jar" />
@@ -1326,7 +1315,23 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.nativewindow" />
+    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.nativewindow,generate.version.txt" />
+
+    <target name="setup-version-RI" if="nativewindow.ri">
+        <property name="tmp.version" value="${nativewindow_base_version}" />
+    </target>
+
+    <target name="setup-version-non-RI" unless="nativewindow.ri">
+        <tstamp>
+             <format property="version.timestamp" pattern="yyyyMMdd"/>
+        </tstamp>
+        <property name="tmp.version" value="${nativewindow_base_version}-pre-${version.timestamp}" />
+    </target>
+
+    <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI">
+        <!-- Create a version.txt file indicating which version we just built -->
+        <echo message="${tmp.version}" file="${build}/version.txt" />
+    </target>
 
     <!-- ================================================================== -->
     <!--
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 65757e219..33eb57ac8 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -856,17 +856,6 @@
          includes="${newt.tmp.version}/**" />
     </target>
 
-    <target name="setup-version-RI" if="RImanifestfile">
-        <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="${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">
         <delete>
             <fileset dir="${newt.dist.dir}" includes="*.jar" />
@@ -1009,7 +998,23 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.newt" />
+    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="load.user.properties,init,jar,c.build.newt,generate.version.txt" />
+
+    <target name="setup-version-RI" if="newt.ri">
+        <property name="tmp.version" value="${newt_base_version}" />
+    </target>
+
+    <target name="setup-version-non-RI" unless="newt.ri">
+        <tstamp>
+             <format property="version.timestamp" pattern="yyyyMMdd"/>
+        </tstamp>
+        <property name="tmp.version" value="${newt_base_version}-pre-${version.timestamp}" />
+    </target>
+
+    <target name="generate.version.txt" depends="setup-version-RI,setup-version-non-RI">
+        <!-- Create a version.txt file indicating which version we just built -->
+        <echo message="${tmp.version}" file="${build}/version.txt" />
+    </target>
 
     <!-- ================================================================== -->
     <!--
@@ -1020,7 +1025,7 @@
         <!-- Set property for using the RI manifest file so newt.jar is versioned
            - properly
           -->
-          <property name="RImanifestfile" value="newtRIversion" />
+          <property name="newt.ri" value="true" />
           <antcall target="all" inheritRefs="true" />
     </target>
 </project>
diff --git a/make/versions.xml b/make/versions.xml
index 5769a5d49..c43aaa0db 100644
--- a/make/versions.xml
+++ b/make/versions.xml
@@ -15,8 +15,10 @@
 
   <!-- 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" />
+       target in build-jogl.xml. This should be uncommented for
+       official release builds and intermediate release builds, but
+       commented out for nightly builds. -->
+       <property name="jogl.ri" value="true" />
 
   <!-- Base version of the NativeWindow interface, following the same
        rules as above -->
@@ -24,7 +26,9 @@
 
   <!-- Uncomment this property in order to produce a NativeWindow
        build without running the "RI" (Reference Implementation)
-       target in build-nativewindow.xml. -->
+       target in build-nativewindow.xml. This should be uncommented for
+       official release builds and intermediate release builds, but
+       commented out for nightly builds. -->
   <property name="nativewindow.ri" value="true" />
 
   <!-- Base version of the Newt library, following the same
@@ -34,7 +38,9 @@
   <!-- 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 -->
+       let's keep things symmetric. This should be uncommented for
+       official release builds and intermediate release builds, but
+       commented out for nightly builds.  -->
   <property name="newt.ri" value="true" />
 
 </project>