diff options
| author | Sven Gothel <[email protected]> | 2013-03-28 20:21:32 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-03-28 20:21:32 +0100 |
| commit | a7834bb17673ca4eacbb6d599a39e70e00993079 (patch) | |
| tree | 8e7bfe67c9ae4a65ce24c74fda88947ce5ff791a | |
| parent | a3f2ef50ad33c58a240a17fcf03e415d772207c3 (diff) | |
Move *_base_version to jogamp.version.base: Unifying base version across all core modules
| -rw-r--r-- | make/build.xml | 15 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/make/build.xml b/make/build.xml index 1f46d57..807b543 100644 --- a/make/build.xml +++ b/make/build.xml @@ -81,8 +81,7 @@ </exec> <property name="gluegen.build.commit" value="manual"/> <!-- fallback --> - <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" value="${jogamp.version.base}-b${gluegen.build.number}-${version.timestamp}" /> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> @@ -797,7 +796,7 @@ <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}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> @@ -821,7 +820,7 @@ <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}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> @@ -881,7 +880,7 @@ <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}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> @@ -940,7 +939,7 @@ <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}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> @@ -1182,14 +1181,14 @@ </target> <target name="maven.install" depends="init, base.compile, tag.build"> - <property name="maven.artifacts.version" value="${gluegen_base_version}"/> + <property name="maven.artifacts.version" value="${jogamp.version.base}"/> <antcall target="maven.antcalls" inheritall="true"> <param name="mvn.task" value="install"/> </antcall> </target> <target name="maven.deploy.snapshot" depends="init, base.compile, tag.build"> - <property name="maven.artifacts.version" value="${gluegen_base_version}-SNAPSHOT"/> + <property name="maven.artifacts.version" value="${jogamp.version.base}-SNAPSHOT"/> <antcall target="maven.antcalls" inheritall="true"> <param name="mvn.task" value="deploy"/> </antcall> diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index e657e03..5aa654f 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -68,8 +68,14 @@ <format property="version.timestamp" pattern="yyyyMMddHHmm"/> </tstamp> - <property name="jogamp.version" value="2.0.2-rc-${version.timestamp}" /> + <property name="jogamp.version.major" value="2"/> + <property name="jogamp.version.minor" value="0"/> + <property name="jogamp.version.submi" value="2"/> + <property name="jogamp.version.devel" value="-rc-${version.timestamp}"/> + <property name="jogamp.version.base" value="${jogamp.version.major}.${jogamp.version.minor}"/> + <property name="jogamp.version" value="${jogamp.version.base}.${jogamp.version.submi}${jogamp.version.devel}" /> <echo message="jogamp.version ${jogamp.version}"/> + <!-- This is the Android version: xxyyzzz, xx=API yy screen-from-to zzz app-version--> <property name="jogamp_int_version" value="0914012"/> <echo message="jogamp_int_version ${jogamp_int_version}"/> |