diff options
| author | Sven Gothel <[email protected]> | 2013-06-20 20:09:13 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-06-20 20:09:13 +0200 |
| commit | 55b5449ce106164e7f47b827cbe03a7831de9942 (patch) | |
| tree | 35784810b46762dd5f416d230b4780f8d26db007 /make/scripts/make.joal.all.linux-x86_64.sh | |
| parent | 7c8d351fdbc562aebc2c7796c5b8e8673bff3dca (diff) | |
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
Diffstat (limited to 'make/scripts/make.joal.all.linux-x86_64.sh')
| -rwxr-xr-x | make/scripts/make.joal.all.linux-x86_64.sh | 16 |
1 files changed, 7 insertions, 9 deletions
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 |