From 13942637e3a664fa54e46e5a0008b3d6e3fddf1f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 15 Feb 2014 07:28:20 +0100 Subject: Fix build scripts --- make/scripts/make.jocl.all.linux-armv6-cross.sh | 10 +++++----- make/scripts/make.jocl.all.linux-armv6hf-cross.sh | 10 +++++----- make/scripts/make.jocl.all.linux-x86-clang.sh | 6 +++--- make/scripts/make.jocl.all.linux-x86.sh | 4 ++-- make/scripts/make.jocl.all.linux-x86_64-clang.sh | 8 ++++---- make/scripts/make.jocl.all.linux-x86_64.sh | 6 +++--- make/scripts/make.jocl.all.macosx-clang.sh | 2 +- make/scripts/make.jocl.all.macosx.sh | 0 make/scripts/make.jocl.all.solaris-x86.sh | 4 ++-- make/scripts/make.jocl.all.solaris-x86_64.sh | 4 ++-- make/scripts/make.jocl.all.win32.bat | 0 make/scripts/make.jocl.all.win64.bat | 0 make/scripts/tests.sh | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) mode change 100644 => 100755 make/scripts/make.jocl.all.linux-x86-clang.sh mode change 100644 => 100755 make/scripts/make.jocl.all.linux-x86.sh mode change 100644 => 100755 make/scripts/make.jocl.all.linux-x86_64-clang.sh mode change 100644 => 100755 make/scripts/make.jocl.all.linux-x86_64.sh mode change 100644 => 100755 make/scripts/make.jocl.all.macosx.sh mode change 100644 => 100755 make/scripts/make.jocl.all.solaris-x86.sh mode change 100644 => 100755 make/scripts/make.jocl.all.solaris-x86_64.sh mode change 100644 => 100755 make/scripts/make.jocl.all.win32.bat mode change 100644 => 100755 make/scripts/make.jocl.all.win64.bat mode change 100644 => 100755 make/scripts/tests.sh diff --git a/make/scripts/make.jocl.all.linux-armv6-cross.sh b/make/scripts/make.jocl.all.linux-armv6-cross.sh index 97f3c1f9..d13d51b0 100755 --- a/make/scripts/make.jocl.all.linux-armv6-cross.sh +++ b/make/scripts/make.jocl.all.linux-armv6-cross.sh @@ -1,12 +1,12 @@ #! /bin/sh -SDIR=`dirname $0` +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/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -PATH=`pwd`/../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH +PATH=`pwd`/../../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true @@ -31,7 +31,7 @@ export TARGET_ANT_HOME=/usr/share/ant export TARGET_PLATFORM_LIBS=/opt-linux-armv6-eabi/lib export TARGET_JAVA_LIBS=/opt-linux-armv6-eabi/jre/lib/arm -export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv6.xml" +export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6.xml" #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" diff --git a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh index 36343d27..fe375c12 100755 --- a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh @@ -1,12 +1,12 @@ #! /bin/sh -SDIR=`dirname $0` +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/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -PATH=`pwd`/../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH +PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true @@ -31,7 +31,7 @@ export TARGET_ANT_HOME=/usr/share/ant export TARGET_PLATFORM_LIBS=/opt-linux-armv6-armhf/lib export TARGET_JAVA_LIBS=/opt-linux-armv6-armhf/jre/lib/arm -export GLUEGEN_CPPTASKS_FILE="../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml" +export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv6hf.xml" #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" diff --git a/make/scripts/make.jocl.all.linux-x86-clang.sh b/make/scripts/make.jocl.all.linux-x86-clang.sh old mode 100644 new mode 100755 index ca9c8abc..be694d1a --- a/make/scripts/make.jocl.all.linux-x86-clang.sh +++ b/make/scripts/make.jocl.all.linux-x86-clang.sh @@ -2,15 +2,15 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then - . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh +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 GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-clang.properties" +export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" diff --git a/make/scripts/make.jocl.all.linux-x86.sh b/make/scripts/make.jocl.all.linux-x86.sh old mode 100644 new mode 100755 index 04494b21..010a6041 --- a/make/scripts/make.jocl.all.linux-x86.sh +++ b/make/scripts/make.jocl.all.linux-x86.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then - . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh +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 diff --git a/make/scripts/make.jocl.all.linux-x86_64-clang.sh b/make/scripts/make.jocl.all.linux-x86_64-clang.sh old mode 100644 new mode 100755 index 1d2a2a05..a30eb3c2 --- a/make/scripts/make.jocl.all.linux-x86_64-clang.sh +++ b/make/scripts/make.jocl.all.linux-x86_64-clang.sh @@ -1,9 +1,9 @@ #! /bin/sh -SDIR=`dirname $0` +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/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi # -Dbuild.archiveon=true \ @@ -12,7 +12,7 @@ export SOURCE_LEVEL=1.6 export TARGET_LEVEL=1.6 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar -export GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-clang.properties" +export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" diff --git a/make/scripts/make.jocl.all.linux-x86_64.sh b/make/scripts/make.jocl.all.linux-x86_64.sh old mode 100644 new mode 100755 index 8e508684..460af803 --- a/make/scripts/make.jocl.all.linux-x86_64.sh +++ b/make/scripts/make.jocl.all.linux-x86_64.sh @@ -1,9 +1,9 @@ #! /bin/sh -SDIR=`dirname $0` +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/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi # -Dbuild.archiveon=true \ diff --git a/make/scripts/make.jocl.all.macosx-clang.sh b/make/scripts/make.jocl.all.macosx-clang.sh index fc16ed15..6e5552d9 100755 --- a/make/scripts/make.jocl.all.macosx-clang.sh +++ b/make/scripts/make.jocl.all.macosx-clang.sh @@ -14,7 +14,7 @@ export SOURCE_LEVEL=1.6 export TARGET_LEVEL=1.6 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar -export GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-xcode_clang.properties" +export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-xcode_clang.properties" # or -Dgcc.compat.compiler=xcode.clang #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" diff --git a/make/scripts/make.jocl.all.macosx.sh b/make/scripts/make.jocl.all.macosx.sh old mode 100644 new mode 100755 diff --git a/make/scripts/make.jocl.all.solaris-x86.sh b/make/scripts/make.jocl.all.solaris-x86.sh old mode 100644 new mode 100755 index a59f756b..6e643cb2 --- a/make/scripts/make.jocl.all.solaris-x86.sh +++ b/make/scripts/make.jocl.all.solaris-x86.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then - . $SDIR/../../gluegen/make/scripts/setenv-build-jogl-x86.sh +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 diff --git a/make/scripts/make.jocl.all.solaris-x86_64.sh b/make/scripts/make.jocl.all.solaris-x86_64.sh old mode 100644 new mode 100755 index 2a207ab5..abca7e2a --- a/make/scripts/make.jocl.all.solaris-x86_64.sh +++ b/make/scripts/make.jocl.all.solaris-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/../../../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 diff --git a/make/scripts/make.jocl.all.win32.bat b/make/scripts/make.jocl.all.win32.bat old mode 100644 new mode 100755 diff --git a/make/scripts/make.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat old mode 100644 new mode 100755 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh old mode 100644 new mode 100755 index 6337b623..3b69eac0 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -107,7 +107,7 @@ function testawt() { # # Version # -#testnoawt com.jogamp.opencl.JoclVersion $* +testnoawt com.jogamp.opencl.JoclVersion $* # # @@ -120,7 +120,7 @@ function testawt() { #testnoawt com.jogamp.opencl.LowLevelBindingTest $* #testnoawt com.jogamp.opencl.TestJoclVersion $* #testnoawt com.jogamp.opencl.TestUtils $* -testnoawt com.jogamp.opencl.gl.CLGLTest $* +#testnoawt com.jogamp.opencl.gl.CLGLTest $* #testnoawt com.jogamp.opencl.util.concurrent.CLMultiContextTest $* -- cgit v1.2.3