diff options
| author | Kenneth Russel <[email protected]> | 2009-06-17 21:58:28 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2009-06-17 21:58:28 +0000 |
| commit | 023ac9d25b0593e5a327f35685fcae8a62afa10d (patch) | |
| tree | abfc6ef37e2f1f6abc8ea8ad08ed5812eed1cf7a /make/build-newt.xml | |
| parent | b78113cd21ea9b31867e2b415b8586751e056e54 (diff) | |
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
Diffstat (limited to 'make/build-newt.xml')
| -rw-r--r-- | make/build-newt.xml | 31 |
1 files changed, 18 insertions, 13 deletions
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> |