diff options
46 files changed, 415 insertions, 300 deletions
@@ -10,7 +10,7 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/gluegen"/> <classpathentry combineaccessrules="false" kind="src" path="/jogl"/> - <classpathentry kind="lib" path="/gluegen/make/lib/android-sdk/15/android.jar" sourcepath="/gluegen/make/lib/android-sdk/15/android-java-src.zip"/> <classpathentry kind="lib" path="/gluegen/make/lib/junit.jar" sourcepath="/gluegen/make/lib/junit-sources.jar"/> + <classpathentry kind="lib" path="/gluegen/make/lib/android-sdk/24/android.jar" sourcepath="/gluegen/make/lib/android-sdk/24/android-java-src.zip"/> <classpathentry kind="output" path="build/classes"/> </classpath> diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html index 927ef72e..fa3893a5 100644 --- a/doc/HowToBuild.html +++ b/doc/HowToBuild.html @@ -2,7 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0"/> <link href="../../style.css" rel="stylesheet" type="text/css"/> + <link href="../../style-alt1.css" rel="alternate stylesheet" title="default sans-serif font" type="text/css"/> <link href="../www/style.css" rel="stylesheet" type="text/css"/> <link href="http://jogamp.org/SocialCoding/logo_symbol_finals/website_final_blue_favicon_symbol_16x16pel.ico" rel="shortcut icon"/> <title>How to build JOCL</title> diff --git a/make/build-test.xml b/make/build-test.xml index a4756300..d19b7002 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -78,7 +78,7 @@ <property name="jocl-test.jar" value="${build}/jar/jocl-test.jar" /> <property name="obj.all.paths" value="${gluegen.build}/obj${path.separator}${jogl.build}/lib${path.separator}${obj}${path.separator}lib/${os.and.arch}"/> - <property name="classpath.test" value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> + <property name="classpath.test" value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> <property name="classpath.test.remote" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> <property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/> @@ -94,7 +94,7 @@ fork="yes" includeantruntime="false" srcdir="${src.test}" - classpath="${gluegen-rt.jar};${jocl.jar};${junit.jar};${jogl-all.jar}" + classpath="${gluegen-rt.jar};${jocl.jar};${junit.jar};${jogl-all-noawt.jar}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" @@ -171,7 +171,14 @@ androidresources.path="resources/android/res-test" jarmanifest.path="${build.test}/manifest-test-android.mf" version.code="${jogamp.version.int}" - version.name="${jogamp.version}" /> + version.name="${jogamp.version}"> + <d8-classpaths> + <arg line="--classpath ${gluegen-rt-android.jar}"/> + <arg line="--classpath ${jogl-all-noawt.jar}"/> + <arg line="--classpath ${jocl.jar}"/> + <arg line="--classpath ${junit.jar}"/> + </d8-classpaths> + </aapt.signed> </target> <target name="test.compile" depends="declare.common" unless="test.compile.skip"> diff --git a/make/build.xml b/make/build.xml index b0d4e48e..85681071 100644 --- a/make/build.xml +++ b/make/build.xml @@ -110,7 +110,7 @@ <property name="jogl.root" value="${project.root}/../jogl" /> <property name="jogl.build" value="${jogl.root}/${rootrel.build}" /> - <property name="jogl-all.jar" value="${jogl.build}/jar/jogl-all.jar" /> + <property name="jogl-all-noawt.jar" value="${jogl.build}/jar/jogl-all-noawt.jar" /> </target> <target name="init.android" if="android-jars.available" > @@ -119,7 +119,7 @@ <path id="javac.android.classpath"> <pathelement location="${android-min.jar}"/> <pathelement location="${gluegen-rt-android.jar}" /> - <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-all-noawt.jar}" /> </path> </target> @@ -161,7 +161,7 @@ <path id="javac.classpath"> <pathelement location="${gluegen.jar}" /> - <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-all-noawt.jar}" /> </path> <property name="config" value="${project.root}/make/config" /> @@ -205,6 +205,7 @@ <path id="jocl_all.classpath"> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${jocl.jar}" /> + <pathelement location="${jogl-all-noawt.jar}" /> </path> <!-- Create the required output directories. --> @@ -465,14 +466,6 @@ - Compile the native C code for JOCL. --> - <target name="rename.mingw.dll" if="isMingW"> - <move file="${src}" tofile="${dest}" /> - </target> - - <target name="rename.dylib" if="isOSX"> - <move file="${src}" tofile="${dest}" /> - </target> - <macrodef name="c.build"> <attribute name="compiler.cfg.id" /> <attribute name="linker.cfg.id" /> @@ -497,6 +490,8 @@ <cc outtype="shared" objdir="${obj}" + usehighleveltool="true" + writesoname="true" outfile="${obj}/@{output.lib.name}" optimize="${c.compiler.optimise}" debug="${c.compiler.debug}" @@ -539,14 +534,12 @@ <linker extends="@{linker.cfg.id}" /> </cc> - <antcall target="rename.dylib" inheritRefs="true"> - <param name="src" value="${obj}/lib@{output.lib.name}.dylib" /> - <param name="dest" value="${obj}/lib@{output.lib.name}.jnilib" /> - </antcall> + <gluegen.make.libsymbols builddir="${build}" + nativelib="${obj}/${native.library.prefix}@{output.lib.name}.${native.library.suffix}" + symbolsfile="${obj}/${native.library.prefix}@{output.lib.name}.symbols"/> - <antcall target="rename.mingw.dll" inheritRefs="true"> - <param name="src" value="${obj}/lib@{output.lib.name}.so" /> - <param name="dest" value="${obj}/@{output.lib.name}.dll" /> + <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true"> + <param name="libdir" value="${obj}"/> </antcall> </sequential> </macrodef> @@ -558,10 +551,6 @@ output.lib.name="jocl" linker.cfg.id="${linker.cfg.id.base}"/> - <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true"> - <param name="libdir" value="../${rootrel.build}/obj"/> - </antcall> - <!-- Create Java Web Start jar file from built file --> <copy file="joclversion-natives" tofile="${build}/tempversion-natives" @@ -603,6 +592,18 @@ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> </filterset> </copy> + <copy file="joclversion-android" + tofile="${build}/tempversion-android" + overwrite="true"> + <filterset> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jocl.version}"/> + <filter token="SCM_BRANCH" value="${jocl.build.branch}"/> + <filter token="SCM_COMMIT" value="${jocl.build.commit}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}" /> + <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> + </filterset> + </copy> <!-- Build the jar excluding any build specific classes. --> <jar manifest="${build}/tempversion" destfile="${jocl.jar}" filesonly="true"> @@ -616,7 +617,7 @@ </fileset> </jar> - <jar manifest="${build}/tempversion" destfile="${jocl-android.jar}" filesonly="true"> + <jar manifest="${build}/tempversion-android" destfile="${jocl-android.jar}" filesonly="true"> <fileset dir="${classes}"> <include name="com/jogamp/opencl/**" /> <include name="jogamp/opencl/**" /> @@ -649,9 +650,14 @@ android.abi="${android.abi}" androidmanifest.path="resources/android/AndroidManifest-jocl.xml" androidresources.path="resources/android/res-jocl" - jarmanifest.path="${build}/tempversion" + jarmanifest.path="${build}/tempversion-android" version.code="${jogamp.version.int}" - version.name="${jogamp.version}" /> + version.name="${jogamp.version}"> + <d8-classpaths> + <arg line="--classpath ${gluegen-rt-android.jar}"/> + <arg line="--classpath ${jogl-all-noawt.jar}"/> + </d8-classpaths> + </aapt.signed> </target> <!-- ================================================================== --> @@ -664,9 +670,9 @@ <target name="javadoc" depends="init, javadoc.init, javadoc.public, javadoc.dev, javadoc.zip"/> <!-- copies ${gluegen-javadoc.path}/** to ${javadoc.root.path}/gluegen/ - gluegen-javadoc.path is the parent folder of package-list: + gluegen-javadoc.path is the parent folder of element-list: gluegen-javadoc.path := build/javadoc/gluegen - with build/javadoc/gluegen/javadoc/package-list + with build/javadoc/gluegen/javadoc/element-list --> <target name="javadoc.gluegen" depends="init" if="gluegen-javadoc.path"> <delete dir="${javadoc.root.path}/gluegen" includeEmptyDirs="true" quiet="true" failonerror="false" /> @@ -713,11 +719,12 @@ <!-- if gluegen-javadoc.path is not set, check in default location, ${gluegen.root}/${rootrel.build}/javadoc/gluegen --> - <available file="${gluegen.build}/javadoc/gluegen/javadoc/package-list" + <available file="${gluegen.build}/javadoc/gluegen/javadoc/element-list" type="file" property="gluegen-javadoc.path" value="${gluegen.build}/javadoc/gluegen" /> <antcall target="javadoc.gluegen" inheritRefs="true" /> + <property name="java.excludes.javadoc.packagenames" value="jogamp.opencl.os.android.*"/> </target> <target name="javadoc.zip" depends="javadoc.init"> @@ -728,6 +735,7 @@ <target name="javadoc.public" depends="javadoc.init"> <javadoc packagenames="${javadoc.packagenames}" + excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" destdir="${javadoc.jocl.public.path}" windowtitle="JOCL API" encoding="UTF-8" @@ -737,6 +745,7 @@ <classpath refid="jocl_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> + <arg value="--frames"/> <arg value="${javadoc.xarg1}"/> </javadoc> <copy todir="${javadoc.jocl.public.path}/resources" overwrite="true"> @@ -747,6 +756,7 @@ <target name="javadoc.dev" depends="javadoc.init"> <!-- Build the internal developer Javadoc --> <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform}" + excludepackagenames="${java.excludes.javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" destdir="${javadoc.jocl.dev.path}" windowtitle="JOCL API" encoding="UTF-8" @@ -756,6 +766,7 @@ <classpath refid="jocl_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> + <arg value="--frames"/> <arg value="${javadoc.xarg1}"/> </javadoc> <copy todir="${javadoc.jocl.dev.path}/resources" overwrite="true"> @@ -767,7 +778,7 @@ <!--delete includeEmptyDirs="true" quiet="true" failonerror="false"> <fileset dir="${build}" includes="jocl-java-src.zip" /> </delete--> - <zip destfile="${build}/jocl-java-src.zip"> + <zip destfile="${build}/jar/jocl-java-src.zip"> <fileset dir="${src.java}"/> <fileset dir="${build}/gensrc"/> </zip> @@ -781,8 +792,7 @@ <copy file="${build}/artifact.properties" todir="${archive}"/> <mkdir dir="${archive}/jar" /> <copy todir="${archive}/jar"> - <fileset dir="${build}/jar" includes="jocl*.jar"/> - <fileset dir="${build}/jar" includes="jocl*.apk"/> + <fileset dir="${build}/jar" includes="**"/> </copy> <mkdir dir="${archive}/lib" /> <copy todir="${archive}/lib"> @@ -798,7 +808,6 @@ </copy> <copy file="../README.txt" todir="${archive}"/> <copy file="../LICENSE.txt" todir="${archive}"/> - <copy todir="${archive}" file="${build}/jocl-java-src.zip"/> <archive.7z destfile="${build}/${archive.name}.7z" basedir="${build}" includes="${archive.name}/**" /> diff --git a/make/config/cl-impl-11.cfg b/make/config/cl-impl-11.cfg index 961492a3..dbda1c09 100644 --- a/make/config/cl-impl-11.cfg +++ b/make/config/cl-impl-11.cfg @@ -105,6 +105,5 @@ ForceProcAddressGen clEnqueueMapImage #include custom code IncludeAs CustomJavaCode CLImpl11 clImplCustomCode11.java IncludeAs CustomJavaCode CLImpl11 clImplCustomCode.java -ManualStaticInitCall CLImpl11 IncludeAs CustomCCode clImplCustomCode11.c diff --git a/make/config/cl-impl-12.cfg b/make/config/cl-impl-12.cfg index c8b0c839..467df7d3 100644 --- a/make/config/cl-impl-12.cfg +++ b/make/config/cl-impl-12.cfg @@ -112,7 +112,6 @@ ForceProcAddressGen clEnqueueMapImage #include custom code IncludeAs CustomJavaCode CLImpl12 clImplCustomCode12.java IncludeAs CustomJavaCode CLImpl12 clImplCustomCode.java -ManualStaticInitCall CLImpl12 IncludeAs CustomCCode clImplCustomCode.c IncludeAs CustomCCode clImplCustomCode12.c diff --git a/make/config/cl-impl-20.cfg b/make/config/cl-impl-20.cfg index d446da19..69a6e57f 100644 --- a/make/config/cl-impl-20.cfg +++ b/make/config/cl-impl-20.cfg @@ -112,7 +112,6 @@ ForceProcAddressGen clEnqueueMapImage #include custom code IncludeAs CustomJavaCode CLImpl20 clImplCustomCode20.java IncludeAs CustomJavaCode CLImpl20 clImplCustomCode.java -ManualStaticInitCall CLImpl20 IncludeAs CustomCCode clImplCustomCode.c IncludeAs CustomCCode clImplCustomCode20.c diff --git a/make/joclversion-android b/make/joclversion-android new file mode 100644 index 00000000..92ee9034 --- /dev/null +++ b/make/joclversion-android @@ -0,0 +1,18 @@ +Manifest-Version: 1.0 +Application-Name: Java Bindings for OpenCL +Specification-Title: Java Bindings for OpenCL API Specification +Specification-Version: @BASEVERSION@ +Specification-Vendor: JogAmp Community +Implementation-Title: Java Bindings for OpenCL Runtime Environment +Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ +Implementation-Branch: @SCM_BRANCH@ +Implementation-Commit: @SCM_COMMIT@ +Implementation-Vendor: JogAmp Community +Implementation-URL: http://jogamp.org/ +Extension-Name: com.jogamp.opencl +Implementation-Vendor-Id: com.jogamp +Trusted-Library: true +Permissions: all-permissions +@JAR_CODEBASE_TAG@ + diff --git a/make/resources/android/AndroidManifest-jocl.xml b/make/resources/android/AndroidManifest-jocl.xml index 7fbf04dd..031cd687 100644 --- a/make/resources/android/AndroidManifest-jocl.xml +++ b/make/resources/android/AndroidManifest-jocl.xml @@ -6,7 +6,7 @@ <uses-library android:name="com.jogamp.common" android:required="true" /> <uses-library android:name="com.jogamp.opengl" android:required="true" /> - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <application android:icon="@drawable/icon" android:label="@string/app_name" diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index b09b081a..ba1b1200 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -8,7 +8,7 @@ <uses-library android:name="com.jogamp.opencl" android:required="true" /> <uses-library android:name="jogamp.android.launcher" android:required="true" /> - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <application android:icon="@drawable/icon" android:label="@string/app_name" diff --git a/make/scripts/adb-install-all-x86.sh b/make/scripts/adb-install-all-x86.sh new file mode 100755 index 00000000..bdb48e5e --- /dev/null +++ b/make/scripts/adb-install-all-x86.sh @@ -0,0 +1,4 @@ +#adb $* install ../../gluegen/build-android-x86/jogamp-android-launcher.apk +#adb $* install ../../gluegen/build-android-x86/gluegen-rt-android-x86.apk +adb $* install ../build-android-x86/jar/jocl-android-x86.apk +adb $* install ../build-android-x86/jar/jocl-test-android.apk diff --git a/make/scripts/adb-reinstall-all-x86.sh b/make/scripts/adb-reinstall-all-x86.sh new file mode 100755 index 00000000..7db988d5 --- /dev/null +++ b/make/scripts/adb-reinstall-all-x86.sh @@ -0,0 +1,5 @@ +sdir=`dirname $0` + +$sdir/adb-uninstall-all.sh $* +$sdir/adb-install-all-x86.sh $* + diff --git a/make/scripts/make.jocl.all-host-linux.sh b/make/scripts/make.jocl.all-host-linux.sh new file mode 100755 index 00000000..4e95117c --- /dev/null +++ b/make/scripts/make.jocl.all-host-linux.sh @@ -0,0 +1,20 @@ +#! /bin/sh + +SDIR=`dirname $0` + +$SDIR/make.jocl.all.android-aarch64-cross.sh && \ +$SDIR/make.jocl.all.android-armv6-cross.sh && \ +$SDIR/make.jocl.all.android-x86-cross.sh && \ +$SDIR/make.jocl.all.linux-aarch64-cross.sh && \ +$SDIR/make.jocl.all.linux-armv6hf-cross.sh && \ +$SDIR/make.jocl.all.linux-x86.sh && \ +$SDIR/make.jocl.all.linux-x86_64.sh + +# $SDIR/make.jocl.all.macosx.sh +# $SDIR/make.jocl.all.ios.amd64.sh +# $SDIR/make.jocl.all.ios.arm64.sh +# $SDIR/make.jocl.all.win32.bat +# $SDIR/make.jocl.all.win64.bat +# $SDIR/make.jocl.all.linux-armv6hf.sh +# $SDIR/make.jocl.all.linux-aarch64.sh + diff --git a/make/scripts/make.jocl.all-host-macos.sh b/make/scripts/make.jocl.all-host-macos.sh new file mode 100755 index 00000000..11f2d3c9 --- /dev/null +++ b/make/scripts/make.jocl.all-host-macos.sh @@ -0,0 +1,16 @@ +#! /bin/sh + +SDIR=`dirname $0` + +$SDIR/make.jocl.all.macosx.sh && \ +$SDIR/make.jocl.all.ios.amd64.sh && \ +$SDIR/make.jocl.all.ios.arm64.sh + +# $SDIR/make.jocl.all.macosx.sh +# $SDIR/make.jocl.all.ios.amd64.sh +# $SDIR/make.jocl.all.ios.arm64.sh +# $SDIR/make.jocl.all.win32.bat +# $SDIR/make.jocl.all.win64.bat +# $SDIR/make.jocl.all.linux-ppc64le.sh +# $SDIR/make.jocl.all.linux-armv6hf.sh +# $SDIR/make.jocl.all.linux-aarch64.sh diff --git a/make/scripts/make.jocl.all.android-aarch64-cross.sh b/make/scripts/make.jocl.all.android-aarch64-cross.sh index 792c066b..9598e46d 100755 --- a/make/scripts/make.jocl.all.android-aarch64-cross.sh +++ b/make/scripts/make.jocl.all.android-aarch64-cross.sh @@ -1,63 +1,45 @@ #! /bin/sh -SDIR=`dirname $0` +SDIR=$(readlink -f `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-jogamp-x86_64.sh ] ; then + . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-android-tools.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 +LOGF=make.jocl.all.android-aarch64-cross.log +rm -f ${LOGF} -export ANDROID_VERSION=21 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64 +export ANDROID_API_LEVEL=24 +export ANDROID_HOST_TAG=linux-x86_64 +export ANDROID_ABI=arm64-v8a -#export GCC_VERSION=4.4.3 -export GCC_VERSION=4.9 -HOST_ARCH=linux-x86_64 -export TARGET_TRIPLE=aarch64-linux-android - -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-arm64 +if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then + . ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh >> $LOGF 2>&1 +else + echo "${SDIR}/../../../setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF} + exit 1 +fi -# Need to add toolchain bins to the PATH. -# May need to create symbolic links within $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin -# cd $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin -# ln -s ../../bin/aarch64-linux-android-gcc gcc -export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH" +export GLUEGEN_CPPTASKS_FILE=${SDIR}/../../../gluegen/make/lib/gluegen-cpptasks-android-aarch64.xml +export PATH_VANILLA=$PATH +export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH} +echo PATH ${PATH} 2>&1 | tee -a ${LOGF} +echo clang `which clang` 2>&1 | tee -a ${LOGF} -export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-aarch64.xml +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" -echo PATH $PATH 2>&1 | tee make.jocl.all.android-aarch64-cross.log -echo gcc `which gcc` 2>&1 | tee -a make.jocl.all.android-aarch64-cross.log - #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" # BUILD_ARCHIVE=true \ ant \ -Drootrel.build=build-android-aarch64 \ - $* 2>&1 | tee -a make.jocl.all.android-aarch64-cross.log + -Dgcc.compat.compiler=clang \ + $* 2>&1 | tee -a ${LOGF} diff --git a/make/scripts/make.jocl.all.android-armv6-cross.sh b/make/scripts/make.jocl.all.android-armv6-cross.sh index dcca619f..59a46dc0 100755 --- a/make/scripts/make.jocl.all.android-armv6-cross.sh +++ b/make/scripts/make.jocl.all.android-armv6-cross.sh @@ -1,47 +1,35 @@ #! /bin/sh -SDIR=`dirname $0` +SDIR=$(readlink -f `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-jogamp-x86_64.sh ] ; then + . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-android-tools.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 +LOGF=make.jocl.all.android-armv6-cross.log +rm -f ${LOGF} -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 +export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64 +export ANDROID_API_LEVEL=24 +export ANDROID_HOST_TAG=linux-x86_64 +export ANDROID_ABI=armeabi-v7a -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.8 -HOST_ARCH=linux-x86_64 -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 +if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then + . ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh >> $LOGF 2>&1 +else + echo "${SDIR}/../../../setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF} + exit 1 +fi -# Need to add toolchain bins to the PATH. -export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH" +export GLUEGEN_CPPTASKS_FILE=${SDIR}/../../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml +export PATH_VANILLA=$PATH +export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH} +echo PATH ${PATH} 2>&1 | tee -a ${LOGF} +echo clang `which clang` 2>&1 | tee -a ${LOGF} -export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" @@ -52,5 +40,6 @@ 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 + -Dgcc.compat.compiler=clang \ + $* 2>&1 | tee -a ${LOGF} diff --git a/make/scripts/make.jocl.all.android-x86-cross.sh b/make/scripts/make.jocl.all.android-x86-cross.sh new file mode 100755 index 00000000..5bc59e89 --- /dev/null +++ b/make/scripts/make.jocl.all.android-x86-cross.sh @@ -0,0 +1,45 @@ +#! /bin/sh + +SDIR=$(readlink -f `dirname $0`) + +if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then + . ${SDIR}/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh +fi + +LOGF=make.jocl.all.android-x86-cross.log +rm -f ${LOGF} + +export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64 +export ANDROID_API_LEVEL=24 +export ANDROID_HOST_TAG=linux-x86_64 +export ANDROID_ABI=x86 + +if [ -e ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh ] ; then + . ${SDIR}/../../../gluegen/make/scripts/setenv-android-tools.sh >> $LOGF 2>&1 +else + echo "${SDIR}/../../../setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF} + exit 1 +fi + +export GLUEGEN_CPPTASKS_FILE=${SDIR}/../../../gluegen/make/lib/gluegen-cpptasks-android-x86.xml +export PATH_VANILLA=$PATH +export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH} +echo PATH ${PATH} 2>&1 | tee -a ${LOGF} +echo clang `which clang` 2>&1 | tee -a ${LOGF} + +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar + +#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-x86 \ + -Dgcc.compat.compiler=clang \ + $* 2>&1 | tee -a ${LOGF} + diff --git a/make/scripts/make.jocl.all.ios.amd64.sh b/make/scripts/make.jocl.all.ios.amd64.sh new file mode 100755 index 00000000..d8c964f9 --- /dev/null +++ b/make/scripts/make.jocl.all.ios.amd64.sh @@ -0,0 +1,32 @@ +#! /bin/sh + +if [ -e /usr/local/etc/profile.ant ] ; then + . /usr/local/etc/profile.ant +fi + +# -Dc.compiler.debug=true + +# Force OSX SDK 10.6, if desired +# export SDKROOT=macosx10.6 + +export SDKROOT=iphonesimulator13.2 +xcrun --show-sdk-path + +JAVA_HOME=`/usr/libexec/java_home -version 11` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH +which java +java -version + +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/usr/local/jre1.8.0_212/lib/rt.jar + +export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-ios-amd64.xml + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + +ant \ + -Drootrel.build=build-ios-amd64 \ + $* 2>&1 | tee make.jocl.all.ios-amd64.log diff --git a/make/scripts/make.jocl.all.ios.arm64.sh b/make/scripts/make.jocl.all.ios.arm64.sh new file mode 100755 index 00000000..ed4a6887 --- /dev/null +++ b/make/scripts/make.jocl.all.ios.arm64.sh @@ -0,0 +1,32 @@ +#! /bin/sh + +if [ -e /usr/local/etc/profile.ant ] ; then + . /usr/local/etc/profile.ant +fi + +# -Dc.compiler.debug=true + +# Force OSX SDK 10.6, if desired +# export SDKROOT=macosx10.6 + +export SDKROOT=iphoneos13.2 +xcrun --show-sdk-path + +JAVA_HOME=`/usr/libexec/java_home -version 11` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH +which java +java -version + +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/usr/local/jre1.8.0_212/lib/rt.jar + +export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-ios-aarch64.xml + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + +ant \ + -Drootrel.build=build-ios-arm64 \ + $* 2>&1 | tee make.jocl.all.ios-arm64.log diff --git a/make/scripts/make.jocl.all.linux-aarch64-cross.sh b/make/scripts/make.jocl.all.linux-aarch64-cross.sh index a3551634..42542425 100755 --- a/make/scripts/make.jocl.all.linux-aarch64-cross.sh +++ b/make/scripts/make.jocl.all.linux-aarch64-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/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi # aarch64-linux-gnueabi == aarch64 triplet @@ -17,18 +17,19 @@ export PATH # -DisLinuxARM64=true \ # -DisX11=true \ -export TARGET_PLATFORM_ROOT=/opt-linux-arm64 -export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib -export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/aarch64 +export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot` +export TARGET_PLATFORM_USRROOT=/opt-linux-arm64 +export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib +export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/aarch64 export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-aarch64.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 SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.jocl.all.linux-armv6-cross.sh b/make/scripts/make.jocl.all.linux-armv6-cross.sh deleted file mode 100755 index d13d51b0..00000000 --- a/make/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/make/scripts/make.jocl.all.linux-armv6hf-cross.sh b/make/scripts/make.jocl.all.linux-armv6hf-cross.sh index fe375c12..c3cd339e 100755 --- a/make/scripts/make.jocl.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.jocl.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/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH @@ -28,17 +28,19 @@ export TARGET_IP=panda02 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 TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot` +export TARGET_PLATFORM_USRROOT=/opt-linux-armv6-armhf +export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib +export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/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 SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.jocl.all.linux-x86-clang.sh b/make/scripts/make.jocl.all.linux-x86-clang.sh index be694d1a..65de5b1d 100755 --- a/make/scripts/make.jocl.all.linux-x86-clang.sh +++ b/make/scripts/make.jocl.all.linux-x86-clang.sh @@ -2,13 +2,16 @@ 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-jogamp-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-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 +LOGF=make.jocl.all.linux-x86-clang.log +rm -f $LOGF + +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang @@ -18,4 +21,4 @@ export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ -Drootrel.build=build-x86-clang \ - $* 2>&1 | tee make.jocl.all.linux-x86-clang.log + $* 2>&1 | tee -a $LOGF diff --git a/make/scripts/make.jocl.all.linux-x86.sh b/make/scripts/make.jocl.all.linux-x86.sh index 010a6041..33d7bea9 100755 --- a/make/scripts/make.jocl.all.linux-x86.sh +++ b/make/scripts/make.jocl.all.linux-x86.sh @@ -2,17 +2,24 @@ 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-jogamp-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-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 +LOGF=make.jocl.all.linux-x86.log +rm -f $LOGF + +# -Dgluegen-cpptasks.file=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-linux-32bit.xml \ +# + +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/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 + -Dos.arch=x86 \ + $* 2>&1 | tee -a $LOGF diff --git a/make/scripts/make.jocl.all.linux-x86_64-clang.sh b/make/scripts/make.jocl.all.linux-x86_64-clang.sh index a30eb3c2..71decaff 100755 --- a/make/scripts/make.jocl.all.linux-x86_64-clang.sh +++ b/make/scripts/make.jocl.all.linux-x86_64-clang.sh @@ -2,15 +2,18 @@ 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-jogamp-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi +LOGF=make.jocl.all.linux-x86_64-clang.log +rm -f $LOGF + # -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 SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar export GLUEGEN_PROPERTIES_FILE="../../gluegen/make/lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang @@ -21,4 +24,4 @@ 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 + $* 2>&1 | tee -a $LOGF diff --git a/make/scripts/make.jocl.all.linux-x86_64.sh b/make/scripts/make.jocl.all.linux-x86_64.sh index 460af803..06c9e8e7 100755 --- a/make/scripts/make.jocl.all.linux-x86_64.sh +++ b/make/scripts/make.jocl.all.linux-x86_64.sh @@ -2,20 +2,24 @@ 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-jogamp-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi +LOGF=make.jocl.all.linux-x86_64.log +rm -f $LOGF + # -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 SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" -BUILD_ARCHIVE=true \ +# BUILD_ARCHIVE=true \ ant \ -Drootrel.build=build-x86_64 \ - $* 2>&1 | tee make.jocl.all.linux-x86_64.log + $* 2>&1 | tee -a $LOGF + diff --git a/make/scripts/make.jocl.all.macosx-java6.sh b/make/scripts/make.jocl.all.macosx-java6.sh deleted file mode 100755 index 2d678ac3..00000000 --- a/make/scripts/make.jocl.all.macosx-java6.sh +++ /dev/null @@ -1,25 +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.8` -JAVA_HOME=`/usr/libexec/java_home -version 1.6` -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" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -ant \ - -Drootrel.build=build-macosx-java6 \ - $* 2>&1 | tee make.jocl.all.macosx-java6.log diff --git a/make/scripts/make.jocl.all.macosx.sh b/make/scripts/make.jocl.all.macosx.sh index 88e6bfe2..5077b794 100755 --- a/make/scripts/make.jocl.all.macosx.sh +++ b/make/scripts/make.jocl.all.macosx.sh @@ -2,20 +2,20 @@ SDIR=`dirname $0` -if [ -e /opt-share/etc/profile.ant ] ; then - . /opt-share/etc/profile.ant +if [ -e /usr/local/etc/profile.ant ] ; then + . /usr/local/etc/profile.ant fi -JAVA_HOME=`/usr/libexec/java_home -version 1.8` -#JAVA_HOME=`/usr/libexec/java_home -version 1.6` +JAVA_HOME=`/usr/libexec/java_home -version 11` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` 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 SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/usr/local/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.jocl.all.sh b/make/scripts/make.jocl.all.sh deleted file mode 100755 index a137cea5..00000000 --- a/make/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/make/scripts/make.jocl.all.solaris-x86.sh b/make/scripts/make.jocl.all.solaris-x86.sh index 6e643cb2..0220f47f 100755 --- 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-jogamp-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-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 index abca7e2a..cfaa5aeb 100755 --- 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-jogamp-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-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 index e6106fbc..4ab9e919 100755 --- a/make/scripts/make.jocl.all.win32.bat +++ b/make/scripts/make.jocl.all.win32.bat @@ -1,17 +1,22 @@ -set THISDIR="C:\JOGL"
+set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre1.8.0_66_x32
-set JAVA_HOME=c:\jdk1.8.0_66_x32
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x32
+set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin64\bin
+set SEVENZIP=C:\Program Files\7-Zip
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
+set CMAKE_PATH=C:\cmake-3.25.1-windows-x86_64
+set CMAKE_C_COMPILER=c:\mingw32\bin\gcc
-set LIB_GEN=%THISDIR%\lib
-set CLASSPATH=.;%THISDIR%\build-win32\classes
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+REM set LIB_GEN=%THISDIR%\lib
+REM set CLASSPATH=.;%THISDIR%\build-win32\classes
+
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
diff --git a/make/scripts/make.jocl.all.win64.bat b/make/scripts/make.jocl.all.win64.bat index b1928677..e7a594c9 100755 --- a/make/scripts/make.jocl.all.win64.bat +++ b/make/scripts/make.jocl.all.win64.bat @@ -1,17 +1,22 @@ -set THISDIR="C:\JOGL"
+REM set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.8.0_66_x64
-set JAVA_HOME=c:\jdk1.8.0_66_x64
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jdk-17
+set JAVA_HOME=c:\jdk-17
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin64\bin
+set SEVENZIP=C:\Program Files\7-Zip
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
+set CMAKE_PATH=C:\cmake-3.25.1-windows-x86_64
+set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
-set LIB_GEN=%THISDIR%\lib
-set CLASSPATH=.;%THISDIR%\build-win64\classes
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+REM set LIB_GEN=%THISDIR%\lib
+REM set CLASSPATH=.;%THISDIR%\build-win64\classes
+
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
diff --git a/make/scripts/tests-osx-x32.sh b/make/scripts/tests-osx-x32.sh index e7f4f01e..090f0ad2 100755 --- a/make/scripts/tests-osx-x32.sh +++ b/make/scripts/tests-osx-x32.sh @@ -2,6 +2,6 @@ spath=`dirname $0` -. $spath/tests.sh /usr/bin/java -d32 ../build-macosx $* +. $spath/tests.sh /usr/bin/java -DummyArg ../build-macosx $* diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 5d9cd6f6..54528460 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -2,7 +2,7 @@ export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH -JAVA_HOME=`/usr/libexec/java_home -version 1.7` +JAVA_HOME=`/usr/libexec/java_home -version 11` #JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25` #JAVA_HOME=`/usr/libexec/java_home -version 1.6.0` PATH=$JAVA_HOME/bin:$PATH @@ -10,5 +10,5 @@ export JAVA_HOME PATH spath=`dirname $0` -. $spath/tests.sh $JAVA_HOME/bin/java -d64 ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx $* diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh index 996dcc60..9d16cd0b 100755 --- a/make/scripts/tests-solx32.sh +++ b/make/scripts/tests-solx32.sh @@ -2,9 +2,9 @@ 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-jogamp-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh fi -. $SDIR/tests.sh `which java` -d32 ../build-solaris-x86 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-solaris-x86 $* diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh index 3500f1b1..d4d2eb7b 100755 --- a/make/scripts/tests-solx64.sh +++ b/make/scripts/tests-solx64.sh @@ -2,9 +2,9 @@ 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-jogamp-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi -. $SDIR/tests.sh `which java` -d64 ../build-solaris-x86_64 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-solaris-x86_64 $* diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh index 858ed5fd..32c7f0e1 100755 --- a/make/scripts/tests-x32.sh +++ b/make/scripts/tests-x32.sh @@ -2,12 +2,12 @@ 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-jogamp-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86.sh fi export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86/swt-debug.jar -. $SDIR/tests.sh `which java` -d32 ../build-x86 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-x86 $* diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index fe2fc495..527cc3a6 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -6,14 +6,14 @@ SDIR=`dirname $0` #export LD_LIBRARY_PATH=/home/sven/ffmpeg-0.10/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=/home/sven/libav-9.x/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=/home/sven/ffmpeg-1.2/lib:$LD_LIBRARY_PATH +#export LD_LIBRARY_PATH=/home/sven/ffmpeg-1.2/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=/home/sven/libav-10.x/lib:$LD_LIBRARY_PATH #export LD_LIBRARY_PATH=/home/sven/ffmpeg-2.x/lib:$LD_LIBRARY_PATH -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-jogamp-x86_64.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogamp-x86_64.sh fi -. $SDIR/tests.sh `which java` -d64 ../build-x86_64 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-x86_64 $* diff --git a/src/com/jogamp/opencl/CLCommandQueue.java b/src/com/jogamp/opencl/CLCommandQueue.java index f95576b6..7e78be4a 100644 --- a/src/com/jogamp/opencl/CLCommandQueue.java +++ b/src/com/jogamp/opencl/CLCommandQueue.java @@ -43,6 +43,7 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; +import com.jogamp.common.nio.AbstractBuffer; import com.jogamp.common.nio.CachedBufferFactory; import com.jogamp.common.nio.PointerBuffer; import com.jogamp.opencl.gl.CLGLObject; @@ -82,7 +83,7 @@ public class CLCommandQueue extends CLObjectResource { this.properties = properties; this.cl = context.getPlatform().getCLBinding(); - final int pbsize = PointerBuffer.ELEMENT_SIZE; + final int pbsize = AbstractBuffer.POINTER_SIZE; final CachedBufferFactory factory = CachedBufferFactory.create(9*pbsize + 4, true); this.ibA = PointerBuffer.wrap(factory.newDirectByteBuffer(3*pbsize)); diff --git a/src/com/jogamp/opencl/CLEventList.java b/src/com/jogamp/opencl/CLEventList.java index 806a0661..f890558a 100644 --- a/src/com/jogamp/opencl/CLEventList.java +++ b/src/com/jogamp/opencl/CLEventList.java @@ -28,6 +28,7 @@ package com.jogamp.opencl; +import com.jogamp.common.nio.AbstractBuffer; import com.jogamp.common.nio.CachedBufferFactory; import com.jogamp.common.nio.PointerBuffer; import java.util.Iterator; @@ -85,7 +86,7 @@ public final class CLEventList implements CLResource, AutoCloseable, Iterable<CL if(factory == null) { return PointerBuffer.allocateDirect(size); }else{ - return PointerBuffer.wrap(factory.newDirectByteBuffer(size*PointerBuffer.ELEMENT_SIZE)); + return PointerBuffer.wrap(factory.newDirectByteBuffer(size*AbstractBuffer.POINTER_SIZE)); } } @@ -175,6 +176,7 @@ public final class CLEventList implements CLResource, AutoCloseable, Iterable<CL return events.length; } + @Override public boolean isReleased() { return size == 0; } diff --git a/src/com/jogamp/opencl/CLPlatform.java b/src/com/jogamp/opencl/CLPlatform.java index 34265465..f64df614 100644 --- a/src/com/jogamp/opencl/CLPlatform.java +++ b/src/com/jogamp/opencl/CLPlatform.java @@ -281,7 +281,12 @@ public class CLPlatform { * @see #listCLDevices(com.jogamp.opencl.CLDevice.Type...) */ public CLDevice[] listCLDevices() { - return this.listCLDevices(CLDevice.Type.ALL); + try{ + return this.listCLDevices(CLDevice.Type.ALL); + } + catch(CLInvalidDeviceTypeException ignore){ //trying to list GPUs if CL_DEVICE_TYPE_ALL isn't valid. on some non-standard implementations (Android PowerVR), only CL_DEVICE_TYPE_GPU is supported and use of other types including ALL will lead to a CL_INVALID_DEVICE_TYPE + return this.listCLDevices(CLDevice.Type.GPU); + } } /** diff --git a/src/com/jogamp/opencl/CLProgram.java b/src/com/jogamp/opencl/CLProgram.java index 3c68fa35..401c547a 100644 --- a/src/com/jogamp/opencl/CLProgram.java +++ b/src/com/jogamp/opencl/CLProgram.java @@ -28,6 +28,7 @@ package com.jogamp.opencl; +import com.jogamp.common.nio.AbstractBuffer; import com.jogamp.common.nio.CachedBufferFactory; import com.jogamp.opencl.util.CLProgramConfiguration; import com.jogamp.opencl.util.CLUtil; @@ -109,7 +110,7 @@ public class CLProgram extends CLObjectResource { binarySize += entry.getValue().length; } - final int pbSize = PointerBuffer.ELEMENT_SIZE; + final int pbSize = AbstractBuffer.POINTER_SIZE; final int deviceCount = binaries.size(); final CachedBufferFactory bf = CachedBufferFactory.create(binarySize + pbSize*deviceCount*3 + 4, true); @@ -373,7 +374,7 @@ public class CLProgram extends CLObjectResource { { try { buildLock.acquire(); - } catch(InterruptedException e) { + } catch(final InterruptedException e) { throw newException(ret, "\nInterrupted while waiting to get build lock"); } diff --git a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java index 7195d592..b32636bf 100644 --- a/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java +++ b/src/com/jogamp/opencl/impl/CLTLAccessorFactory.java @@ -33,6 +33,8 @@ package com.jogamp.opencl.impl; import java.nio.IntBuffer; + +import com.jogamp.common.nio.AbstractBuffer; import com.jogamp.common.nio.PointerBuffer; import com.jogamp.opencl.llb.CL; import com.jogamp.opencl.spi.CLAccessorFactory; @@ -103,7 +105,7 @@ public class CLTLAccessorFactory implements CLAccessorFactory { }else{ checkForError(ret, "error while enumerating devices"); - final PointerBuffer deviceIDs = PointerBuffer.wrap(getBB(count*PointerBuffer.ELEMENT_SIZE)); + final PointerBuffer deviceIDs = PointerBuffer.wrap(getBB(count*AbstractBuffer.POINTER_SIZE)); ret = cl.clGetDeviceIDs(ID, type, count, deviceIDs, null); checkForError(ret, "error while enumerating devices"); diff --git a/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java b/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java index b48cb47c..39365a23 100644 --- a/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java +++ b/src/com/jogamp/opencl/llb/impl/CLDynamicLibraryBundleInfo.java @@ -50,7 +50,7 @@ public final class CLDynamicLibraryBundleInfo implements DynamicLibraryBundleInf public Object run() { Platform.initSingleton(); - if( TempJarCache.isInitialized() ) { + if( TempJarCache.isInitialized(true) ) { // only: jocl.jar -> jocl-natives-<os.and.arch>.jar JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { jogamp.opencl.Debug.class }, null ); } diff --git a/www/index.html b/www/index.html index 799b418a..cbcfe836 100755 --- a/www/index.html +++ b/www/index.html @@ -2,7 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0"/> <link href="../../style.css" rel="stylesheet" type="text/css"/> + <link href="../../style-alt1.css" rel="alternate stylesheet" title="default sans-serif font" type="text/css"/> <link href="style.css" rel="stylesheet" type="text/css"/> <link href="http://jogamp.org/SocialCoding/logo_symbol_finals/website_final_blue_favicon_symbol_16x16pel.ico" rel="shortcut icon"/> <title>Java Bindings for the OpenCL API</title> |