Bug 758: Fix scripts and ant build files to work w/ Java7 (default now) producing Java6 bytecode ; Apply JAR Manifest tags: Sealed, Permissions and Codebase

11 files changed, 72 insertions, 10 deletions

diff --git a/build.xml b/build.xml
index 43b6782..b894f2a 100644
--- a/build.xml
+++ b/build.xml
@@ -56,6 +56,7 @@
                 <filter token="BUILD_VERSION" value="${jocl.version}"/>
                 <filter token="SCM_BRANCH"    value="${jocl.build.branch}"/>
                 <filter token="SCM_COMMIT"    value="${jocl.build.commit}"/>
+                <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
             </filterset>
         </copy>
     </target>
diff --git a/manifest_template.mf b/manifest_template.mf
index 9949b48..fd57c8b 100644
--- a/manifest_template.mf
+++ b/manifest_template.mf
@@ -12,3 +12,7 @@ Implementation-Vendor-Id: com.jogamp
 Specification-Vendor: JogAmp Community
 Extension-Name: com.jogamp.opencl
 Trusted-Library: true
+Permissions: all-permissions
+Name: com/jogamp/opencl/llb/impl/
+Sealed: true
+@JAR_CODEBASE_TAG@
diff --git a/scripts/make.jocl.all.android-armv6-cross.sh b/scripts/make.jocl.all.android-armv6-cross.sh
index d29a272..01c87a4 100755
--- a/scripts/make.jocl.all.android-armv6-cross.sh
+++ b/scripts/make.jocl.all.android-armv6-cross.sh
@@ -1,5 +1,9 @@
 #! /bin/sh
 
+if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
+fi
+
 export NODE_LABEL=.
 
 export HOST_UID=jogamp
@@ -85,6 +89,9 @@ export GLUEGEN_CPPTASKS_FILE=`pwd`/../gluegen/make/lib/gluegen-cpptasks-android-
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 # BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv6 \
diff --git a/scripts/make.jocl.all.linux-armv6-cross.sh b/scripts/make.jocl.all.linux-armv6-cross.sh
index f8248f8..97f3c1f 100755
--- a/scripts/make.jocl.all.linux-armv6-cross.sh
+++ b/scripts/make.jocl.all.linux-armv6-cross.sh
@@ -36,6 +36,13 @@ export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv6.x
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 ant \
     -Drootrel.build=build-linux-armv6 \
     $* 2>&1 | tee make.jocl.all.linux-armv6-cross.log
diff --git a/scripts/make.jocl.all.linux-armv6hf-cross.sh b/scripts/make.jocl.all.linux-armv6hf-cross.sh
index eba15e7..36343d2 100755
--- a/scripts/make.jocl.all.linux-armv6hf-cross.sh
+++ b/scripts/make.jocl.all.linux-armv6hf-cross.sh
@@ -36,6 +36,13 @@ export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 ant \
     -Drootrel.build=build-linux-armv6hf \
     $* 2>&1 | tee make.jocl.all.linux-armv6hf-cross.log
diff --git a/scripts/make.jocl.all.linux-x86.sh b/scripts/make.jocl.all.linux-x86.sh
index a5af57a..04494b2 100644
--- a/scripts/make.jocl.all.linux-x86.sh
+++ b/scripts/make.jocl.all.linux-x86.sh
@@ -6,6 +6,13 @@ if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
     . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh
 fi
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 ant  \
     -Drootrel.build=build-x86 \
     $* 2>&1 | tee make.jocl.all.linux-x86.log
diff --git a/scripts/make.jocl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh
index 85a916a..8e50868 100644
--- a/scripts/make.jocl.all.linux-x86_64.sh
+++ b/scripts/make.jocl.all.linux-x86_64.sh
@@ -6,15 +6,16 @@ if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
 #    -Dbuild.archiveon=true \
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 BUILD_ARCHIVE=true \
 ant  \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
     -Drootrel.build=build-x86_64 \
     $* 2>&1 | tee make.jocl.all.linux-x86_64.log
diff --git a/scripts/make.jocl.all.solaris-x86.sh b/scripts/make.jocl.all.solaris-x86.sh
index ccfa245..a59f756 100644
--- a/scripts/make.jocl.all.solaris-x86.sh
+++ b/scripts/make.jocl.all.solaris-x86.sh
@@ -6,6 +6,13 @@ if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then
     . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh
 fi
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 ant  \
     -Drootrel.build=build-solaris-x86_64 \
     $* 2>&1 | tee make.jocl.all.solaris-x86_64.log
diff --git a/scripts/make.jocl.all.solaris-x86_64.sh b/scripts/make.jocl.all.solaris-x86_64.sh
index ed81514..2a207ab 100644
--- a/scripts/make.jocl.all.solaris-x86_64.sh
+++ b/scripts/make.jocl.all.solaris-x86_64.sh
@@ -6,6 +6,13 @@ if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 ant  \
     -Drootrel.build=build-solaris-x86_64 \
     $* 2>&1 | tee make.jocl.all.solaris-x86_64.log
diff --git a/scripts/make.jocl.all.win32.bat b/scripts/make.jocl.all.win32.bat
index 619d71a..9c33470 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.6.0_20_x32

-set JAVA_HOME=c:\jdk1.6.0_20_x32

+set J2RE_HOME=c:\jre1.7.0_25_x32

+set JAVA_HOME=c:\jdk1.7.0_25_x32

 set ANT_PATH=C:\apache-ant-1.8.0

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

@@ -9,4 +9,11 @@ set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
 set LIB_GEN=%THISDIR%\lib

 set CLASSPATH=.;%THISDIR%\build-win32\classes

 

+set SOURCE_LEVEL=1.6

+set TARGET_LEVEL=1.6

+set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar

+

+REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org

+set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet

+

 ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jocl.all.win32.log 2>&1

diff --git a/scripts/make.jocl.all.win64.bat b/scripts/make.jocl.all.win64.bat
index 7fd32e9..6b1659f 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.6.0_20_x64

-set JAVA_HOME=c:\jdk1.6.0_20_x64

+set J2RE_HOME=c:\jre1.7.0_25_x64

+set JAVA_HOME=c:\jdk1.7.0_25_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%

@@ -9,4 +9,11 @@ set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
 set LIB_GEN=%THISDIR%\lib

 set CLASSPATH=.;%THISDIR%\build-win64\classes

 

+set SOURCE_LEVEL=1.6

+set TARGET_LEVEL=1.6

+set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar

+

+REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org

+set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet

+

 ant -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jocl.all.win64.log 2>&1