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-common.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-common.xml')
| -rw-r--r-- | make/build-common.xml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index f68cc43be..dd33b1683 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -27,8 +27,6 @@ </not> </condition> - <import file="versions.xml" /> - <!-- ================================================================== --> <!-- - Base initialization of properties and detection of operating system. @@ -63,10 +61,6 @@ <property name="stub.includes.gluegen.gg" value="${gluegen.root}/make/stub_includes/gluegen" /> <property name="stub.includes.gluegen.cc" value="${gluegen.root}/make/stub_includes/platform" /> - <tstamp> - <format property="version.timestamp" pattern="yyyyMMdd"/> - </tstamp> - <property name="jogl.build.number" value="manual"/> <property name="jogl.build.id" value="${version.timestamp}"/> <mkdir dir="${tempdir}" /> @@ -85,10 +79,7 @@ </exec> <property name="jogl.build.commit" value="manual"/> <!-- fallback --> - <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" /> - <property name="jogl.version" value="${jogl_base_version}-b${jogl.build.number}-${version.timestamp}" /> - <property name="newt.version" value="${newt_base_version}-b${jogl.build.number}-${version.timestamp}" /> - <property name="jogl.version.plus" value="${jogl_base_version}-${jogl.build.branch}-b${jogl.build.number}-${version.timestamp}" /> + <property name="jogl.version" value="${jogamp.version.base}-b${jogl.build.number}-${version.timestamp}" /> <property name="archive.name" value="jogl-${jogl.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> |