diff options
Diffstat (limited to 'make/build-newt.xml')
| -rw-r--r-- | make/build-newt.xml | 59 |
1 files changed, 21 insertions, 38 deletions
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"> |