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.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.xml')
| -rw-r--r-- | make/build.xml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index 44adf805f..0c6c97d34 100644 --- a/make/build.xml +++ b/make/build.xml @@ -165,8 +165,8 @@ androidmanifest.path="resources/android/AndroidManifest-jogl.xml" androidresources.path="resources/android/res-jogl" jarmanifest.path="${build.jogl}/manifest.mf" - version.code="${jogl_int_version}" - version.name="${jogl.version.plus}" /> + version.code="${jogamp.version.int}" + version.name="${jogamp.version}" /> </target> <target name="one.dir.skip.check" depends="init,gluegen.cpptasks.detect.os"> @@ -241,10 +241,11 @@ tofile="${archive}/README.txt" overwrite="true"> <filterset> - <filter token="VERSION" value="${jogl.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="${jogl_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> <mkdir dir="${archive}/jar" /> @@ -343,10 +344,10 @@ <property name="javadoc.overview" value="doc/jogl/spec-overview.html" /> <property name="javadoc.nw.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" /> - <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${nativewindow_base_version} Specification" /> + <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${jogamp.version.base} Specification" /> <property name="javadoc.nw.spec.packagenames" value="javax.media.nativewindow.*" /> - <property name="javadoc.spec.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" /> + <property name="javadoc.spec.windowtitle" value="JOGL API -- JSR-231 ${jogamp.version.base} Specification" /> <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" /> |