diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/make/build.xml b/make/build.xml index 188f518..1f46d57 100644 --- a/make/build.xml +++ b/make/build.xml @@ -63,10 +63,6 @@ <property name="javadoc.gluegen.path" location="${javadoc.root.path}/gluegen/javadoc" /> <property name="gluegen.lib.dir" value="${build}/obj"/> - <tstamp> - <format property="version.timestamp" pattern="yyyyMMdd"/> - </tstamp> - <property name="gluegen.build.number" value="manual"/> <property name="gluegen.build.id" value="${version.timestamp}"/> <mkdir dir="${build}" /> @@ -85,11 +81,8 @@ </exec> <property name="gluegen.build.commit" value="manual"/> <!-- fallback --> - <!-- This is the version of GlueGen you are building xxyyzzz, xx=API yy screen-from-to zzz app-version--> - <property name="gluegen_int_version" value="0914011"/> <property name="gluegen_base_version" value="2.0"/> <property name="gluegen.version" value="${gluegen_base_version}-b${gluegen.build.number}-${version.timestamp}" /> - <property name="gluegen.version.plus" value="${gluegen_base_version}-${gluegen.build.branch}-b${gluegen.build.number}-${version.timestamp}" /> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> @@ -800,7 +793,8 @@ tofile="${build}/Manifest.temp" overwrite="true"> <filterset> - <filter token="VERSION" value="${gluegen.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${gluegen.version}"/> <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> <filter token="BASEVERSION" value="${gluegen_base_version}"/> @@ -823,7 +817,8 @@ tofile="${build}/Manifest-rt.temp" overwrite="true"> <filterset> - <filter token="VERSION" value="${gluegen.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${gluegen.version}"/> <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> <filter token="BASEVERSION" value="${gluegen_base_version}"/> @@ -882,7 +877,8 @@ tofile="${build}/Manifest-rt-android.temp" overwrite="true"> <filterset> - <filter token="VERSION" value="${gluegen.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${gluegen.version}"/> <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> <filter token="BASEVERSION" value="${gluegen_base_version}"/> @@ -940,7 +936,8 @@ tofile="${build}/Manifest-android-launcher.temp" overwrite="true"> <filterset> - <filter token="VERSION" value="${gluegen.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${gluegen.version}"/> <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> <filter token="BASEVERSION" value="${gluegen_base_version}"/> @@ -964,8 +961,8 @@ androidmanifest.path="resources/android/AndroidManifest-Launcher.xml" androidresources.path="resources/android/res" jarmanifest.path="${build}/Manifest-android-launcher.temp" - version.code="${gluegen_int_version}" - version.name="${gluegen.version.plus}" + version.code="${jogamp_int_version}" + version.name="${jogamp.version}" /> </target> @@ -990,8 +987,8 @@ androidmanifest.path="resources/android/AndroidManifest-Runtime.xml" androidresources.path="resources/android/res" jarmanifest.path="${build}/Manifest-rt-android.temp" - version.code="${gluegen_int_version}" - version.name="${gluegen.version.plus}" + version.code="${jogamp_int_version}" + version.name="${jogamp.version}" /> </target> |