summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xmake/Manifest10
-rwxr-xr-xmake/Manifest-android-launcher10
-rwxr-xr-xmake/Manifest-rt10
-rwxr-xr-xmake/Manifest-rt-alt10
-rwxr-xr-xmake/Manifest-rt-android10
-rwxr-xr-xmake/Manifest-rt-natives10
-rwxr-xr-xmake/Manifest-rt.cdc10
-rw-r--r--make/build.xml106
-rwxr-xr-xmake/scripts/runtest.sh4
-rw-r--r--src/java/com/jogamp/common/util/JogampVersion.java60
-rw-r--r--src/java/com/jogamp/common/util/SHASum.java13
-rw-r--r--src/junit/com/jogamp/common/util/TestVersionInfo.java12
12 files changed, 132 insertions, 133 deletions
diff --git a/make/Manifest b/make/Manifest
index 27a9acc..b232e48 100755
--- a/make/Manifest
+++ b/make/Manifest
@@ -8,11 +8,11 @@ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
Implementation-Branch: @SCM_BRANCH@
Implementation-Commit: @SCM_COMMIT@
-Implementation-SHA256-Sources: @SHA256_SOURCES@
-Implementation-SHA256-Classes: @SHA256_CLASSES@
-Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@
-Implementation-SHA256-Natives: @SHA256_NATIVES@
-Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@
+Implementation-SHA-Sources: @SHA_SOURCES@
+Implementation-SHA-Classes: @SHA_CLASSES@
+Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@
+Implementation-SHA-Natives: @SHA_NATIVES@
+Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@
Implementation-Vendor: JogAmp Community
Implementation-Vendor-Id: com.jogamp
Implementation-URL: http://jogamp.org/
diff --git a/make/Manifest-android-launcher b/make/Manifest-android-launcher
index 4754474..02f21ec 100755
--- a/make/Manifest-android-launcher
+++ b/make/Manifest-android-launcher
@@ -8,11 +8,11 @@ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
Implementation-Branch: @SCM_BRANCH@
Implementation-Commit: @SCM_COMMIT@
-Implementation-SHA256-Sources: @SHA256_SOURCES@
-Implementation-SHA256-Classes: @SHA256_CLASSES@
-Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@
-Implementation-SHA256-Natives: @SHA256_NATIVES@
-Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@
+Implementation-SHA-Sources: @SHA_SOURCES@
+Implementation-SHA-Classes: @SHA_CLASSES@
+Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@
+Implementation-SHA-Natives: @SHA_NATIVES@
+Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@
Implementation-Vendor: JogAmp Community
Implementation-Vendor-Id: com.jogamp
Implementation-URL: http://jogamp.org/
diff --git a/make/Manifest-rt b/make/Manifest-rt
index 98f0e3f..22b8b06 100755
--- a/make/Manifest-rt
+++ b/make/Manifest-rt
@@ -8,11 +8,11 @@ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
Implementation-Branch: @SCM_BRANCH@
Implementation-Commit: @SCM_COMMIT@
-Implementation-SHA256-Sources: @SHA256_SOURCES@
-Implementation-SHA256-Classes: @SHA256_CLASSES@
-Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@
-Implementation-SHA256-Natives: @SHA256_NATIVES@
-Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@
+Implementation-SHA-Sources: @SHA_SOURCES@
+Implementation-SHA-Classes: @SHA_CLASSES@
+Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@
+Implementation-SHA-Natives: @SHA_NATIVES@
+Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@
Implementation-Vendor: JogAmp Community
Implementation-Vendor-Id: com.jogamp
Implementation-URL: http://jogamp.org/
diff --git a/make/Manifest-rt-alt b/make/Manifest-rt-alt
index f577950..6474c93 100755
--- a/make/Manifest-rt-alt
+++ b/make/Manifest-rt-alt
@@ -8,11 +8,11 @@ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
Implementation-Branch: @SCM_BRANCH@
Implementation-Commit: @SCM_COMMIT@
-Implementation-SHA256-Sources: @SHA256_SOURCES@
-Implementation-SHA256-Classes: @SHA256_CLASSES@
-Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@
-Implementation-SHA256-Natives: @SHA256_NATIVES@
-Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@
+Implementation-SHA-Sources: @SHA_SOURCES@
+Implementation-SHA-Classes: @SHA_CLASSES@
+Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@
+Implementation-SHA-Natives: @SHA_NATIVES@
+Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@
Implementation-Vendor: JogAmp Community
Implementation-Vendor-Id: com.jogamp
Implementation-URL: http://jogamp.org/
diff --git a/make/Manifest-rt-android b/make/Manifest-rt-android
index 16350df..d7058ee 100755
--- a/make/Manifest-rt-android
+++ b/make/Manifest-rt-android
@@ -8,11 +8,11 @@ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
Implementation-Branch: @SCM_BRANCH@
Implementation-Commit: @SCM_COMMIT@
-Implementation-SHA256-Sources: @SHA256_SOURCES@
-Implementation-SHA256-Classes: @SHA256_CLASSES@
-Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@
-Implementation-SHA256-Natives: @SHA256_NATIVES@
-Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@
+Implementation-SHA-Sources: @SHA_SOURCES@
+Implementation-SHA-Classes: @SHA_CLASSES@
+Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@
+Implementation-SHA-Natives: @SHA_NATIVES@
+Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@
Implementation-Vendor: JogAmp Community
Implementation-Vendor-Id: com.jogamp
Implementation-URL: http://jogamp.org/
diff --git a/make/Manifest-rt-natives b/make/Manifest-rt-natives
index 480f765..2767462 100755
--- a/make/Manifest-rt-natives
+++ b/make/Manifest-rt-natives
@@ -8,11 +8,11 @@ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
Implementation-Branch: @SCM_BRANCH@
Implementation-Commit: @SCM_COMMIT@
-Implementation-SHA256-Sources: @SHA256_SOURCES@
-Implementation-SHA256-Classes: @SHA256_CLASSES@
-Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@
-Implementation-SHA256-Natives: @SHA256_NATIVES@
-Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@
+Implementation-SHA-Sources: @SHA_SOURCES@
+Implementation-SHA-Classes: @SHA_CLASSES@
+Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@
+Implementation-SHA-Natives: @SHA_NATIVES@
+Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@
Implementation-Vendor: JogAmp Community
Implementation-Vendor-Id: com.jogamp
Implementation-URL: http://jogamp.org/
diff --git a/make/Manifest-rt.cdc b/make/Manifest-rt.cdc
index 93a62ae..a23c48f 100755
--- a/make/Manifest-rt.cdc
+++ b/make/Manifest-rt.cdc
@@ -8,11 +8,11 @@ Implementation-Version: @VERSION@
Implementation-Build: @BUILD_VERSION@
Implementation-Branch: @SCM_BRANCH@
Implementation-Commit: @SCM_COMMIT@
-Implementation-SHA256-Sources: @SHA256_SOURCES@
-Implementation-SHA256-Classes: @SHA256_CLASSES@
-Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@
-Implementation-SHA256-Natives: @SHA256_NATIVES@
-Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@
+Implementation-SHA-Sources: @SHA_SOURCES@
+Implementation-SHA-Classes: @SHA_CLASSES@
+Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@
+Implementation-SHA-Natives: @SHA_NATIVES@
+Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@
Implementation-Vendor: JogAmp Community
Implementation-Vendor-Id: com.jogamp
Implementation-URL: http://jogamp.org/
diff --git a/make/build.xml b/make/build.xml
index 61a3880..5df5446 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -520,11 +520,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="0"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="${gluegen.build.sha256.natives}"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="0"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="${gluegen.build.sha.natives}"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -799,7 +799,7 @@
<target name="gluegen.package.javase">
<java classname="com.jogamp.common.util.SHASum" logError="true" failonerror="true" fork="true" newenvironment="true"
classpath="${classes}"
- outputproperty="gluegen.build.sha256.classes.gluegen">
+ outputproperty="gluegen.build.sha.classes.gluegen">
<sysproperty key="java.library.path" value="${gluegen.lib.dir}"/>
<arg value="--include"/>
@@ -818,11 +818,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="${gluegen.build.sha256.classes.gluegen}"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="0"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="${gluegen.build.sha.classes.gluegen}"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="0"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -844,7 +844,7 @@
<java classname="com.jogamp.common.util.SHASum" logError="true" failonerror="true" fork="true" newenvironment="true"
classpath="${classes}"
- outputproperty="gluegen.build.sha256.classes.gluegen-rt">
+ outputproperty="gluegen.build.sha.classes.gluegen-rt">
<sysproperty key="java.library.path" value="${gluegen.lib.dir}"/>
<arg value="--include"/>
@@ -871,11 +871,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="${gluegen.build.sha256.classes.gluegen-rt}"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="0"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="${gluegen.build.sha.classes.gluegen-rt}"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="0"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -904,11 +904,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="${gluegen.build.sha256.classes.gluegen-rt-alt}"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="0"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="${gluegen.build.sha.classes.gluegen-rt-alt}"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="0"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -936,11 +936,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="${gluegen.build.sha256.natives}"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="${gluegen.build.sha.natives}"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -954,11 +954,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="${gluegen.build.sha256.natives}"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="${gluegen.build.sha.natives}"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -1002,7 +1002,7 @@
<target name="gluegen.package.android" if="android-jars.available">
<java classname="com.jogamp.common.util.SHASum" logError="true" failonerror="true" fork="true" newenvironment="true"
classpath="${classes}"
- outputproperty="gluegen.build.sha256.classes.gluegen-rt-android">
+ outputproperty="gluegen.build.sha.classes.gluegen-rt-android">
<sysproperty key="java.library.path" value="${gluegen.lib.dir}"/>
<arg value="--include"/>
@@ -1027,11 +1027,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="${gluegen.build.sha256.classes.gluegen-rt-android}"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="0"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="${gluegen.build.sha.classes.gluegen-rt-android}"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="0"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -1063,7 +1063,7 @@
<target name="gluegen.packaging" depends="gluegen.cpptasks.detect.os">
<java classname="com.jogamp.common.util.SHASum" logError="true" failonerror="true" fork="true" newenvironment="true"
classpath="${classes}"
- outputproperty="gluegen.build.sha256.sources">
+ outputproperty="gluegen.build.sha.sources">
<sysproperty key="java.library.path" value="${gluegen.lib.dir}"/>
<!-- jvmarg value="-Djogamp.debug.SHASum"/ -->
@@ -1079,19 +1079,19 @@
</java>
<java classname="com.jogamp.common.util.SHASum" logError="true" failonerror="true" fork="true" newenvironment="true"
classpath="${classes}"
- outputproperty="gluegen.build.sha256.classes">
+ outputproperty="gluegen.build.sha.classes">
<sysproperty key="java.library.path" value="${gluegen.lib.dir}"/>
<arg value="${classes.unix}"/>
</java>
<java classname="com.jogamp.common.util.SHASum" logError="true" failonerror="true" fork="true" newenvironment="true"
classpath="${classes}"
- outputproperty="gluegen.build.sha256.natives">
+ outputproperty="gluegen.build.sha.natives">
<sysproperty key="java.library.path" value="${gluegen.lib.dir}"/>
<arg value="${gluegen.lib.dir}/${output.lib.name.os}"/>
</java>
- <echo message="gluegen.build.sha256.sources ${gluegen.build.sha256.sources}"/>
- <echo message="gluegen.build.sha256.classes ${gluegen.build.sha256.classes}"/>
- <echo message="gluegen.build.sha256.natives ${gluegen.build.sha256.natives}"/>
+ <echo message="gluegen.build.sha.sources ${gluegen.build.sha.sources}"/>
+ <echo message="gluegen.build.sha.classes ${gluegen.build.sha.classes}"/>
+ <echo message="gluegen.build.sha.natives ${gluegen.build.sha.natives}"/>
<antcall target="gluegen.package.javase" inheritRefs="true"/>
<antcall target="gluegen.package.android" inheritRefs="true"/>
<antcall target="gluegen.package.native" inheritRefs="true"/>
@@ -1125,7 +1125,7 @@
<target name="android-launcher.package" depends="android-launcher.build" if="isAndroid" unless="gluegen.build.skip.android-launcher">
<java classname="com.jogamp.common.util.SHASum" logError="true" failonerror="true" fork="true" newenvironment="true"
classpath="${classes}"
- outputproperty="gluegen.build.sha256.classes.jogamp-android-launcher">
+ outputproperty="gluegen.build.sha.classes.jogamp-android-launcher">
<sysproperty key="java.library.path" value="${gluegen.lib.dir}"/>
<arg value="--include"/>
@@ -1141,11 +1141,11 @@
<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="SHA256_SOURCES" value="${gluegen.build.sha256.sources}"/>
- <filter token="SHA256_CLASSES" value="${gluegen.build.sha256.classes}"/>
- <filter token="SHA256_CLASSES_THIS" value="${gluegen.build.sha256.classes.jogamp-android-launcher}"/>
- <filter token="SHA256_NATIVES" value="${gluegen.build.sha256.natives}"/>
- <filter token="SHA256_NATIVES_THIS" value="0"/>
+ <filter token="SHA_SOURCES" value="${gluegen.build.sha.sources}"/>
+ <filter token="SHA_CLASSES" value="${gluegen.build.sha.classes}"/>
+ <filter token="SHA_CLASSES_THIS" value="${gluegen.build.sha.classes.jogamp-android-launcher}"/>
+ <filter token="SHA_NATIVES" value="${gluegen.build.sha.natives}"/>
+ <filter token="SHA_NATIVES_THIS" value="0"/>
<filter token="BASEVERSION" value="${jogamp.version.base}"/>
<filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
</filterset>
@@ -1219,9 +1219,9 @@
<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"/>
- <echo message='gluegen.build.sha256.sources=${gluegen.build.sha256.sources}${line.separator}' file="${build}/artifact.properties" append="true"/>
- <echo message='gluegen.build.sha256.classes=${gluegen.build.sha256.classes}${line.separator}' file="${build}/artifact.properties" append="true"/>
- <echo message='gluegen.build.sha256.natives=${gluegen.build.sha256.natives}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='gluegen.build.sha.sources=${gluegen.build.sha.sources}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='gluegen.build.sha.classes=${gluegen.build.sha.classes}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='gluegen.build.sha.natives=${gluegen.build.sha.natives}${line.separator}' file="${build}/artifact.properties" append="true"/>
</target>
<target name="junit.compile" depends="init">
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index 6b14fdc..0ce33bd 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -93,7 +93,7 @@ function onetest() {
#
#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
@@ -112,7 +112,7 @@ function onetest() {
#onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG
-onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
+#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java
index c2f3c3e..bce2c31 100644
--- a/src/java/com/jogamp/common/util/JogampVersion.java
+++ b/src/java/com/jogamp/common/util/JogampVersion.java
@@ -45,16 +45,16 @@ public class JogampVersion {
public static final Attributes.Name IMPLEMENTATION_BRANCH = new Attributes.Name("Implementation-Branch");
/** See {@link #getImplementationCommit()} */
public static final Attributes.Name IMPLEMENTATION_COMMIT = new Attributes.Name("Implementation-Commit");
- /** See {@link #getImplementationSHA256Sources()} */
- public static final Attributes.Name IMPLEMENTATION_SHA256_SOURCES = new Attributes.Name("Implementation-SHA256-Sources");
- /** See {@link #getImplementationSHA256Classes()} */
- public static final Attributes.Name IMPLEMENTATION_SHA256_CLASSES = new Attributes.Name("Implementation-SHA256-Classes");
- /** See {@link #getImplementationSHA256ClassesThis()} */
- public static final Attributes.Name IMPLEMENTATION_SHA256_CLASSES_THIS = new Attributes.Name("Implementation-SHA256-Classes-this");
- /** See {@link #getImplementationSHA256Natives()} */
- public static final Attributes.Name IMPLEMENTATION_SHA256_NATIVES = new Attributes.Name("Implementation-SHA256-Natives");
- /** See {@link #getImplementationSHA256NativesThis()} */
- public static final Attributes.Name IMPLEMENTATION_SHA256_NATIVES_THIS = new Attributes.Name("Implementation-SHA256-Natives-this");
+ /** See {@link #getImplementationSHASources()} */
+ public static final Attributes.Name IMPLEMENTATION_SHA_SOURCES = new Attributes.Name("Implementation-SHA-Sources");
+ /** See {@link #getImplementationSHAClasses()} */
+ public static final Attributes.Name IMPLEMENTATION_SHA_CLASSES = new Attributes.Name("Implementation-SHA-Classes");
+ /** See {@link #getImplementationSHAClassesThis()} */
+ public static final Attributes.Name IMPLEMENTATION_SHA_CLASSES_THIS = new Attributes.Name("Implementation-SHA-Classes-this");
+ /** See {@link #getImplementationSHANatives()} */
+ public static final Attributes.Name IMPLEMENTATION_SHA_NATIVES = new Attributes.Name("Implementation-SHA-Natives");
+ /** See {@link #getImplementationSHANativesThis()} */
+ public static final Attributes.Name IMPLEMENTATION_SHA_NATIVES_THIS = new Attributes.Name("Implementation-SHA-Natives-this");
/** For FAT JogAmp jar files */
private static final String packageNameFAT = "com.jogamp";
@@ -166,38 +166,38 @@ public class JogampVersion {
}
/**
- * Returns the SHA256 of all concatenated source files of the whole project
+ * Returns the SHA of all concatenated source files of the whole project
*/
- public final String getImplementationSHA256Sources() {
- return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA256_SOURCES);
+ public final String getImplementationSHASources() {
+ return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA_SOURCES);
}
/**
- * Returns the SHA256 of all concatenated class files of all build classes
+ * Returns the SHA of all concatenated class files of all build classes
*/
- public final String getImplementationSHA256Classes() {
- return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA256_CLASSES);
+ public final String getImplementationSHAClasses() {
+ return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA_CLASSES);
}
/**
- * Returns the SHA256 of all concatenated class files of the local (jar) package subset
+ * Returns the SHA of all concatenated class files of the local (jar) package subset
*/
- public final String getImplementationSHA256ClassesThis() {
- return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA256_CLASSES_THIS);
+ public final String getImplementationSHAClassesThis() {
+ return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA_CLASSES_THIS);
}
/**
- * Returns the SHA256 of all concatenated native library files of all build libs
+ * Returns the SHA of all concatenated native library files of all build libs
*/
- public final String getImplementationSHA256Natives() {
- return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA256_NATIVES);
+ public final String getImplementationSHANatives() {
+ return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA_NATIVES);
}
/**
- * Returns the SHA256 of all concatenated native library files of the local (jar) package subset
+ * Returns the SHA of all concatenated native library files of the local (jar) package subset
*/
- public final String getImplementationSHA256NativesThis() {
- return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA256_NATIVES_THIS);
+ public final String getImplementationSHANativesThis() {
+ return this.getAttribute(JogampVersion.IMPLEMENTATION_SHA_NATIVES_THIS);
}
public final String getImplementationTitle() {
@@ -265,11 +265,11 @@ public class JogampVersion {
sb.append("Implementation Build: ").append(getImplementationBuild()).append(nl);
sb.append("Implementation Branch: ").append(getImplementationBranch()).append(nl);
sb.append("Implementation Commit: ").append(getImplementationCommit()).append(nl);
- sb.append("Implementation SHA256 Sources: ").append(getImplementationSHA256Sources()).append(nl);
- sb.append("Implementation SHA256 Classes: ").append(getImplementationSHA256Classes()).append(nl);
- sb.append("Implementation SHA256 Classes-this: ").append(getImplementationSHA256ClassesThis()).append(nl);
- sb.append("Implementation SHA256 Natives: ").append(getImplementationSHA256Natives()).append(nl);
- sb.append("Implementation SHA256 Natives-this: ").append(getImplementationSHA256NativesThis()).append(nl);
+ sb.append("Implementation SHA Sources: ").append(getImplementationSHASources()).append(nl);
+ sb.append("Implementation SHA Classes: ").append(getImplementationSHAClasses()).append(nl);
+ sb.append("Implementation SHA Classes-this: ").append(getImplementationSHAClassesThis()).append(nl);
+ sb.append("Implementation SHA Natives: ").append(getImplementationSHANatives()).append(nl);
+ sb.append("Implementation SHA Natives-this: ").append(getImplementationSHANativesThis()).append(nl);
if(null != getAndroidPackageVersionName()) {
sb.append("Android Package Version: ").append(getAndroidPackageVersionName()).append(nl);
}
diff --git a/src/java/com/jogamp/common/util/SHASum.java b/src/java/com/jogamp/common/util/SHASum.java
index 6489812..37ac830 100644
--- a/src/java/com/jogamp/common/util/SHASum.java
+++ b/src/java/com/jogamp/common/util/SHASum.java
@@ -42,7 +42,6 @@ import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
-import com.jogamp.common.GlueGenVersion;
import com.jogamp.common.util.cache.TempFileCache;
import com.jogamp.common.util.cache.TempJarCache;
@@ -55,13 +54,13 @@ import jogamp.common.Debug;
* </p>
* <p>
* This implementation is being utilized at JogAmp build time to produce various
- * SHA256 sums over sources, class files and native libraries to ensure their identity.
- * See {@link JogampVersion#getImplementationSHA256Sources()},
- * {@link JogampVersion#getImplementationSHA256Classes()}
- * and {@link JogampVersion#getImplementationSHA256Natives()}.
+ * SHA sums over sources, class files and native libraries to ensure their identity.
+ * See {@link JogampVersion#getImplementationSHASources()},
+ * {@link JogampVersion#getImplementationSHAClasses()}
+ * and {@link JogampVersion#getImplementationSHANatives()}.
* </p>
* <p>
- * {@link JogampVersion#getImplementationSHA256Sources()} for module gluegen is produced via:
+ * {@link JogampVersion#getImplementationSHASources()} for module gluegen is produced via:
* <pre>
* java -cp build/gluegen-rt.jar com.jogamp.common.util.SHASum --algorithm 256 --exclude ".*\\.log" --exclude "make/lib/toolchain" src jcpp/src make
* </pre>
@@ -250,7 +249,7 @@ public class SHASum {
* This ensures identical SHA sums over same contents within given paths.
* </p>
* <p>
- * Example to calculate the SHA-256 over our source files as performed for {@link JogampVersion#getImplementationSHA256Sources()}
+ * Example to calculate the SHA-256 over our source files as performed for {@link JogampVersion#getImplementationSHASources()}
* <pre>
* java -cp build/gluegen-rt.jar com.jogamp.common.util.SHASum --algorithm 256 --exclude ".*\\.log" --exclude "make/lib/toolchain" src jcpp/src make
* </pre>
diff --git a/src/junit/com/jogamp/common/util/TestVersionInfo.java b/src/junit/com/jogamp/common/util/TestVersionInfo.java
index de0d8d6..c92e828 100644
--- a/src/junit/com/jogamp/common/util/TestVersionInfo.java
+++ b/src/junit/com/jogamp/common/util/TestVersionInfo.java
@@ -55,18 +55,18 @@ public class TestVersionInfo extends SingletonJunitCase {
}
@Test
- public void test02ValidateSHA256()
+ public void test02ValidateSHA()
throws IllegalArgumentException, IOException, URISyntaxException, SecurityException, NoSuchAlgorithmException
{
final GlueGenVersion info = GlueGenVersion.getInstance();
- final String sha256ClassesThis = info.getImplementationSHA256ClassesThis();
- System.err.println("SHA256 CLASSES.this (build-time): "+sha256ClassesThis);
+ final String shaClassesThis = info.getImplementationSHAClassesThis();
+ System.err.println("SHA CLASSES.this (build-time): "+shaClassesThis);
final GlueGenVersion.GluGenRTJarSHASum shaSum = new GlueGenVersion.GluGenRTJarSHASum();
final byte[] shasum = shaSum.compute(VERBOSE);
- final String sha256Classes = SHASum.toHexString(shasum, null).toString();
- System.err.println("SHA256 CLASSES.this (now): "+sha256Classes);
- Assert.assertEquals("SHA256 not equal", sha256ClassesThis, sha256Classes);
+ final String shaClasses = SHASum.toHexString(shasum, null).toString();
+ System.err.println("SHA CLASSES.this (now): "+shaClasses);
+ Assert.assertEquals("SHA not equal", shaClassesThis, shaClasses);
}
public static void main(final String args[]) throws IOException {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 14:38:51 +0000