diff options
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 63 |
1 files changed, 22 insertions, 41 deletions
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> |