diff options
author | Sven Gothel <[email protected]> | 2010-11-10 04:29:03 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-10 04:29:03 +0100 |
commit | 144be6392afbe3b1ddd4afe071bf738e6f134248 (patch) | |
tree | 1aad31d922e70884aebc4e908643b8081a7863af | |
parent | c5206336ce9cee3ca3ec634cb8e306c5acecca92 (diff) |
Added 'gluegen.build.id' (hudson timestamp) and 'gluegen.build.commit' (git commit sha1)
to the JARs Manifest files and artifact.properties.
-rwxr-xr-x | make/Manifest | 1 | ||||
-rwxr-xr-x | make/Manifest-rt | 1 | ||||
-rwxr-xr-x | make/Manifest-rt.cdc | 1 | ||||
-rwxr-xr-x | make/build.xml | 14 |
4 files changed, 14 insertions, 3 deletions
diff --git a/make/Manifest b/make/Manifest index 4c27362..9bbd947 100755 --- a/make/Manifest +++ b/make/Manifest @@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp community Implementation-Title: GlueGen Compile-Time Implementation-Version: @VERSION@ +Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp community Implementation-Vendor-Id: com.jogamp Main-Class: com.jogamp.gluegen.GlueGen diff --git a/make/Manifest-rt b/make/Manifest-rt index 776b2f8..5590ebf 100755 --- a/make/Manifest-rt +++ b/make/Manifest-rt @@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp community Implementation-Title: GlueGen Run-Time Implementation-Version: @VERSION@ +Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp community Extension-Name: com.jogamp.common Implementation-Vendor-Id: com.jogamp diff --git a/make/Manifest-rt.cdc b/make/Manifest-rt.cdc index 1a99edc..d4cdb7b 100755 --- a/make/Manifest-rt.cdc +++ b/make/Manifest-rt.cdc @@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp community Implementation-Title: GlueGen Run-Time CDC Implementation-Version: @VERSION@ +Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp community Extension-Name: com.jogamp.common Implementation-Vendor-Id: com.jogamp diff --git a/make/build.xml b/make/build.xml index f5a4228..35c3d6b 100755 --- a/make/build.xml +++ b/make/build.xml @@ -47,14 +47,17 @@ <property name="javadoc" location="${build}/javadoc" /> <property name="gluegen.lib.dir" value="${build}/obj"/> + <tstamp> + <format property="version.timestamp" pattern="yyyyMMdd"/> + </tstamp> + <property file="${build}/artifact.properties"/> <property name="gluegen.build.number" value="manual"/> + <property name="gluegen.build.id" value="${version.timestamp}"/> + <property name="gluegen.build.commit" value="manual"/> <!-- This is the version of GlueGen you are building --> <property name="gluegen_base_version" value="2.0"/> - <tstamp> - <format property="version.timestamp" pattern="yyyyMMdd"/> - </tstamp> <property name="gluegen.version" value="${gluegen_base_version}-b${gluegen.build.number}-${version.timestamp}" /> <!-- The generated source directories. --> @@ -604,6 +607,7 @@ overwrite="true"> <filterset> <filter token="VERSION" value="${gluegen.version}"/> + <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> <filter token="BASEVERSION" value="${gluegen_base_version}"/> </filterset> </copy> @@ -620,6 +624,7 @@ overwrite="true"> <filterset> <filter token="VERSION" value="${gluegen.version}"/> + <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> <filter token="BASEVERSION" value="${gluegen_base_version}"/> </filterset> </copy> @@ -629,6 +634,7 @@ overwrite="true"> <filterset> <filter token="VERSION" value="${gluegen.version}"/> + <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> <filter token="BASEVERSION" value="${gluegen_base_version}"/> </filterset> </copy> @@ -692,6 +698,8 @@ <target name="tag.build" depends="init"> <echo message='gluegen.build.number=${gluegen.build.number}${line.separator}' file="${build}/artifact.properties"/> + <echo message='gluegen.build.id=${gluegen.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/> + <echo message='gluegen.build.commit=${gluegen.build.commit}${line.separator}' file="${build}/artifact.properties" append="true"/> </target> <target name="junit.compile" depends="init, gluegen.cpptasks.detect.os"> |