aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/README-zip-bundles.txt54
-rw-r--r--make/build-common.xml50
-rw-r--r--make/build-jogl.xml60
-rw-r--r--make/build-nativewindow.xml53
-rw-r--r--make/build-newt.xml42
-rw-r--r--make/build.xml9
-rw-r--r--make/joglRIversion9
-rw-r--r--make/joglRIversion-cdc9
-rw-r--r--make/joglversion2
-rw-r--r--make/joglversion-cdc2
-rw-r--r--make/nativewindowRIversion9
-rw-r--r--make/nativewindowRIversion-cdc9
-rw-r--r--make/nativewindowversion2
-rw-r--r--make/nativewindowversion-cdc2
-rw-r--r--make/newtRIversion9
-rw-r--r--make/newtRIversion-cdc9
-rw-r--r--make/newtversion2
-rw-r--r--make/newtversion-cdc2
18 files changed, 95 insertions, 239 deletions
diff --git a/make/README-zip-bundles.txt b/make/README-zip-bundles.txt
index 3fc9424b9..29f2650a4 100644
--- a/make/README-zip-bundles.txt
+++ b/make/README-zip-bundles.txt
@@ -1,45 +1,61 @@
-Java (TM) Binding for the OpenGL (r) API, version @VERSION@
--------------------------------------------------------
+Java (TM) Binding for the OpenGL (r) API, version @BASEVERSION@
+-----------------------------------------------------------------------------
-This software is licensed by Sun Microsystems, as specified
-in the LICENSE.txt file. You must use this software
-in accordance with the terms under which the code is licensed.
+This software is licensed as specified in the LICENSE.txt file.
+You must use this software in accordance with the terms
+under which the code is licensed.
+This is build version @VERSION@, based on:
+ branch @SCM_BRANCH@
+ commit @SCM_COMMIT@
-
-Instructions for unzipping Java Binding for the OpenGL API, version @VERSION@
---------------------------------------------------------------------
+Instructions for unzipping Java Binding for the OpenGL API, version @BASEVERSION@
+----------------------------------------------------------------------------------
After downloading and unzipping the zip file containing the
JOGL release for your target platform, you will see the
following files in the top directory:
- COPYRIGHT.txt
LICENSE.txt
Userguide.html
README.txt README file (you are reading it now)
and the following subdirectory:
- lib contains JOGL implementation
+ etc contains JOGL shell scripts
+ jar contains JOGL implementation, JAR files
+ lib contains JOGL implementation, native libraries
+ jnlp-files contains JOGL jnlp-file templates
-All of the JOGL implementation files (jar files and native
-libraries) are in the lib subdirectory. For instructions on
-how to use these implementation files to build or run a JOGL
-program see the enclosed JOGL user guide (Userguide.html).
+For instructions on how to use these implementation files
+to build or run a JOGL program look at:
+ http://jogamp.org/
+ http://jogamp.org/jogl/
+ http://jogamp.org/wiki/index.php/Jogl_Tutorial
+ http://jogamp.org/wiki/index.php/Jogl_FAQ
+You can verify the version of the build via the JOGL self test:
+ etc/test.sh (Linux, FreeBSD, MacOSX, ..)
+ etc\test.bat (Windows)
+You may also have a look at the (outdated) enclosed JOGL user guide, Userguide.html
Project source code and getting assistance
------------------------------------------
-JOGL source code and project information can be found at:
+JOGL source code can be found at:
- https://jogl.dev.java.net/
+ http://jogamp.org/git/
+ http://github.com/sgothel/jogl
+ http://github.com/sgothel/gluegen
-Numerous answers to common questions can be found on the JOGL
-forum:
+You can address the JogAmp Community via:
+------------------------------------------
+ Web http://jogamp.org/
+ Forum/Mailinglist http://jogamp.762907.n3.nabble.com/
+ JogAmp Channel server: conference.jabber.org room: jogamp
+ Repository http://jogamp.org/git/
+ Email mediastream _at_ jogamp _dot_ org
- http://www.javagaming.org/index.php/board,25.0.html
diff --git a/make/build-common.xml b/make/build-common.xml
index 5a8da17f3..cdc0ad091 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -26,40 +26,11 @@
<import file="versions.xml" />
- <tstamp>
- <format property="version.timestamp" pattern="yyyyMMddHHmm"/>
- </tstamp>
-
- <target name="nativewindow.setup-version-RI" if="nativewindow.ri">
- <property name="nativewindow.version" value="${nativewindow_base_version}" />
- </target>
-
- <target name="nativewindow.setup-version-non-RI" unless="nativewindow.ri">
- <property name="nativewindow.version" value="${nativewindow_base_version}-pre-${version.timestamp}" />
- </target>
- <target name="jogl.setup-version-RI" if="jogl.ri">
- <property name="jogl.version" value="${jogl_base_version}" />
- </target>
-
- <target name="jogl.setup-version-non-RI" unless="jogl.ri">
- <property name="jogl.version" value="${jogl_base_version}-pre-${version.timestamp}" />
- </target>
-
- <target name="newt.setup-version-RI" if="newt.ri">
- <property name="newt.version" value="${newt_base_version}" />
- </target>
-
- <target name="newt.setup-version-non-RI" unless="newt.ri">
- <property name="newt.version" value="${newt_base_version}-pre-${version.timestamp}" />
- </target>
-
- <target name="setup-versions" depends="nativewindow.setup-version-RI, nativewindow.setup-version-non-RI, jogl.setup-version-RI, jogl.setup-version-non-RI, newt.setup-version-RI, newt.setup-version-non-RI"/>
-
<!-- ================================================================== -->
<!--
- Base initialization of properties and detection of operating system.
-->
- <target name="common.init" depends="gluegen.cpptasks.detect.os,setup-versions" unless="common.init.done">
+ <target name="common.init" depends="gluegen.cpptasks.detect.os" unless="common.init.done">
<property name="common.init.done" value="true" />
<!-- Set the project root directory to be up one directory. -->
@@ -69,9 +40,6 @@
<property name="lib" value="${build}/lib" />
<property name="jar" value="${build}/jar" />
- <property name="archive.name" value="jogl-${jogl.version}-${os.and.arch}" />
- <property name="archive" value="${build}/${archive.name}" />
-
<property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
<!-- No generated classes for Newt at the present time -->
<property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
@@ -82,8 +50,22 @@
<property name="stub.includes" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet -->
<property name="stub.includes.common" value="${stub.includes}/gluegen" />
+ <tstamp>
+ <format property="version.timestamp" pattern="yyyyMMdd"/>
+ </tstamp>
+
<property file="${build}/artifact.properties"/>
- <property name="jogl.build.number" value="manual-build"/>
+ <property name="jogl.build.number" value="manual"/>
+ <property name="jogl.build.id" value="${version.timestamp}"/>
+ <property name="jogl.build.branch" value="master"/>
+ <property name="jogl.build.commit" value="manual"/>
+
+ <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="archive.name" value="jogl-${jogl.version}-${os.and.arch}" />
+ <property name="archive" value="${build}/${archive.name}" />
<condition property="setup.nodesktop">
<and>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 10ad52948..85a2597bb 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1358,14 +1358,6 @@
exceptions="false"
rtti="false">
- <!-- TODO: versioninfo companyname="java.net"
- legalcopyright="Copyright"
- productname="JOGL"
- productversion="x.y.z"
- description="Description"
- fileversion="x.y.z"
- filecomments="File Comment" /-->
-
<fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
<compiler extends="@{compiler.cfg.id}" >
@@ -1475,49 +1467,29 @@
-->
<target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
- <target name="setup-manifestfile">
- <condition property="manifestfile" value="joglRIversion">
- <isset property="jogl.ri" />
- </condition>
- <condition property="manifestfile" value="joglversion">
- <not>
- <isset property="jogl.ri" />
- </not>
- </condition>
- <tstamp>
- <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
- </tstamp>
+ <target name="setup-manifestfile" depends="common.init">
+ <property name="manifestfile" value="joglversion"/>
<copy file="${manifestfile}"
tofile="${build.jogl}/tempversion"
overwrite="true">
<filterset>
- <!-- This token only exists in the non-RI version of the manifest -->
- <filter token="VERSION" value="${jogl_base_version}-pre-${timestamp}"/>
- <!-- This token exists in both the RI and non-RI versions of the manifest -->
+ <filter token="VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${jogl_base_version}"/>
</filterset>
</copy>
</target>
- <target name="setup-manifestfile-cdc" unless="setup.noCDC">
- <condition property="manifestfile" value="joglRIversion-cdc">
- <isset property="jogl.ri" />
- </condition>
- <condition property="manifestfile" value="joglversion-cdc">
- <not>
- <isset property="jogl.ri" />
- </not>
- </condition>
- <tstamp>
- <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
- </tstamp>
+ <target name="setup-manifestfile-cdc" unless="setup.noCDC" depends="common.init">
+ <property name="manifestfile" value="joglversion-cdc"/>
<copy file="${manifestfile}"
tofile="${build.jogl}/tempversion-cdc"
overwrite="true">
<filterset>
- <!-- This token only exists in the non-RI version of the manifest -->
- <filter token="VERSION" value="${jogl_base_version}-pre-${timestamp}"/>
- <!-- This token exists in both the RI and non-RI versions of the manifest -->
+ <filter token="VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${jogl_base_version}"/>
</filterset>
</copy>
@@ -1884,16 +1856,4 @@
<echo message="${jogl.version}" file="${build.jogl}/version.txt" />
</target>
- <!-- ================================================================== -->
- <!--
- - Build everything and use Sun's Implementation tag in the manifest to
- - indicate this is the Reference Implementation.
- -->
- <target name="RI">
- <!-- Set property for using the RI manifest file so jogl.jar is versioned
- - properly
- -->
- <property name="jogl.ri" value="true" />
- <antcall target="all" inheritRefs="true" />
- </target>
</project>
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 51596fdeb..2b06b1e2b 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -572,14 +572,6 @@
exceptions="false"
rtti="false">
- <!-- TODO: versioninfo companyname="java.net"
- legalcopyright="Copyright"
- productname="JOGL"
- productversion="x.y.z"
- description="Description"
- fileversion="x.y.z"
- filecomments="File Comment" /-->
-
<fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
<compiler extends="@{compiler.cfg.id}" >
@@ -672,50 +664,33 @@
<target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
<target name="setup-manifestfile">
- <condition property="manifestfile" value="nativewindowRIversion">
- <isset property="nativewindow.ri" />
- </condition>
- <condition property="manifestfile" value="nativewindowversion">
- <not>
- <isset property="nativewindow.ri" />
- </not>
- </condition>
- <tstamp>
- <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
- </tstamp>
+ <property name="manifestfile" value="nativewindowversion"/>
<copy file="${manifestfile}"
tofile="tempversion"
overwrite="true">
<filterset>
- <filter token="VERSION" value="${nativewindow_base_version}-pre-${timestamp}"/>
+ <filter token="VERSION" value="${nativewindow.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${nativewindow_base_version}"/>
</filterset>
</copy>
</target>
<target name="setup-manifestfile-cdc">
- <condition property="manifestfile" value="nativewindowRIversion-cdc">
- <isset property="nativewindow.ri" />
- </condition>
- <condition property="manifestfile" value="nativewindowversion-cdc">
- <not>
- <isset property="nativewindow.ri" />
- </not>
- </condition>
- <tstamp>
- <format property="timestamp" pattern="yyyyMMdd-HH:mm:ss"/>
- </tstamp>
+ <property name="manifestfile" value="nativewindowversion-cdc"/>
<copy file="${manifestfile}"
tofile="tempversion-cdc"
overwrite="true">
<filterset>
- <filter token="VERSION" value="${nativewindow_base_version}-pre-${timestamp}"/>
+ <filter token="VERSION" value="${nativewindow.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${nativewindow_base_version}"/>
</filterset>
</copy>
</target>
-
<target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
<jar manifest="tempversion" destfile="${nativewindow.awt.jar}" filesonly="true">
<fileset dir="${classes}"
@@ -862,16 +837,4 @@
<echo message="${nativewindow.version}" file="${build.nativewindow}/version.txt" />
</target>
- <!-- ================================================================== -->
- <!--
- - Build everything and use Sun's Implementation tag in the manifest to
- - indicate this is the Reference Implementation.
- -->
- <target name="RI">
- <!-- Set property for using the RI manifest file so nativewindow.jar is versioned
- - properly
- -->
- <property name="nativewindow.ri" value="true" />
- <antcall target="all" inheritRefs="true" />
- </target>
</project>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index d8fb0a59d..7f33f9c2a 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -468,14 +468,6 @@
exceptions="false"
rtti="false">
- <!-- TODO: versioninfo companyname="java.net"
- legalcopyright="Copyright"
- productname="JOGL"
- productversion="x.y.z"
- description="Description"
- fileversion="x.y.z"
- filecomments="File Comment" /-->
-
<fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
<compiler extends="@{compiler.cfg.id}" >
@@ -578,38 +570,28 @@
<target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
<target name="setup-manifestfile">
- <condition property="manifestfile" value="newtRIversion">
- <isset property="newt.ri" />
- </condition>
- <condition property="manifestfile" value="newtversion">
- <not>
- <isset property="newt.ri" />
- </not>
- </condition>
+ <property name="manifestfile" value="newtversion"/>
<copy file="${manifestfile}"
tofile="tempversion"
overwrite="true">
<filterset>
<filter token="VERSION" value="${newt.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${newt_base_version}"/>
</filterset>
</copy>
</target>
<target name="setup-manifestfile-cdc">
- <condition property="manifestfile" value="newtRIversion-cdc">
- <isset property="newt.ri" />
- </condition>
- <condition property="manifestfile" value="newtversion-cdc">
- <not>
- <isset property="newt.ri" />
- </not>
- </condition>
+ <property name="manifestfile" value="newtversion-cdc"/>
<copy file="${manifestfile}"
tofile="tempversion-cdc"
overwrite="true">
<filterset>
<filter token="VERSION" value="${newt.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
<filter token="BASEVERSION" value="${newt_base_version}"/>
</filterset>
</copy>
@@ -816,16 +798,4 @@
<echo message="${newt.version}" file="${build.newt}/version.txt" />
</target>
- <!-- ================================================================== -->
- <!--
- - Build everything and use Sun's Implementation tag in the manifest to
- - indicate this is the Reference Implementation.
- -->
- <target name="RI">
- <!-- Set property for using the RI manifest file so newt.jar is versioned
- - properly
- -->
- <property name="newt.ri" value="true" />
- <antcall target="all" inheritRefs="true" />
- </target>
</project>
diff --git a/make/build.xml b/make/build.xml
index 54ac04432..ed629181d 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -101,6 +101,9 @@
overwrite="true">
<filterset>
<filter token="VERSION" value="${jogl.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+ <filter token="BASEVERSION" value="${jogl_base_version}"/>
</filterset>
</copy>
<mkdir dir="${archive}/jar" />
@@ -129,9 +132,13 @@
<target name="tag.build" depends="init">
<copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
- <echo file="${build}/artifact.properties" message='jogl.build.number=${jogl.build.number}${line.separator}' append="true"/>
+ <echo message='jogl.build.number=${jogl.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='jogl.build.id=${jogl.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='jogl.build.branch=${jogl.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='jogl.build.commit=${jogl.build.commit}${line.separator}' file="${build}/artifact.properties" append="true"/>
</target>
+
<!-- ================================================================== -->
<!--
- Main build target.
diff --git a/make/joglRIversion b/make/joglRIversion
deleted file mode 100644
index 46b64ac0d..000000000
--- a/make/joglRIversion
+++ /dev/null
@@ -1,9 +0,0 @@
-Specification-Title: Java Bindings for OpenGL API Specification
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
-Implementation-Title: Java Bindings for OpenGL Runtime Environment
-Implementation-Version: @BASEVERSION@
-Implementation-Vendor: JogAmp community
-Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/joglRIversion-cdc b/make/joglRIversion-cdc
deleted file mode 100644
index 13a782ce0..000000000
--- a/make/joglRIversion-cdc
+++ /dev/null
@@ -1,9 +0,0 @@
-Specification-Title: Java Bindings for OpenGL API Specification CDC
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
-Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
-Implementation-Version: @BASEVERSION@
-Implementation-Vendor: JogAmp community
-Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/joglversion b/make/joglversion
index 185236273..01e3a3699 100644
--- a/make/joglversion
+++ b/make/joglversion
@@ -3,6 +3,8 @@ Specification-Version: @BASEVERSION@
Specification-Vendor: JogAmp community
Implementation-Title: Java Bindings for OpenGL Runtime Environment
Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
Implementation-Vendor: JogAmp community
Extension-Name: javax.media.opengl
Implementation-Vendor-Id: com.jogamp
diff --git a/make/joglversion-cdc b/make/joglversion-cdc
index 17a5b918d..b5ec55f4c 100644
--- a/make/joglversion-cdc
+++ b/make/joglversion-cdc
@@ -3,6 +3,8 @@ Specification-Version: @BASEVERSION@
Specification-Vendor: JogAmp community
Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
Implementation-Vendor: JogAmp community
Extension-Name: javax.media.opengl
Implementation-Vendor-Id: com.jogamp
diff --git a/make/nativewindowRIversion b/make/nativewindowRIversion
deleted file mode 100644
index b039954ef..000000000
--- a/make/nativewindowRIversion
+++ /dev/null
@@ -1,9 +0,0 @@
-Specification-Title: Native Window Interface API Specification
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
-Implementation-Title: Native Window Interface Runtime Environment
-Implementation-Version: @BASEVERSION@
-Implementation-Vendor: JogAmp community
-Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/nativewindowRIversion-cdc b/make/nativewindowRIversion-cdc
deleted file mode 100644
index 4e9760c29..000000000
--- a/make/nativewindowRIversion-cdc
+++ /dev/null
@@ -1,9 +0,0 @@
-Specification-Title: Native Window Interface API Specification CDC
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
-Implementation-Title: Native Window Interface Runtime Environment CDC
-Implementation-Version: @BASEVERSION@
-Implementation-Vendor: JogAmp community
-Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/nativewindowversion b/make/nativewindowversion
index 7872a7656..e9db69c54 100644
--- a/make/nativewindowversion
+++ b/make/nativewindowversion
@@ -3,6 +3,8 @@ Specification-Version: @BASEVERSION@
Specification-Vendor: JogAmp community
Implementation-Title: Native Window Interface Runtime Environment
Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
Implementation-Vendor: JogAmp community
Extension-Name: javax.media.nativewindow
Implementation-Vendor-Id: com.jogamp
diff --git a/make/nativewindowversion-cdc b/make/nativewindowversion-cdc
index 0354559c7..289b6dc72 100644
--- a/make/nativewindowversion-cdc
+++ b/make/nativewindowversion-cdc
@@ -3,6 +3,8 @@ Specification-Version: @BASEVERSION@
Specification-Vendor: JogAmp community
Implementation-Title: Native Window Interface Runtime Environment CDC
Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
Implementation-Vendor: JogAmp community
Extension-Name: javax.media.nativewindow
Implementation-Vendor-Id: com.jogamp
diff --git a/make/newtRIversion b/make/newtRIversion
deleted file mode 100644
index 73d9bc8ac..000000000
--- a/make/newtRIversion
+++ /dev/null
@@ -1,9 +0,0 @@
-Specification-Title: NEWT API Specification
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
-Implementation-Title: NEWT Runtime Environment
-Implementation-Version: @BASEVERSION@
-Implementation-Vendor: JogAmp community
-Extension-Name: com.jogamp.newt
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/newtRIversion-cdc b/make/newtRIversion-cdc
deleted file mode 100644
index a5bdfaeeb..000000000
--- a/make/newtRIversion-cdc
+++ /dev/null
@@ -1,9 +0,0 @@
-Specification-Title: NEWT API Specification CDC
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp community
-Implementation-Title: NEWT Runtime Environment CDC
-Implementation-Version: @BASEVERSION@
-Implementation-Vendor: JogAmp community
-Extension-Name: com.jogamp.newt
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/newtversion b/make/newtversion
index b2985621d..262eefe22 100644
--- a/make/newtversion
+++ b/make/newtversion
@@ -3,6 +3,8 @@ Specification-Version: @BASEVERSION@
Specification-Vendor: JogAmp community
Implementation-Title: NEWT Runtime Environment
Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
Implementation-Vendor: JogAmp community
Extension-Name: com.jogamp.newt
Implementation-Vendor-Id: com.jogamp
diff --git a/make/newtversion-cdc b/make/newtversion-cdc
index 89ca1db12..5911ff798 100644
--- a/make/newtversion-cdc
+++ b/make/newtversion-cdc
@@ -3,6 +3,8 @@ Specification-Version: @BASEVERSION@
Specification-Vendor: JogAmp community
Implementation-Title: NEWT Runtime Environment CDC
Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
Implementation-Vendor: JogAmp community
Extension-Name: com.jogamp.newt
Implementation-Vendor-Id: com.jogamp