summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.xml1
-rwxr-xr-xscripts/check-java-major-version.sh30
-rw-r--r--scripts/make.jocl.all.win32.bat4
-rw-r--r--scripts/make.jocl.all.win64.bat4
4 files changed, 35 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index 610d4b2b..09f64253 100644
--- a/build.xml
+++ b/build.xml
@@ -341,6 +341,7 @@
<target name="tag.build">
<copy file="${jogl.root}/${rootrel.build}/artifact.properties" todir="${build.dir}" overwrite="true" failonerror="false"/>
+ <echo file="${build.dir}/artifact.properties" message="jocl.build.version=${jogamp.version}${line.separator}" append="true" />
<echo file="${build.dir}/artifact.properties" message="jocl.build.number=${jocl.build.number}${line.separator}" append="true" />
<echo file="${build.dir}/artifact.properties" message="jocl.build.id=${jocl.build.id}${line.separator}" append="true" />
<echo file="${build.dir}/artifact.properties" message="jocl.build.branch=${jocl.build.branch}${line.separator}" append="true" />
diff --git a/scripts/check-java-major-version.sh b/scripts/check-java-major-version.sh
new file mode 100755
index 00000000..e163281e
--- /dev/null
+++ b/scripts/check-java-major-version.sh
@@ -0,0 +1,30 @@
+#! /bin/bash
+
+TDIR=`pwd`
+
+function dump_version() {
+ echo -n "$1: "
+ javap -v $1 | grep 'major version'
+}
+
+function dump_versions() {
+ cd $1
+ #dump_version jogamp.common.Debug
+ for i in `find . -name '*.class'` ; do
+ dump_version `echo $i | sed -e 's/\//./g' -e 's/\.class//g'`
+ done
+ cd $TDIR
+}
+
+function do_it() {
+ dump_versions $1/classes
+ dump_versions $1/test/classes
+}
+
+do_it $1 2>&1 | tee check-java-major-version.log
+echo
+echo VERSIONS found:
+echo
+grep 'major version' check-java-major-version.log | sort -u
+
+
diff --git a/scripts/make.jocl.all.win32.bat b/scripts/make.jocl.all.win32.bat
index 9c33470b..c264ca60 100644
--- a/scripts/make.jocl.all.win32.bat
+++ b/scripts/make.jocl.all.win32.bat
@@ -1,7 +1,7 @@
set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.7.0_25_x32
-set JAVA_HOME=c:\jdk1.7.0_25_x32
+set J2RE_HOME=c:\jre1.7.0_40_x32
+set JAVA_HOME=c:\jdk1.7.0_40_x32
set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
diff --git a/scripts/make.jocl.all.win64.bat b/scripts/make.jocl.all.win64.bat
index 6b1659fe..0a9174f8 100644
--- a/scripts/make.jocl.all.win64.bat
+++ b/scripts/make.jocl.all.win64.bat
@@ -1,7 +1,7 @@
set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.7.0_25_x64
-set JAVA_HOME=c:\jdk1.7.0_25_x64
+set J2RE_HOME=c:\jre1.7.0_40_x64
+set JAVA_HOME=c:\jdk1.7.0_40_x64
set ANT_PATH=C:\apache-ant-1.8.0
set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%