From 55b5449ce106164e7f47b827cbe03a7831de9942 Mon Sep 17 00:00:00 2001 From: Sven Gothel <sgothel@jausoft.com> Date: Thu, 20 Jun 2013 20:09:13 +0200 Subject: 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 --- make/scripts/make.joal.all.android-armv6-cross.sh | 6 ++++++ make/scripts/make.joal.all.linux-armv6-cross.sh | 10 ++++++++-- make/scripts/make.joal.all.linux-armv6.sh | 9 ++++++--- make/scripts/make.joal.all.linux-armv6hf-cross.sh | 12 ++++++++---- make/scripts/make.joal.all.linux-armv6hf.sh | 13 ++++++++----- make/scripts/make.joal.all.linux-x86.sh | 8 +++++--- make/scripts/make.joal.all.linux-x86_64.sh | 16 +++++++--------- make/scripts/make.joal.all.macosx.sh | 9 +++++++++ make/scripts/make.joal.all.solaris-x86_64.sh | 6 ++++++ make/scripts/make.joal.all.win32.bat | 11 +++++++++-- make/scripts/make.joal.all.win64.bat | 10 ++++++++-- 11 files changed, 80 insertions(+), 30 deletions(-) (limited to 'make/scripts') diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh index f8f63db..d327f15 100755 --- a/make/scripts/make.joal.all.android-armv6-cross.sh +++ b/make/scripts/make.joal.all.android-armv6-cross.sh @@ -1,5 +1,9 @@ #! /bin/sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh +fi + export NODE_LABEL=. export HOST_UID=jogamp @@ -87,6 +91,8 @@ export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-andro #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" +export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" + # BUILD_ARCHIVE=true \ ant \ -Drootrel.build=build-android-armv6 \ diff --git a/make/scripts/make.joal.all.linux-armv6-cross.sh b/make/scripts/make.joal.all.linux-armv6-cross.sh index 2b1a057..d954c76 100755 --- a/make/scripts/make.joal.all.linux-armv6-cross.sh +++ b/make/scripts/make.joal.all.linux-armv6-cross.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi PATH=`pwd`/../../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH @@ -36,6 +36,12 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv #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" + ant \ -Drootrel.build=build-linux-armv6 \ $* 2>&1 | tee make.joal.all.linux-armv6-cross.log diff --git a/make/scripts/make.joal.all.linux-armv6.sh b/make/scripts/make.joal.all.linux-armv6.sh index 71ae116..2f778c5 100755 --- a/make/scripts/make.joal.all.linux-armv6.sh +++ b/make/scripts/make.joal.all.linux-armv6.sh @@ -23,9 +23,12 @@ fi # -Dtarget.targetlevel=1.6 \ # -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ +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" + ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-linux-armv6 \ $* 2>&1 | tee make.joal.all.linux-armv6.log diff --git a/make/scripts/make.joal.all.linux-armv6hf-cross.sh b/make/scripts/make.joal.all.linux-armv6hf-cross.sh index 0a6770a..bed24f0 100755 --- a/make/scripts/make.joal.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.joal.all.linux-armv6hf-cross.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH @@ -36,10 +36,14 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv #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" + ant \ -Drootrel.build=build-linux-armv6hf \ $* 2>&1 | tee make.joal.all.linux-armv6hf-cross.log - - diff --git a/make/scripts/make.joal.all.linux-armv6hf.sh b/make/scripts/make.joal.all.linux-armv6hf.sh index 24ae228..9a5b964 100755 --- a/make/scripts/make.joal.all.linux-armv6hf.sh +++ b/make/scripts/make.joal.all.linux-armv6hf.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-armv6hf.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-armv6hf.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi if [ -z "$ANT_PATH" ] ; then @@ -23,9 +23,12 @@ fi # -Dtarget.targetlevel=1.6 \ # -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ +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" + ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-linux-armv6hf \ $* 2>&1 | tee make.joal.all.linux-armv6hf.log diff --git a/make/scripts/make.joal.all.linux-x86.sh b/make/scripts/make.joal.all.linux-x86.sh index 579b7f0..19ec2d9 100755 --- a/make/scripts/make.joal.all.linux-x86.sh +++ b/make/scripts/make.joal.all.linux-x86.sh @@ -18,9 +18,11 @@ if [ -z "$ANT_PATH" ] ; then exit fi -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ +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" ant \ -Drootrel.build=build-x86 \ diff --git a/make/scripts/make.joal.all.linux-x86_64.sh b/make/scripts/make.joal.all.linux-x86_64.sh index 553f757..3837e87 100755 --- a/make/scripts/make.joal.all.linux-x86_64.sh +++ b/make/scripts/make.joal.all.linux-x86_64.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi if [ -z "$ANT_PATH" ] ; then @@ -18,14 +18,12 @@ if [ -z "$ANT_PATH" ] ; then exit fi -# -Drootrel.build=build-x86_64 \ -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ +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" 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.joal.all.linux-x86_64.log diff --git a/make/scripts/make.joal.all.macosx.sh b/make/scripts/make.joal.all.macosx.sh index 50eaf85..9ca81be 100755 --- a/make/scripts/make.joal.all.macosx.sh +++ b/make/scripts/make.joal.all.macosx.sh @@ -4,9 +4,18 @@ if [ -e /opt-share/etc/profile.ant ] ; then . /opt-share/etc/profile.ant fi +JAVA_HOME=`/usr/libexec/java_home -version 1.7` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH # -Dc.compiler.debug=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" + ant \ -Drootrel.build=build-macosx \ $* 2>&1 | tee make.joal.all.macosx.log diff --git a/make/scripts/make.joal.all.solaris-x86_64.sh b/make/scripts/make.joal.all.solaris-x86_64.sh index 46490e3..6a7774d 100755 --- a/make/scripts/make.joal.all.solaris-x86_64.sh +++ b/make/scripts/make.joal.all.solaris-x86_64.sh @@ -20,6 +20,12 @@ fi # -Drootrel.build=build-x86_64 \ +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" + ant \ -Drootrel.build=build-solaris-x86_64 \ $* 2>&1 | tee make.joal.all.solaris-x86_64.log diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat index 48a5110..715bfd4 100755 --- a/make/scripts/make.joal.all.win32.bat +++ b/make/scripts/make.joal.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL" -set J2RE_HOME=c:\jre1.6.0_35_x32 -set JAVA_HOME=c:\jdk1.6.0_35_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 CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86 @@ -11,4 +11,11 @@ set LIB_GEN=%THISDIR%\lib set CLASSPATH=.;%THISDIR%\build-win32\classes REM -Dc.compiler.debug=true +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar + +export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" + + ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win32.log 2>&1 diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat index 4caaad7..1056b69 100755 --- a/make/scripts/make.joal.all.win64.bat +++ b/make/scripts/make.joal.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL" -set J2RE_HOME=c:\jre1.6.0_35_x64 -set JAVA_HOME=c:\jdk1.6.0_35_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 CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86 set CMAKE_C_COMPILER=c:\mingw64\bin\gcc @@ -12,4 +12,10 @@ set LIB_GEN=%THISDIR%\lib set CLASSPATH=.;%THISDIR%\build-win64\classes REM -Dc.compiler.debug=true +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar + +export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" + ant -Dc.compiler.debug=true -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win64.log 2>&1 -- cgit v1.2.3