diff options
| author | Sven Gothel <[email protected]> | 2010-11-10 06:10:07 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-10 06:10:07 +0100 |
| commit | 92e1e8b24d128e08f13b05bd630ad7b0bf1cbf9f (patch) | |
| tree | 75edcee8cb2fc4d1a14a16ee8c87066c4d4469bd | |
| parent | 144be6392afbe3b1ddd4afe071bf738e6f134248 (diff) | |
Adding SCM_BRANCH, gluegen.build.branch info
| -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 | 5 |
4 files changed, 8 insertions, 0 deletions
diff --git a/make/Manifest b/make/Manifest index 9bbd947..785e199 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-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp community Implementation-Vendor-Id: com.jogamp diff --git a/make/Manifest-rt b/make/Manifest-rt index 5590ebf..5079ce8 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-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp community Extension-Name: com.jogamp.common diff --git a/make/Manifest-rt.cdc b/make/Manifest-rt.cdc index d4cdb7b..325e82f 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-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp community Extension-Name: com.jogamp.common diff --git a/make/build.xml b/make/build.xml index 35c3d6b..64be75d 100755 --- a/make/build.xml +++ b/make/build.xml @@ -54,6 +54,7 @@ <property file="${build}/artifact.properties"/> <property name="gluegen.build.number" value="manual"/> <property name="gluegen.build.id" value="${version.timestamp}"/> + <property name="gluegen.build.branch" value="master"/> <property name="gluegen.build.commit" value="manual"/> <!-- This is the version of GlueGen you are building --> @@ -607,6 +608,7 @@ overwrite="true"> <filterset> <filter token="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}"/> </filterset> @@ -624,6 +626,7 @@ overwrite="true"> <filterset> <filter token="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}"/> </filterset> @@ -634,6 +637,7 @@ overwrite="true"> <filterset> <filter token="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}"/> </filterset> @@ -699,6 +703,7 @@ <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.branch=${gluegen.build.branch}${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> |