From 5c5f3b4785835b8abf53474b0c9dc248d1b8dab6 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 25 Jan 2014 15:13:06 +0100 Subject: Bug 884: Move obsolete NB based build files to 'obsolete.make-nb' ; Fix text file suffix ; Fix Jar Manifest: Move Sealed to bottom. --- LICENSE | 63 -- LICENSE.txt | 63 ++ Makefile | 29 - README | 23 - README.txt | 23 + build.xml | 719 ------------------ crosscompiler.xml | 101 --- make/joclversion | 4 +- make/scripts/check-java-major-version.sh | 30 + make/scripts/install-ati-stream.sh | 29 + make/scripts/make.jocl.all.android-armv6-cross.sh | 99 +++ make/scripts/make.jocl.all.linux-armv6-cross.sh | 52 ++ make/scripts/make.jocl.all.linux-armv6hf-cross.sh | 52 ++ make/scripts/make.jocl.all.linux-x86-clang.sh | 21 + make/scripts/make.jocl.all.linux-x86.sh | 18 + make/scripts/make.jocl.all.linux-x86_64-clang.sh | 24 + make/scripts/make.jocl.all.linux-x86_64.sh | 21 + make/scripts/make.jocl.all.macosx-clang.sh | 25 + make/scripts/make.jocl.all.macosx.sh | 27 + make/scripts/make.jocl.all.sh | 9 + make/scripts/make.jocl.all.solaris-x86.sh | 18 + make/scripts/make.jocl.all.solaris-x86_64.sh | 18 + make/scripts/make.jocl.all.win32.bat | 19 + make/scripts/make.jocl.all.win64.bat | 19 + manifest_template.mf | 21 - nbproject/.gitignore | 1 - nbproject/build-impl.xml | 842 ---------------------- nbproject/genfiles.properties | 8 - nbproject/project.properties | 122 ---- nbproject/project.xml | 23 - obsolete.make-nb/Makefile | 29 + obsolete.make-nb/build.xml | 719 ++++++++++++++++++ obsolete.make-nb/crosscompiler.xml | 101 +++ obsolete.make-nb/manifest_template.mf | 21 + obsolete.make-nb/nbproject/.gitignore | 1 + obsolete.make-nb/nbproject/build-impl.xml | 842 ++++++++++++++++++++++ obsolete.make-nb/nbproject/genfiles.properties | 8 + obsolete.make-nb/nbproject/project.properties | 122 ++++ obsolete.make-nb/nbproject/project.xml | 23 + scripts/check-java-major-version.sh | 30 - scripts/install-ati-stream.sh | 29 - scripts/make.jocl.all.android-armv6-cross.sh | 99 --- scripts/make.jocl.all.linux-armv6-cross.sh | 52 -- scripts/make.jocl.all.linux-armv6hf-cross.sh | 52 -- scripts/make.jocl.all.linux-x86-clang.sh | 21 - scripts/make.jocl.all.linux-x86.sh | 18 - scripts/make.jocl.all.linux-x86_64-clang.sh | 24 - scripts/make.jocl.all.linux-x86_64.sh | 21 - scripts/make.jocl.all.macosx-clang.sh | 25 - scripts/make.jocl.all.macosx.sh | 27 - scripts/make.jocl.all.sh | 9 - scripts/make.jocl.all.solaris-x86.sh | 18 - scripts/make.jocl.all.solaris-x86_64.sh | 18 - scripts/make.jocl.all.win32.bat | 19 - scripts/make.jocl.all.win64.bat | 19 - 55 files changed, 2436 insertions(+), 2434 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.txt delete mode 100644 Makefile delete mode 100644 README create mode 100644 README.txt delete mode 100644 build.xml delete mode 100644 crosscompiler.xml create mode 100755 make/scripts/check-java-major-version.sh create mode 100644 make/scripts/install-ati-stream.sh create mode 100755 make/scripts/make.jocl.all.android-armv6-cross.sh create mode 100755 make/scripts/make.jocl.all.linux-armv6-cross.sh create mode 100755 make/scripts/make.jocl.all.linux-armv6hf-cross.sh create mode 100644 make/scripts/make.jocl.all.linux-x86-clang.sh create mode 100644 make/scripts/make.jocl.all.linux-x86.sh create mode 100644 make/scripts/make.jocl.all.linux-x86_64-clang.sh create mode 100644 make/scripts/make.jocl.all.linux-x86_64.sh create mode 100755 make/scripts/make.jocl.all.macosx-clang.sh create mode 100644 make/scripts/make.jocl.all.macosx.sh create mode 100755 make/scripts/make.jocl.all.sh create mode 100644 make/scripts/make.jocl.all.solaris-x86.sh create mode 100644 make/scripts/make.jocl.all.solaris-x86_64.sh create mode 100644 make/scripts/make.jocl.all.win32.bat create mode 100644 make/scripts/make.jocl.all.win64.bat delete mode 100644 manifest_template.mf delete mode 100644 nbproject/.gitignore delete mode 100644 nbproject/build-impl.xml delete mode 100644 nbproject/genfiles.properties delete mode 100644 nbproject/project.properties delete mode 100644 nbproject/project.xml create mode 100644 obsolete.make-nb/Makefile create mode 100644 obsolete.make-nb/build.xml create mode 100644 obsolete.make-nb/crosscompiler.xml create mode 100644 obsolete.make-nb/manifest_template.mf create mode 100644 obsolete.make-nb/nbproject/.gitignore create mode 100644 obsolete.make-nb/nbproject/build-impl.xml create mode 100644 obsolete.make-nb/nbproject/genfiles.properties create mode 100644 obsolete.make-nb/nbproject/project.properties create mode 100644 obsolete.make-nb/nbproject/project.xml delete mode 100755 scripts/check-java-major-version.sh delete mode 100644 scripts/install-ati-stream.sh delete mode 100755 scripts/make.jocl.all.android-armv6-cross.sh delete mode 100755 scripts/make.jocl.all.linux-armv6-cross.sh delete mode 100755 scripts/make.jocl.all.linux-armv6hf-cross.sh delete mode 100644 scripts/make.jocl.all.linux-x86-clang.sh delete mode 100644 scripts/make.jocl.all.linux-x86.sh delete mode 100644 scripts/make.jocl.all.linux-x86_64-clang.sh delete mode 100644 scripts/make.jocl.all.linux-x86_64.sh delete mode 100755 scripts/make.jocl.all.macosx-clang.sh delete mode 100644 scripts/make.jocl.all.macosx.sh delete mode 100755 scripts/make.jocl.all.sh delete mode 100644 scripts/make.jocl.all.solaris-x86.sh delete mode 100644 scripts/make.jocl.all.solaris-x86_64.sh delete mode 100644 scripts/make.jocl.all.win32.bat delete mode 100644 scripts/make.jocl.all.win64.bat diff --git a/LICENSE b/LICENSE deleted file mode 100644 index b32d6b2..0000000 --- a/LICENSE +++ /dev/null @@ -1,63 +0,0 @@ - -JOCL is licensed under the simplified BSD license. - - Copyright 2009 - 2010 JogAmp Community. All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, are - permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, this list of - conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, this list - of conditions and the following disclaimer in the documentation and/or other materials - provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - The views and conclusions contained in the software and documentation are those of the - authors and should not be interpreted as representing official policies, either expressed - or implied, of JogAmp Community. - - You can address the JogAmp Community via: - Web http://jogamp.org/ - Forum/Mailinglist http://jogamp.762907.n3.nabble.com/ - Chatrooms - IRC irc.freenode.net #jogamp - Jabber conference.jabber.org room: jogamp (deprecated!) - Repository http://github.com/JogAmp/jocl - Email mediastream _at_ jogamp _dot_ org - - - JOCL uses header files from Khronos, reflecting OpenCL and OpenGL, for code generation with GlueGen. - - http://www.khronos.org/legal/license/ - - Copyright (c) 2007-2010 The Khronos Group Inc. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and/or associated documentation files (the - "Materials"), to deal in the Materials without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Materials, and to - permit persons to whom the Materials are furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Materials. - - THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..b32d6b2 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,63 @@ + +JOCL is licensed under the simplified BSD license. + + Copyright 2009 - 2010 JogAmp Community. All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list + of conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + The views and conclusions contained in the software and documentation are those of the + authors and should not be interpreted as representing official policies, either expressed + or implied, of JogAmp Community. + + You can address the JogAmp Community via: + Web http://jogamp.org/ + Forum/Mailinglist http://jogamp.762907.n3.nabble.com/ + Chatrooms + IRC irc.freenode.net #jogamp + Jabber conference.jabber.org room: jogamp (deprecated!) + Repository http://github.com/JogAmp/jocl + Email mediastream _at_ jogamp _dot_ org + + + JOCL uses header files from Khronos, reflecting OpenCL and OpenGL, for code generation with GlueGen. + + http://www.khronos.org/legal/license/ + + Copyright (c) 2007-2010 The Khronos Group Inc. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/Makefile b/Makefile deleted file mode 100644 index 45bc54f..0000000 --- a/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -BITS=32 - -ifeq ($(BITS),32) - CC=gcc32 - NS=win-x86 -else - BITS=64 - CC=gcc64 - NS=win-x64 -endif - -CFLAGS=-m$(BITS) -shared -c -fno-rtti -fPIC -I/usr/lib/jvm/java-6-sun/include -I../common/platform-libs/jre-include/win32 -Iresources/includes -LFLAGS=-m$(BITS) -shared -fno-rtti -fPIC -L../common/platform-libs/OpenCL/win/_x64 -lOpenCL - -SRC=gensrc/native/CLImpl_JNI.c -OBJ=build/obj/jocl/$(NS)/CLImpl_JNI.o -BIN=build/natives/jocl/$(NS)/jocl.dll - -all: $(BIN) - -$(BIN): $(OBJ) - $(CC) $(LFLAGS) $(OBJ) -o $(BIN) - -$(OBJ): $(SRC) - $(CC) $(CFLAGS) $(SRC) -o $(OBJ) - -clean: - rm -f $(BIN) $(OBJ) - diff --git a/README b/README deleted file mode 100644 index 77c5389..0000000 --- a/README +++ /dev/null @@ -1,23 +0,0 @@ - ___ ___ ___ - / /\ / /\ ___ / /\ http://jocl.jogamp.org/ - / /:/ / /::\ /__/\ / /::\ a http://jogamp.org/ project. -/__/::\ / /:/\:\ \ \:\ / /:/\:\ -\__\/\:\ / /:/~/::\ \ \:\ / /:/~/::\ - \ \:\ /__/:/ /:/\:\ ___ \__\:\/__/:/ /:/\:\ - \__\:\\ \:\/:/__\//__/\ | |:|\ \:\/:/__\/ - / /:/ \ \::/ \ \:\| |:| \ \::/ - /__/:/ \ \:\ \ \:\__|:| \ \:\ - \__\/ \ \:\ \__\::::/ \ \:\ - \__\/ ~~~~ \__\/ - ___ ___ ___ ___ ___ - / /\ / /\ / /\ /__/\ / /\ - / /::\ / /::\ / /:/_ \ \:\ / /:/ - / /:/\:\ / /:/\:\ / /:/ /\ \ \:\ / /:/ ___ ___ - / /:/ \:\ / /:/~/:// /:/ /:/_ _____\__\:\ / /:/ ___ /__/\ / /\ - /__/:/ \__\:\/__/:/ /://__/:/ /:/ /\/__/::::::::\/__/:/ / /\\ \:\ / /:/ - \ \:\ / /:/\ \:\/:/ \ \:\/:/ /:/\ \:\~~\~~\/\ \:\ / /:/ \ \:\ /:/ - \ \:\ /:/ \ \::/ \ \::/ /:/ \ \:\ ~~~ \ \:\ /:/ \ \:\/:/ - \ \:\/:/ \ \:\ \ \:\/:/ \ \:\ \ \:\/:/ \ \::/ - \ \::/ \ \:\ \ \::/ \ \:\ \ \::/ \__\/ - \__\/ \__\/ \__\/ \__\/ \__\/ - diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..77c5389 --- /dev/null +++ b/README.txt @@ -0,0 +1,23 @@ + ___ ___ ___ + / /\ / /\ ___ / /\ http://jocl.jogamp.org/ + / /:/ / /::\ /__/\ / /::\ a http://jogamp.org/ project. +/__/::\ / /:/\:\ \ \:\ / /:/\:\ +\__\/\:\ / /:/~/::\ \ \:\ / /:/~/::\ + \ \:\ /__/:/ /:/\:\ ___ \__\:\/__/:/ /:/\:\ + \__\:\\ \:\/:/__\//__/\ | |:|\ \:\/:/__\/ + / /:/ \ \::/ \ \:\| |:| \ \::/ + /__/:/ \ \:\ \ \:\__|:| \ \:\ + \__\/ \ \:\ \__\::::/ \ \:\ + \__\/ ~~~~ \__\/ + ___ ___ ___ ___ ___ + / /\ / /\ / /\ /__/\ / /\ + / /::\ / /::\ / /:/_ \ \:\ / /:/ + / /:/\:\ / /:/\:\ / /:/ /\ \ \:\ / /:/ ___ ___ + / /:/ \:\ / /:/~/:// /:/ /:/_ _____\__\:\ / /:/ ___ /__/\ / /\ + /__/:/ \__\:\/__/:/ /://__/:/ /:/ /\/__/::::::::\/__/:/ / /\\ \:\ / /:/ + \ \:\ / /:/\ \:\/:/ \ \:\/:/ /:/\ \:\~~\~~\/\ \:\ / /:/ \ \:\ /:/ + \ \:\ /:/ \ \::/ \ \::/ /:/ \ \:\ ~~~ \ \:\ /:/ \ \:\/:/ + \ \:\/:/ \ \:\ \ \:\/:/ \ \:\ \ \:\/:/ \ \::/ + \ \::/ \ \:\ \ \::/ \ \:\ \ \::/ \__\/ + \__\/ \__\/ \__\/ \__\/ \__\/ + diff --git a/build.xml b/build.xml deleted file mode 100644 index 6a68b08..0000000 --- a/build.xml +++ /dev/null @@ -1,719 +0,0 @@ - - - - - - Builds, tests, and runs the project JOCL. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - - diff --git a/crosscompiler.xml b/crosscompiler.xml deleted file mode 100644 index 36eec26..0000000 --- a/crosscompiler.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/make/joclversion b/make/joclversion index ae7239d..1f66836 100644 --- a/make/joclversion +++ b/make/joclversion @@ -14,6 +14,8 @@ Extension-Name: com.jogamp.opencl Implementation-Vendor-Id: com.jogamp Trusted-Library: true Permissions: all-permissions +@JAR_CODEBASE_TAG@ + Name: jogamp/opencl/ Sealed: true -@JAR_CODEBASE_TAG@ + diff --git a/make/scripts/check-java-major-version.sh b/make/scripts/check-java-major-version.sh new file mode 100755 index 0000000..e163281 --- /dev/null +++ b/make/scripts/check-java-major-version.sh @@ -0,0 +1,30 @@ +#! /bin/bash + +TDIR=`pwd` + +function dump_version() { + echo -n "$1: " + javap -v $1 | grep 'major version' +} + +function dump_versions() { + cd $1 + #dump_version jogamp.common.Debug + for i in `find . -name '*.class'` ; do + dump_version `echo $i | sed -e 's/\//./g' -e 's/\.class//g'` + done + cd $TDIR +} + +function do_it() { + dump_versions $1/classes + dump_versions $1/test/classes +} + +do_it $1 2>&1 | tee check-java-major-version.log +echo +echo VERSIONS found: +echo +grep 'major version' check-java-major-version.log | sort -u + + diff --git a/make/scripts/install-ati-stream.sh b/make/scripts/install-ati-stream.sh new file mode 100644 index 0000000..94d3eca --- /dev/null +++ b/make/scripts/install-ati-stream.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# +# Here we have unpacked ati-stream-sdk-v2.1-lnx64.tgz from http://developer.amd.com/gpu/ATIStreamSDK/ +# to /opt-linux-x86_64/ and made a symbolic link to ati-stream-sdk. +# +# We also copied the file http://developer.amd.com/Downloads/icd-registration.tgz +# into ati-stream-sdk. + +SDK=/opt-linux-x86_64/ati-stream-sdk/ +ICDREG=/opt-linux-x86_64/ati-stream-sdk/icd-registration.tgz + +link(){ + if [ -e $2 ] ; then + rm -v $2 + fi + ln -v -s ${SDK}$1/$2 +} + +cd /usr/lib64/ +link lib/x86_64 libOpenCL.so +link lib/x86_64 libatiocl64.so + +cd /usr/lib32/ +link lib/x86 libOpenCL.so +link lib/x86 libatiocl32.so + +cd / +tar xzf $ICDREG diff --git a/make/scripts/make.jocl.all.android-armv6-cross.sh b/make/scripts/make.jocl.all.android-armv6-cross.sh new file mode 100755 index 0000000..01c87a4 --- /dev/null +++ b/make/scripts/make.jocl.all.android-armv6-cross.sh @@ -0,0 +1,99 @@ +#! /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 +# jogamp02 - 10.1.0.122 +export HOST_IP=10.1.0.122 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab03 +#export TARGET_IP=jauphone04 +export TARGET_ADB_PORT=5555 +# needs executable bit (probably su) +export TARGET_ROOT=/data/projects +export TARGET_ANT_HOME=/usr/share/ant + +echo ANDROID_HOME $ANDROID_HOME +echo NDK_ROOT $NDK_ROOT + +if [ -z "$NDK_ROOT" ] ; then + # + # Generic android-ndk + # + if [ -e /usr/local/android-ndk ] ; then + NDK_ROOT=/usr/local/android-ndk + elif [ -e /opt-linux-x86/android-ndk ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk + elif [ -e /opt/android-ndk ] ; then + NDK_ROOT=/opt/android-ndk + # + # Specific android-ndk-r7b + # + elif [ -e /usr/local/android-ndk-r7b ] ; then + NDK_ROOT=/usr/local/android-ndk-r7b + elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then + NDK_ROOT=/opt-linux-x86/android-ndk-r7b + elif [ -e /opt/android-ndk-r7b ] ; then + NDK_ROOT=/opt/android-ndk-r7b + else + echo NDK_ROOT is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $NDK_ROOT ] ; then + echo NDK_ROOT $NDK_ROOT does not exist + exit 1 +fi +export NDK_ROOT + +if [ -z "$ANDROID_HOME" ] ; then + if [ -e /usr/local/android-sdk-linux_x86 ] ; then + ANDROID_HOME=/usr/local/android-sdk-linux_x86 + elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then + ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86 + elif [ -e /opt/android-sdk-linux_x86 ] ; then + ANDROID_HOME=/opt/android-sdk-linux_x86 + else + echo ANDROID_HOME is not specified and does not exist in default locations + exit 1 + fi +elif [ ! -e $ANDROID_HOME ] ; then + echo ANDROID_HOME $ANDROID_HOME does not exist + exit 1 +fi +export ANDROID_HOME + +export ANDROID_VERSION=9 +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +export GCC_VERSION=4.4.3 +HOST_ARCH=linux-x86 +export TARGET_TRIPLE=arm-linux-androideabi + +export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH} +export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm + +# Need to add toolchain bins to the PATH. +export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/17.0.0:$PATH" + +export GLUEGEN_CPPTASKS_FILE=`pwd`/../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml + +#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 \ + $* 2>&1 | tee -a make.jocl.all.android-armv6-cross.log + diff --git a/make/scripts/make.jocl.all.linux-armv6-cross.sh b/make/scripts/make.jocl.all.linux-armv6-cross.sh new file mode 100755 index 0000000..97f3c1f --- /dev/null +++ b/make/scripts/make.jocl.all.linux-armv6-cross.sh @@ -0,0 +1,52 @@ +#! /bin/sh + +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 +fi + +PATH=`pwd`/../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH +export PATH + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxARMv7=true \ +# -DisX11=false \ + +export NODE_LABEL=. + +export HOST_UID=jogamp +export HOST_IP=jogamp02 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab02 +export TARGET_ROOT=/home/jogamp/projects-cross +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 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/make/scripts/make.jocl.all.linux-armv6hf-cross.sh b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh new file mode 100755 index 0000000..36343d2 --- /dev/null +++ b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh @@ -0,0 +1,52 @@ +#! /bin/sh + +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 +fi + +PATH=`pwd`/../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH +export PATH + +# -Dc.compiler.debug=true +# -Dgluegen.cpptasks.detected.os=true \ +# -DisUnix=true \ +# -DisLinux=true \ +# -DisLinuxARMv7=true \ +# -DisX11=false \ + +export NODE_LABEL=. + +export HOST_UID=jogamp +export HOST_IP=jogamp02 +export HOST_RSYNC_ROOT=PROJECTS/JOGL + +export TARGET_UID=jogamp +export TARGET_IP=panda02 +#export TARGET_IP=jautab02 +export TARGET_ROOT=/home/jogamp/projects-cross +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 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/make/scripts/make.jocl.all.linux-x86-clang.sh b/make/scripts/make.jocl.all.linux-x86-clang.sh new file mode 100644 index 0000000..ca9c8ab --- /dev/null +++ b/make/scripts/make.jocl.all.linux-x86-clang.sh @@ -0,0 +1,21 @@ +#! /bin/sh + +SDIR=`dirname $0` + +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" +# or -Dgcc.compat.compiler=clang + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + +ant \ + -Drootrel.build=build-x86-clang \ + $* 2>&1 | tee make.jocl.all.linux-x86-clang.log diff --git a/make/scripts/make.jocl.all.linux-x86.sh b/make/scripts/make.jocl.all.linux-x86.sh new file mode 100644 index 0000000..04494b2 --- /dev/null +++ b/make/scripts/make.jocl.all.linux-x86.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +SDIR=`dirname $0` + +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/make/scripts/make.jocl.all.linux-x86_64-clang.sh b/make/scripts/make.jocl.all.linux-x86_64-clang.sh new file mode 100644 index 0000000..1d2a2a0 --- /dev/null +++ b/make/scripts/make.jocl.all.linux-x86_64-clang.sh @@ -0,0 +1,24 @@ +#! /bin/sh + +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 +fi + +# -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 GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-clang.properties" +# or -Dgcc.compat.compiler=clang + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + +BUILD_ARCHIVE=true \ +ant \ + -Drootrel.build=build-x86_64-clang \ + $* 2>&1 | tee make.jocl.all.linux-x86_64-clang.log diff --git a/make/scripts/make.jocl.all.linux-x86_64.sh b/make/scripts/make.jocl.all.linux-x86_64.sh new file mode 100644 index 0000000..8e50868 --- /dev/null +++ b/make/scripts/make.jocl.all.linux-x86_64.sh @@ -0,0 +1,21 @@ +#! /bin/sh + +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 +fi + +# -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 \ + -Drootrel.build=build-x86_64 \ + $* 2>&1 | tee make.jocl.all.linux-x86_64.log diff --git a/make/scripts/make.jocl.all.macosx-clang.sh b/make/scripts/make.jocl.all.macosx-clang.sh new file mode 100755 index 0000000..fc16ed1 --- /dev/null +++ b/make/scripts/make.jocl.all.macosx-clang.sh @@ -0,0 +1,25 @@ +#! /bin/sh + +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 GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-xcode_clang.properties" +# or -Dgcc.compat.compiler=xcode.clang + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + +ant \ + -Drootrel.build=build-macosx \ + $* 2>&1 | tee make.joal.all.macosx.log diff --git a/make/scripts/make.jocl.all.macosx.sh b/make/scripts/make.jocl.all.macosx.sh new file mode 100644 index 0000000..20f65b9 --- /dev/null +++ b/make/scripts/make.jocl.all.macosx.sh @@ -0,0 +1,27 @@ +#! /bin/sh + +SDIR=`dirname $0` + +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 GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties" +# or -Dgcc.compat.compiler=clang + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + +ant \ + -Drootrel.build=build-macosx \ + $* 2>&1 | tee make.jocl.all.macosx.log diff --git a/make/scripts/make.jocl.all.sh b/make/scripts/make.jocl.all.sh new file mode 100755 index 0000000..a137cea --- /dev/null +++ b/make/scripts/make.jocl.all.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +SDIR=`dirname $0` + +$SDIR/make.jocl.all.linux-armv6-cross.sh \ +&& $SDIR/make.jocl.all.linux-armv6hf-cross.sh \ +&& $SDIR/make.jocl.all.linux-x86_64.sh \ +&& $SDIR/make.jocl.all.linux-x86.sh \ +&& $SDIR/make.jocl.all.android-armv6-cross.sh \ diff --git a/make/scripts/make.jocl.all.solaris-x86.sh b/make/scripts/make.jocl.all.solaris-x86.sh new file mode 100644 index 0000000..a59f756 --- /dev/null +++ b/make/scripts/make.jocl.all.solaris-x86.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +SDIR=`dirname $0` + +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/make/scripts/make.jocl.all.solaris-x86_64.sh b/make/scripts/make.jocl.all.solaris-x86_64.sh new file mode 100644 index 0000000..2a207ab --- /dev/null +++ b/make/scripts/make.jocl.all.solaris-x86_64.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +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 +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/make/scripts/make.jocl.all.win32.bat b/make/scripts/make.jocl.all.win32.bat new file mode 100644 index 0000000..bb4418b --- /dev/null +++ b/make/scripts/make.jocl.all.win32.bat @@ -0,0 +1,19 @@ +set THISDIR="C:\JOGL" + +set J2RE_HOME=c:\jre1.7.0_45_x32 +set JAVA_HOME=c:\jdk1.7.0_45_x32 +set ANT_PATH=C:\apache-ant-1.8.0 + +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/make/scripts/make.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat new file mode 100644 index 0000000..a174e71 --- /dev/null +++ b/make/scripts/make.jocl.all.win64.bat @@ -0,0 +1,19 @@ +set THISDIR="C:\JOGL" + +set J2RE_HOME=c:\jre1.7.0_45_x64 +set JAVA_HOME=c:\jdk1.7.0_45_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% + +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 diff --git a/manifest_template.mf b/manifest_template.mf deleted file mode 100644 index 93fed68..0000000 --- a/manifest_template.mf +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Application-Name: Java Bindings for OpenCL -Implementation-Title: Java Bindings for OpenCL -Specification-Title: Java Bindings for OpenCL -Implementation-URL: http://jocl.jogamp.org/ -Implementation-Version: @VERSION@ -Implementation-Build: @BUILD_VERSION@ -Specification-Version: @SPEC_VERSION@ -Implementation-Branch: @SCM_BRANCH@ -Implementation-Commit: @SCM_COMMIT@ -Implementation-Vendor: JogAmp Community -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 -Application-Library-Allowable-Codebase: * -@JAR_CODEBASE_TAG@ - diff --git a/nbproject/.gitignore b/nbproject/.gitignore deleted file mode 100644 index 3e18ebf..0000000 --- a/nbproject/.gitignore +++ /dev/null @@ -1 +0,0 @@ -private diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index 5b21395..0000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,842 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set src.java.dir - Must set src.native.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index 5fa8127..0000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=29d6eb43 -build.xml.script.CRC32=eb8aa8d2 -build.xml.stylesheet.CRC32=958a1d3e@1.24.0.45 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=174e0dcd -nbproject/build-impl.xml.script.CRC32=eeff7626 -nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45 diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 1a6ce8a..0000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,122 +0,0 @@ -#default values, overwrite this or pass it as -D ant property if required -gluegen.root=../gluegen -jogl.root=../jogl -rootrel.build=build - -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.run.all.processors=true -javac.processorpath=\ - ${javac.classpath} -application.title=JOCL -application.vendor=JogAmp Community -build.classes.excludes=**/*.java,**/*.jtemplate,**/*.form,**/*.c,**/*.html -# This directory is removed when the project is cleaned: -build.dir=${rootrel.build} -build.classes.dir=${build.dir}/classes -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=${build.dir} -dist.jar=${dist.dir}/jar/jocl.jar -dist.javadoc.dir=${build.dir}/javadoc/jocl/javadoc -endorsed.classpath= -excludes= - -file.reference.junit-4.8.1.jar=lib/junit_4/junit-4.8.1.jar -file.reference.gluegen-rt.jar=${gluegen.root}/${rootrel.build}/gluegen-rt.jar -file.reference.gluegen.jar=${gluegen.root}/${rootrel.build}/gluegen.jar -file.reference.jogl-all.jar=${jogl.root}/${rootrel.build}/jar/jogl-all.jar - -includes=** -jar.compress=false -javac.classpath=\ - ${file.reference.gluegen-rt.jar}:\ - ${file.reference.jogl-all.jar} -javac.deprecation=true -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${file.reference.junit-4.8.1.jar} -javadoc.additionalparam= -javadoc.author=true -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle=Java Binding for the OpenCL API -jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" -jnlp.codebase.type=local -jnlp.codebase.url=file:${basedir}/dist/ -jnlp.descriptor=application -jnlp.enabled=false -jnlp.offline-allowed=false -jnlp.signed=false -main.class=com.jogamp.opencl.util.CLInfo -manifest.file=${build.dir}/manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -run.classpath=\ - ${dist.jar}:${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -# -Djogamp.debug.NativeLibrary=true \ -# -Djogamp.debug=all \ -# -run.jvmargs=${jvmDataModel.arg} -Xmx256m \ - -Djava.library.path=\ - "${basedir}/${rootrel.build}/natives/jocl${path.separator}\ - ${jogl.root}/${rootrel.build}/lib${path.separator}\ - ${gluegen.root}/${rootrel.build}/obj" -run.test.classpath=\ - ${dist.jar}:${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -source.reference.gluegen-rt.jar=${gluegen.root}/src/java:${gluegen.root}/${rootrel.build}/gensrc/java -source.reference.jogl-all.jar=${jogl.root}/${rootrel.build}/jogl/classes:${jogl.root}/${rootrel.build}/nativewindow/gensrc/classes/:${jogl.root}/${rootrel.build}/newt/classes -src.dir=src -src.java.dir=gensrc/java -src.native.dir=gensrc/native -test.src.dir=test -#no classpath for jarfile -jar.classpath= - -#force enable jdk7 features -#enable.jdk7.features=true - -#crosscompile=true - -#enable compiletime linking -#static.binding=true - -#overwrite lib path for static linking -#use only if static.binding is true -#opencl.lib32.dir=C:/Program Files (x86)/ATI Stream/lib/x86 -#opencl.lib64.dir=C:/Program Files (x86)/ATI Stream/lib/x86_64 - -#opencl.lib32.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 -#opencl.lib64.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/x64 - -#disable the build build the native part of the bindings -#c.dont.compile=true -#dont.generate=true - -#for hudson... hudson will notice anyway since the log is parsed -#build will not fail when a test fails -ignore.failing.tests=true diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 8ff22a5..0000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - JOCL - 1.8 - - - - - - - - - - - - ./lib/nblibraries.properties - - - - diff --git a/obsolete.make-nb/Makefile b/obsolete.make-nb/Makefile new file mode 100644 index 0000000..45bc54f --- /dev/null +++ b/obsolete.make-nb/Makefile @@ -0,0 +1,29 @@ +BITS=32 + +ifeq ($(BITS),32) + CC=gcc32 + NS=win-x86 +else + BITS=64 + CC=gcc64 + NS=win-x64 +endif + +CFLAGS=-m$(BITS) -shared -c -fno-rtti -fPIC -I/usr/lib/jvm/java-6-sun/include -I../common/platform-libs/jre-include/win32 -Iresources/includes +LFLAGS=-m$(BITS) -shared -fno-rtti -fPIC -L../common/platform-libs/OpenCL/win/_x64 -lOpenCL + +SRC=gensrc/native/CLImpl_JNI.c +OBJ=build/obj/jocl/$(NS)/CLImpl_JNI.o +BIN=build/natives/jocl/$(NS)/jocl.dll + +all: $(BIN) + +$(BIN): $(OBJ) + $(CC) $(LFLAGS) $(OBJ) -o $(BIN) + +$(OBJ): $(SRC) + $(CC) $(CFLAGS) $(SRC) -o $(OBJ) + +clean: + rm -f $(BIN) $(OBJ) + diff --git a/obsolete.make-nb/build.xml b/obsolete.make-nb/build.xml new file mode 100644 index 0000000..6a68b08 --- /dev/null +++ b/obsolete.make-nb/build.xml @@ -0,0 +1,719 @@ + + + + + + Builds, tests, and runs the project JOCL. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + + diff --git a/obsolete.make-nb/crosscompiler.xml b/obsolete.make-nb/crosscompiler.xml new file mode 100644 index 0000000..36eec26 --- /dev/null +++ b/obsolete.make-nb/crosscompiler.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/obsolete.make-nb/manifest_template.mf b/obsolete.make-nb/manifest_template.mf new file mode 100644 index 0000000..93fed68 --- /dev/null +++ b/obsolete.make-nb/manifest_template.mf @@ -0,0 +1,21 @@ +Manifest-Version: 1.0 +Application-Name: Java Bindings for OpenCL +Implementation-Title: Java Bindings for OpenCL +Specification-Title: Java Bindings for OpenCL +Implementation-URL: http://jocl.jogamp.org/ +Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ +Specification-Version: @SPEC_VERSION@ +Implementation-Branch: @SCM_BRANCH@ +Implementation-Commit: @SCM_COMMIT@ +Implementation-Vendor: JogAmp Community +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 +Application-Library-Allowable-Codebase: * +@JAR_CODEBASE_TAG@ + diff --git a/obsolete.make-nb/nbproject/.gitignore b/obsolete.make-nb/nbproject/.gitignore new file mode 100644 index 0000000..3e18ebf --- /dev/null +++ b/obsolete.make-nb/nbproject/.gitignore @@ -0,0 +1 @@ +private diff --git a/obsolete.make-nb/nbproject/build-impl.xml b/obsolete.make-nb/nbproject/build-impl.xml new file mode 100644 index 0000000..5b21395 --- /dev/null +++ b/obsolete.make-nb/nbproject/build-impl.xml @@ -0,0 +1,842 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set src.java.dir + Must set src.native.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + + + + + + java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/obsolete.make-nb/nbproject/genfiles.properties b/obsolete.make-nb/nbproject/genfiles.properties new file mode 100644 index 0000000..5fa8127 --- /dev/null +++ b/obsolete.make-nb/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=29d6eb43 +build.xml.script.CRC32=eb8aa8d2 +build.xml.stylesheet.CRC32=958a1d3e@1.24.0.45 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=174e0dcd +nbproject/build-impl.xml.script.CRC32=eeff7626 +nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45 diff --git a/obsolete.make-nb/nbproject/project.properties b/obsolete.make-nb/nbproject/project.properties new file mode 100644 index 0000000..1a6ce8a --- /dev/null +++ b/obsolete.make-nb/nbproject/project.properties @@ -0,0 +1,122 @@ +#default values, overwrite this or pass it as -D ant property if required +gluegen.root=../gluegen +jogl.root=../jogl +rootrel.build=build + +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true +javac.processorpath=\ + ${javac.classpath} +application.title=JOCL +application.vendor=JogAmp Community +build.classes.excludes=**/*.java,**/*.jtemplate,**/*.form,**/*.c,**/*.html +# This directory is removed when the project is cleaned: +build.dir=${rootrel.build} +build.classes.dir=${build.dir}/classes +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=${build.dir} +dist.jar=${dist.dir}/jar/jocl.jar +dist.javadoc.dir=${build.dir}/javadoc/jocl/javadoc +endorsed.classpath= +excludes= + +file.reference.junit-4.8.1.jar=lib/junit_4/junit-4.8.1.jar +file.reference.gluegen-rt.jar=${gluegen.root}/${rootrel.build}/gluegen-rt.jar +file.reference.gluegen.jar=${gluegen.root}/${rootrel.build}/gluegen.jar +file.reference.jogl-all.jar=${jogl.root}/${rootrel.build}/jar/jogl-all.jar + +includes=** +jar.compress=false +javac.classpath=\ + ${file.reference.gluegen-rt.jar}:\ + ${file.reference.jogl-all.jar} +javac.deprecation=true +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${file.reference.junit-4.8.1.jar} +javadoc.additionalparam= +javadoc.author=true +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle=Java Binding for the OpenCL API +jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" +jnlp.codebase.type=local +jnlp.codebase.url=file:${basedir}/dist/ +jnlp.descriptor=application +jnlp.enabled=false +jnlp.offline-allowed=false +jnlp.signed=false +main.class=com.jogamp.opencl.util.CLInfo +manifest.file=${build.dir}/manifest.mf +meta.inf.dir=${src.dir}/META-INF +platform.active=default_platform +run.classpath=\ + ${dist.jar}:${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +# -Djogamp.debug.NativeLibrary=true \ +# -Djogamp.debug=all \ +# +run.jvmargs=${jvmDataModel.arg} -Xmx256m \ + -Djava.library.path=\ + "${basedir}/${rootrel.build}/natives/jocl${path.separator}\ + ${jogl.root}/${rootrel.build}/lib${path.separator}\ + ${gluegen.root}/${rootrel.build}/obj" +run.test.classpath=\ + ${dist.jar}:${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +source.reference.gluegen-rt.jar=${gluegen.root}/src/java:${gluegen.root}/${rootrel.build}/gensrc/java +source.reference.jogl-all.jar=${jogl.root}/${rootrel.build}/jogl/classes:${jogl.root}/${rootrel.build}/nativewindow/gensrc/classes/:${jogl.root}/${rootrel.build}/newt/classes +src.dir=src +src.java.dir=gensrc/java +src.native.dir=gensrc/native +test.src.dir=test +#no classpath for jarfile +jar.classpath= + +#force enable jdk7 features +#enable.jdk7.features=true + +#crosscompile=true + +#enable compiletime linking +#static.binding=true + +#overwrite lib path for static linking +#use only if static.binding is true +#opencl.lib32.dir=C:/Program Files (x86)/ATI Stream/lib/x86 +#opencl.lib64.dir=C:/Program Files (x86)/ATI Stream/lib/x86_64 + +#opencl.lib32.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 +#opencl.lib64.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/x64 + +#disable the build build the native part of the bindings +#c.dont.compile=true +#dont.generate=true + +#for hudson... hudson will notice anyway since the log is parsed +#build will not fail when a test fails +ignore.failing.tests=true diff --git a/obsolete.make-nb/nbproject/project.xml b/obsolete.make-nb/nbproject/project.xml new file mode 100644 index 0000000..8ff22a5 --- /dev/null +++ b/obsolete.make-nb/nbproject/project.xml @@ -0,0 +1,23 @@ + + + org.netbeans.modules.java.j2seproject + + + JOCL + 1.8 + + + + + + + + + + + + ./lib/nblibraries.properties + + + + diff --git a/scripts/check-java-major-version.sh b/scripts/check-java-major-version.sh deleted file mode 100755 index e163281..0000000 --- a/scripts/check-java-major-version.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/bash - -TDIR=`pwd` - -function dump_version() { - echo -n "$1: " - javap -v $1 | grep 'major version' -} - -function dump_versions() { - cd $1 - #dump_version jogamp.common.Debug - for i in `find . -name '*.class'` ; do - dump_version `echo $i | sed -e 's/\//./g' -e 's/\.class//g'` - done - cd $TDIR -} - -function do_it() { - dump_versions $1/classes - dump_versions $1/test/classes -} - -do_it $1 2>&1 | tee check-java-major-version.log -echo -echo VERSIONS found: -echo -grep 'major version' check-java-major-version.log | sort -u - - diff --git a/scripts/install-ati-stream.sh b/scripts/install-ati-stream.sh deleted file mode 100644 index 94d3eca..0000000 --- a/scripts/install-ati-stream.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# -# Here we have unpacked ati-stream-sdk-v2.1-lnx64.tgz from http://developer.amd.com/gpu/ATIStreamSDK/ -# to /opt-linux-x86_64/ and made a symbolic link to ati-stream-sdk. -# -# We also copied the file http://developer.amd.com/Downloads/icd-registration.tgz -# into ati-stream-sdk. - -SDK=/opt-linux-x86_64/ati-stream-sdk/ -ICDREG=/opt-linux-x86_64/ati-stream-sdk/icd-registration.tgz - -link(){ - if [ -e $2 ] ; then - rm -v $2 - fi - ln -v -s ${SDK}$1/$2 -} - -cd /usr/lib64/ -link lib/x86_64 libOpenCL.so -link lib/x86_64 libatiocl64.so - -cd /usr/lib32/ -link lib/x86 libOpenCL.so -link lib/x86 libatiocl32.so - -cd / -tar xzf $ICDREG diff --git a/scripts/make.jocl.all.android-armv6-cross.sh b/scripts/make.jocl.all.android-armv6-cross.sh deleted file mode 100755 index 01c87a4..0000000 --- a/scripts/make.jocl.all.android-armv6-cross.sh +++ /dev/null @@ -1,99 +0,0 @@ -#! /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 -# jogamp02 - 10.1.0.122 -export HOST_IP=10.1.0.122 -export HOST_RSYNC_ROOT=PROJECTS/JOGL - -export TARGET_UID=jogamp -export TARGET_IP=panda02 -#export TARGET_IP=jautab03 -#export TARGET_IP=jauphone04 -export TARGET_ADB_PORT=5555 -# needs executable bit (probably su) -export TARGET_ROOT=/data/projects -export TARGET_ANT_HOME=/usr/share/ant - -echo ANDROID_HOME $ANDROID_HOME -echo NDK_ROOT $NDK_ROOT - -if [ -z "$NDK_ROOT" ] ; then - # - # Generic android-ndk - # - if [ -e /usr/local/android-ndk ] ; then - NDK_ROOT=/usr/local/android-ndk - elif [ -e /opt-linux-x86/android-ndk ] ; then - NDK_ROOT=/opt-linux-x86/android-ndk - elif [ -e /opt/android-ndk ] ; then - NDK_ROOT=/opt/android-ndk - # - # Specific android-ndk-r7b - # - elif [ -e /usr/local/android-ndk-r7b ] ; then - NDK_ROOT=/usr/local/android-ndk-r7b - elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then - NDK_ROOT=/opt-linux-x86/android-ndk-r7b - elif [ -e /opt/android-ndk-r7b ] ; then - NDK_ROOT=/opt/android-ndk-r7b - else - echo NDK_ROOT is not specified and does not exist in default locations - exit 1 - fi -elif [ ! -e $NDK_ROOT ] ; then - echo NDK_ROOT $NDK_ROOT does not exist - exit 1 -fi -export NDK_ROOT - -if [ -z "$ANDROID_HOME" ] ; then - if [ -e /usr/local/android-sdk-linux_x86 ] ; then - ANDROID_HOME=/usr/local/android-sdk-linux_x86 - elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then - ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86 - elif [ -e /opt/android-sdk-linux_x86 ] ; then - ANDROID_HOME=/opt/android-sdk-linux_x86 - else - echo ANDROID_HOME is not specified and does not exist in default locations - exit 1 - fi -elif [ ! -e $ANDROID_HOME ] ; then - echo ANDROID_HOME $ANDROID_HOME does not exist - exit 1 -fi -export ANDROID_HOME - -export ANDROID_VERSION=9 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar - -export GCC_VERSION=4.4.3 -HOST_ARCH=linux-x86 -export TARGET_TRIPLE=arm-linux-androideabi - -export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH} -export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm - -# Need to add toolchain bins to the PATH. -export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/17.0.0:$PATH" - -export GLUEGEN_CPPTASKS_FILE=`pwd`/../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml - -#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 \ - $* 2>&1 | tee -a make.jocl.all.android-armv6-cross.log - diff --git a/scripts/make.jocl.all.linux-armv6-cross.sh b/scripts/make.jocl.all.linux-armv6-cross.sh deleted file mode 100755 index 97f3c1f..0000000 --- a/scripts/make.jocl.all.linux-armv6-cross.sh +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh - -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 -fi - -PATH=`pwd`/../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH -export PATH - -# -Dc.compiler.debug=true -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxARMv7=true \ -# -DisX11=false \ - -export NODE_LABEL=. - -export HOST_UID=jogamp -export HOST_IP=jogamp02 -export HOST_RSYNC_ROOT=PROJECTS/JOGL - -export TARGET_UID=jogamp -export TARGET_IP=panda02 -#export TARGET_IP=jautab02 -export TARGET_ROOT=/home/jogamp/projects-cross -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 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 deleted file mode 100755 index 36343d2..0000000 --- a/scripts/make.jocl.all.linux-armv6hf-cross.sh +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh - -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 -fi - -PATH=`pwd`/../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH -export PATH - -# -Dc.compiler.debug=true -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxARMv7=true \ -# -DisX11=false \ - -export NODE_LABEL=. - -export HOST_UID=jogamp -export HOST_IP=jogamp02 -export HOST_RSYNC_ROOT=PROJECTS/JOGL - -export TARGET_UID=jogamp -export TARGET_IP=panda02 -#export TARGET_IP=jautab02 -export TARGET_ROOT=/home/jogamp/projects-cross -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 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-clang.sh b/scripts/make.jocl.all.linux-x86-clang.sh deleted file mode 100644 index ca9c8ab..0000000 --- a/scripts/make.jocl.all.linux-x86-clang.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -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" -# or -Dgcc.compat.compiler=clang - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -ant \ - -Drootrel.build=build-x86-clang \ - $* 2>&1 | tee make.jocl.all.linux-x86-clang.log diff --git a/scripts/make.jocl.all.linux-x86.sh b/scripts/make.jocl.all.linux-x86.sh deleted file mode 100644 index 04494b2..0000000 --- a/scripts/make.jocl.all.linux-x86.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -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-clang.sh b/scripts/make.jocl.all.linux-x86_64-clang.sh deleted file mode 100644 index 1d2a2a0..0000000 --- a/scripts/make.jocl.all.linux-x86_64-clang.sh +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh - -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 -fi - -# -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 GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-clang.properties" -# or -Dgcc.compat.compiler=clang - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -BUILD_ARCHIVE=true \ -ant \ - -Drootrel.build=build-x86_64-clang \ - $* 2>&1 | tee make.jocl.all.linux-x86_64-clang.log diff --git a/scripts/make.jocl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh deleted file mode 100644 index 8e50868..0000000 --- a/scripts/make.jocl.all.linux-x86_64.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -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 -fi - -# -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 \ - -Drootrel.build=build-x86_64 \ - $* 2>&1 | tee make.jocl.all.linux-x86_64.log diff --git a/scripts/make.jocl.all.macosx-clang.sh b/scripts/make.jocl.all.macosx-clang.sh deleted file mode 100755 index fc16ed1..0000000 --- a/scripts/make.jocl.all.macosx-clang.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh - -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 GLUEGEN_PROPERTIES_FILE="../gluegen/make/lib/gluegen-xcode_clang.properties" -# or -Dgcc.compat.compiler=xcode.clang - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -ant \ - -Drootrel.build=build-macosx \ - $* 2>&1 | tee make.joal.all.macosx.log diff --git a/scripts/make.jocl.all.macosx.sh b/scripts/make.jocl.all.macosx.sh deleted file mode 100644 index 20f65b9..0000000 --- a/scripts/make.jocl.all.macosx.sh +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -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 GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties" -# or -Dgcc.compat.compiler=clang - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -ant \ - -Drootrel.build=build-macosx \ - $* 2>&1 | tee make.jocl.all.macosx.log diff --git a/scripts/make.jocl.all.sh b/scripts/make.jocl.all.sh deleted file mode 100755 index a137cea..0000000 --- a/scripts/make.jocl.all.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -$SDIR/make.jocl.all.linux-armv6-cross.sh \ -&& $SDIR/make.jocl.all.linux-armv6hf-cross.sh \ -&& $SDIR/make.jocl.all.linux-x86_64.sh \ -&& $SDIR/make.jocl.all.linux-x86.sh \ -&& $SDIR/make.jocl.all.android-armv6-cross.sh \ diff --git a/scripts/make.jocl.all.solaris-x86.sh b/scripts/make.jocl.all.solaris-x86.sh deleted file mode 100644 index a59f756..0000000 --- a/scripts/make.jocl.all.solaris-x86.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -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 deleted file mode 100644 index 2a207ab..0000000 --- a/scripts/make.jocl.all.solaris-x86_64.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh - -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 -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 deleted file mode 100644 index bb4418b..0000000 --- a/scripts/make.jocl.all.win32.bat +++ /dev/null @@ -1,19 +0,0 @@ -set THISDIR="C:\JOGL" - -set J2RE_HOME=c:\jre1.7.0_45_x32 -set JAVA_HOME=c:\jdk1.7.0_45_x32 -set ANT_PATH=C:\apache-ant-1.8.0 - -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 deleted file mode 100644 index a174e71..0000000 --- a/scripts/make.jocl.all.win64.bat +++ /dev/null @@ -1,19 +0,0 @@ -set THISDIR="C:\JOGL" - -set J2RE_HOME=c:\jre1.7.0_45_x64 -set JAVA_HOME=c:\jdk1.7.0_45_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% - -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 -- cgit v1.2.3