diff options
author | Sven Gothel <[email protected]> | 2013-06-21 03:45:49 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-06-21 03:45:49 +0200 |
commit | b82f1b112a57fe2f36ba505fd837e3c6fba5fefa (patch) | |
tree | dbf25a2fefaddae93eeeee9937ba25cff70bdab5 | |
parent | eb842815498f5926828b49c48fffce22fc9586a2 (diff) |
Scripts: Use a local hostname for JOGAMP_JAR_CODEBASE for security testing
-rwxr-xr-x | make/scripts/java-win32.bat | 4 | ||||
-rwxr-xr-x | make/scripts/java-win64.bat | 4 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.android-armv6-cross.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.android-armv7-cross.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv6-cross.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv6.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv6hf-cross.sh | 4 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.linux-armv6hf.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.linux-x86.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.linux-x86_64.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.macosx-java7.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.macosx.sh | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.win32.bat | 3 | ||||
-rwxr-xr-x | make/scripts/make.gluegen.all.win64.bat | 3 |
14 files changed, 29 insertions, 16 deletions
diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index 37b75ed..616c9dd 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre1.6.0_45_x32
-set JAVA_HOME=c:\jdk1.6.0_45_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.2
set BLD_DIR=..\%BLD_SUB%
diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 20f9981..17f389c 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.6.0_45_x64
-set JAVA_HOME=c:\jdk1.6.0_45_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.2
set BLD_DIR=..\%BLD_SUB%
diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh index 9186ff7..bf61091 100755 --- a/make/scripts/make.gluegen.all.android-armv6-cross.sh +++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh @@ -92,7 +92,8 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv6.xml" which gcc 2>&1 | tee make.gluegen.all.android-armv6-cross.log -export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" #BUILD_ARCHIVE=true \ ant \ diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh index e811339..f79b904 100755 --- a/make/scripts/make.gluegen.all.android-armv7-cross.sh +++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh @@ -92,7 +92,8 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv7.xml" which gcc 2>&1 | tee make.gluegen.all.android-armv7-cross.log -export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" #BUILD_ARCHIVE=true \ ant \ diff --git a/make/scripts/make.gluegen.all.linux-armv6-cross.sh b/make/scripts/make.gluegen.all.linux-armv6-cross.sh index f5f5c18..c8c8b8a 100755 --- a/make/scripts/make.gluegen.all.linux-armv6-cross.sh +++ b/make/scripts/make.gluegen.all.linux-armv6-cross.sh @@ -41,7 +41,8 @@ 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: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-linux-armv6 \ diff --git a/make/scripts/make.gluegen.all.linux-armv6.sh b/make/scripts/make.gluegen.all.linux-armv6.sh index 1399f72..0ebf550 100755 --- a/make/scripts/make.gluegen.all.linux-armv6.sh +++ b/make/scripts/make.gluegen.all.linux-armv6.sh @@ -13,7 +13,8 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml" -export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-linux-armv6 \ diff --git a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh index 5817b7f..a3f64a5 100755 --- a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh @@ -40,7 +40,9 @@ 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: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-linux-armv6hf \ diff --git a/make/scripts/make.gluegen.all.linux-armv6hf.sh b/make/scripts/make.gluegen.all.linux-armv6hf.sh index 60f6708..abf8ce1 100755 --- a/make/scripts/make.gluegen.all.linux-armv6hf.sh +++ b/make/scripts/make.gluegen.all.linux-armv6hf.sh @@ -13,7 +13,8 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml" -export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-linux-armv6hf \ diff --git a/make/scripts/make.gluegen.all.linux-x86.sh b/make/scripts/make.gluegen.all.linux-x86.sh index f0eec7c..6130e13 100755 --- a/make/scripts/make.gluegen.all.linux-x86.sh +++ b/make/scripts/make.gluegen.all.linux-x86.sh @@ -19,7 +19,8 @@ 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: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-x86 \ diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh index 2465911..8c62cd0 100755 --- a/make/scripts/make.gluegen.all.linux-x86_64.sh +++ b/make/scripts/make.gluegen.all.linux-x86_64.sh @@ -24,7 +24,8 @@ 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: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" # BUILD_ARCHIVE=true \ ant \ diff --git a/make/scripts/make.gluegen.all.macosx-java7.sh b/make/scripts/make.gluegen.all.macosx-java7.sh index 73e3d1c..3ea0cc3 100755 --- a/make/scripts/make.gluegen.all.macosx-java7.sh +++ b/make/scripts/make.gluegen.all.macosx-java7.sh @@ -14,7 +14,8 @@ JAVA_HOME=`/usr/libexec/java_home -version 1.7` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH -export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-macosx-java7 \ diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh index 56e2eba..e01f792 100755 --- a/make/scripts/make.gluegen.all.macosx.sh +++ b/make/scripts/make.gluegen.all.macosx.sh @@ -18,7 +18,8 @@ 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: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-macosx-java7_target16 \ diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat index 33d9dcb..29da9db 100755 --- a/make/scripts/make.gluegen.all.win32.bat +++ b/make/scripts/make.gluegen.all.win32.bat @@ -17,7 +17,8 @@ set SOURCE_LEVEL=1.6 set TARGET_LEVEL=1.6
set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
-set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+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.gluegen.all.win32.log 2>&1
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat index 0fc5735..d46e740 100755 --- a/make/scripts/make.gluegen.all.win64.bat +++ b/make/scripts/make.gluegen.all.win64.bat @@ -17,7 +17,8 @@ set SOURCE_LEVEL=1.6 set TARGET_LEVEL=1.6
set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
-set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+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.gluegen.all.win64.log 2>&1
|