diff options
Diffstat (limited to 'make/build-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 53 |
1 files changed, 8 insertions, 45 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 51596fdeb..2b06b1e2b 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -572,14 +572,6 @@ exceptions="false" rtti="false"> - <!-- TODO: versioninfo companyname="java.net" - legalcopyright="Copyright" - productname="JOGL" - productversion="x.y.z" - description="Description" - fileversion="x.y.z" - filecomments="File Comment" /--> - <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset> <compiler extends="@{compiler.cfg.id}" > @@ -672,50 +664,33 @@ <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" /> <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> - <tstamp> - <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/> - </tstamp> + <property name="manifestfile" value="nativewindowversion"/> <copy file="${manifestfile}" tofile="tempversion" overwrite="true"> <filterset> - <filter token="VERSION" value="${nativewindow_base_version}-pre-${timestamp}"/> + <filter token="VERSION" value="${nativewindow.version}"/> + <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> + <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> <filter token="BASEVERSION" value="${nativewindow_base_version}"/> </filterset> </copy> </target> <target name="setup-manifestfile-cdc"> - <condition property="manifestfile" value="nativewindowRIversion-cdc"> - <isset property="nativewindow.ri" /> - </condition> - <condition property="manifestfile" value="nativewindowversion-cdc"> - <not> - <isset property="nativewindow.ri" /> - </not> - </condition> - <tstamp> - <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/> - </tstamp> + <property name="manifestfile" value="nativewindowversion-cdc"/> <copy file="${manifestfile}" tofile="tempversion-cdc" overwrite="true"> <filterset> - <filter token="VERSION" value="${nativewindow_base_version}-pre-${timestamp}"/> + <filter token="VERSION" value="${nativewindow.version}"/> + <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> + <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> <filter token="BASEVERSION" value="${nativewindow_base_version}"/> </filterset> </copy> </target> - <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT"> <jar manifest="tempversion" destfile="${nativewindow.awt.jar}" filesonly="true"> <fileset dir="${classes}" @@ -862,16 +837,4 @@ <echo message="${nativewindow.version}" file="${build.nativewindow}/version.txt" /> </target> - <!-- ================================================================== --> - <!-- - - Build everything and use Sun's Implementation tag in the manifest to - - indicate this is the Reference Implementation. - --> - <target name="RI"> - <!-- Set property for using the RI manifest file so nativewindow.jar is versioned - - properly - --> - <property name="nativewindow.ri" value="true" /> - <antcall target="all" inheritRefs="true" /> - </target> </project> |