diff options
| author | Sven Gothel <[email protected]> | 2013-03-28 23:24:39 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-03-28 23:24:39 +0100 |
| commit | 0b242442fba01df86be636f54e3d478aa722d6a7 (patch) | |
| tree | d3199b96411e926a41aab60629d5afece6c30ef4 /make/build-newt.xml | |
| parent | a121055f9e4ac039fa820f06e9e81e5ce72e5e24 (diff) | |
Adapt to new version scheme, see GlueGen a3f2ef50ad33c58a240a17fcf03e415d772207c3, etc; Fix NewtVersion, NativeWindowVersion and NewtVersionActivityLauncher
NewtVersion, NativeWindowVersion: Also search for extension javax.media.opengl (all packaging)
NewtVersionActivityLauncher: Use new launcher URI
Diffstat (limited to 'make/build-newt.xml')
| -rw-r--r-- | make/build-newt.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index c3b51141f..864e0f93e 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -188,7 +188,7 @@ <property name="javadoc" value="${project.root}/javadoc_newt_public" /> <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" /> <property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" /> - <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" /> + <property name="javadoc.windowtitle" value="NEWT API -- ${jogamp.version.base} Specification" /> <property name="javadoc.overview" value="spec-overview.html" /> <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event, com.jogamp.newt.opengl, com.jogamp.newt.util" /> @@ -733,10 +733,11 @@ tofile="${build.newt}/manifest.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${newt.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${newt_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> </target> @@ -907,7 +908,7 @@ <target name="generate.version.txt" depends="init"> <!-- Create a version.txt file indicating which version we just built --> - <echo message="${newt.version}" file="${build.newt}/version.txt" /> + <echo message="${jogl.version}" file="${build.newt}/version.txt" /> </target> </project> |