diff options
28 files changed, 285 insertions, 136 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 31f5f9c..c9df712 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -52,6 +52,8 @@ <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> <target name="declare.common" depends="jogamp.env.init, gluegen.cpptasks.detect.os"> + <property name="joal.version" value="${jogamp.version.base}-${version.timestamp}" /> + <property name="project.root" value=".." /> <property name="build" value="${project.root}/${rootrel.build}" /> @@ -84,7 +86,7 @@ <mkdir dir="${classes.test}"/> </target> - <target name="test.compile.javase"> + <target name="test.compile.javase" depends="declare.common" > <javac destdir="${classes.test}" excludes="${java.part.test.android}" fork="yes" @@ -101,10 +103,11 @@ tofile="${build.test}/manifest-test.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${joal.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${joal.version}"/> <filter token="SCM_BRANCH" value="${joal.build.branch}"/> <filter token="SCM_COMMIT" value="${joal.build.commit}"/> - <filter token="BASEVERSION" value="${joal_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> <jar manifest="${build.test}/manifest-test.mf" destfile="${build}/joal-test.jar"> @@ -135,10 +138,11 @@ tofile="${build.test}/manifest-test-android.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${joal.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${joal.version}"/> <filter token="SCM_BRANCH" value="${joal.build.branch}"/> <filter token="SCM_COMMIT" value="${joal.build.commit}"/> - <filter token="BASEVERSION" value="${joal_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> <jar manifest="${build.test}/manifest-test-android.mf" destfile="${build}/joal-test-android.jar" filesonly="true"> @@ -161,8 +165,8 @@ androidmanifest.path="resources/android/AndroidManifest-test.xml" androidresources.path="resources/android/res-test" jarmanifest.path="${build.test}/manifest-test-android.mf" - version.code="${joal_int_version}" - version.name="${joal.version.plus}" /> + version.code="${jogamp.version.int}" + version.name="${jogamp.version}" /> </target> <target name="test.compile" depends="declare.common" unless="test.compile.skip"> diff --git a/make/build.xml b/make/build.xml index 40e72c0..cc0b842 100755 --- a/make/build.xml +++ b/make/build.xml @@ -44,13 +44,7 @@ <property name="gluegen.build" value="${gluegen.root}/${rootrel.build}" /> <!-- This is the version of JOAL you are building --> - <property name="joal_base_version" value="2.0"/> - <property name="joal_int_version" value="2"/> - <tstamp> - <format property="version.timestamp" pattern="yyyyMMdd"/> - </tstamp> <property name="joal.build.number" value="manual-build"/> - <property name="joal.build.id" value="${version.timestamp}"/> <mkdir dir="${build}" /> <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false" output="${build}/localbranch.raw"> @@ -66,8 +60,6 @@ <arg line="rev-parse HEAD"/> </exec> <property name="joal.build.commit" value="manual"/> <!-- fallback --> - <property name="joal.version" value="${joal_base_version}-${version.timestamp}" /> - <property name="joal.version.plus" value="${joal_base_version}-${joal.build.branch}-b${joal.build.number}-${joal.build.commit}-${version.timestamp}" /> <!-- Pull in GlueGen cpptasks build file --> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> @@ -94,6 +86,9 @@ --> <target name="init" depends="jogamp.env.init, gluegen.cpptasks.detect.os"> + <property name="joal.build.id" value="${version.timestamp}"/> + <property name="joal.version" value="${jogamp.version.base}-${version.timestamp}" /> + <!-- The location and name of the configuration ANT file that will - validate to ensure that all user-define variables are set. --> <property name="validate.user.properties" value="${make}/validate-properties.xml" /> @@ -192,6 +187,23 @@ <property name="archive.name" value="joal-${joal.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> + + <condition property="useLinuxARMv6SFOptions"> + <and> + <isset property="isLinuxARMv6"/> + <isset property="isAbiEabiGnuArmel"/> + <isset property="isCrosscompilation"/> + </and> + </condition> + <condition property="useLinuxARMv6HFOptions"> + <and> + <isset property="isLinuxARMv6"/> + <isset property="isAbiEabiGnuArmhf"/> + <isset property="isCrosscompilation"/> + </and> + </condition> + <echo message="useLinuxARMv6SFOptions ${useLinuxARMv6SFOptions}" /> + <echo message="useLinuxARMv6HFOptions ${useLinuxARMv6HFOptions}" /> </target> <!-- ================================================================== --> @@ -436,6 +448,10 @@ output.lib.name="joal" 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 --> <jar destfile="${build}/joal-natives-${os.and.arch}.jar"> <fileset dir="../${rootrel.build}/obj"> @@ -447,7 +463,7 @@ </jar> </target> - <target name="c.build.openal.soft.android" if="isAndroid"> + <target name="c.build.openal.soft.android" if="isAndroid" unless="c.build.openal.soft.done"> <property name="c.build.openal.soft.done" value="true" /> <mkdir dir="${build}/openal-soft" /> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> @@ -461,7 +477,7 @@ <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> - <target name="c.build.openal.soft.windows" if="isWindows"> + <target name="c.build.openal.soft.windows" if="isWindows" unless="c.build.openal.soft.done"> <property name="c.build.openal.soft.done" value="true" /> <mkdir dir="${build}/openal-soft" /> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> @@ -472,7 +488,7 @@ <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> - <target name="c.download.openal.soft.windows" if="isWindows"> + <target name="c.download.openal.soft.windows"> <property name="c.build.openal.soft.done" value="true" /> <!-- downloads the binaries of OpenAL-Soft for Windows as they aren't bundled with JOAL yet --> <get src="http://kcat.strangesoft.net/openal-soft-1.15.1-bin.zip" dest="." verbose="true" usetimestamp="true" /> @@ -494,10 +510,42 @@ <delete dir="openal-soft-1.15.1-bin" /> </target> - <target name="c.build.openal.soft.default" unless="c.build.openal.soft.done"> + <target name="c.build.openal.soft.gcc.x86_32" if="isI386" unless="c.build.openal.soft.done"> + <property name="c.build.openal.soft.done" value="true" /> + <mkdir dir="${build}/openal-soft" /> + <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> + <arg value="../../openal-soft"/> + <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-x86_32.cmake"/> + </exec> + <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> + </target> + + <target name="c.build.openal.soft.gcc.armv6.soft" if="useLinuxARMv6SFOptions" unless="c.build.openal.soft.done"> + <property name="c.build.openal.soft.done" value="true" /> + <mkdir dir="${build}/openal-soft" /> + <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> + <arg value="../../openal-soft"/> + <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-armv6.cmake"/> + </exec> + <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> + </target> + + <target name="c.build.openal.soft.gcc.armv6.hard" if="useLinuxARMv6HFOptions" unless="c.build.openal.soft.done"> + <property name="c.build.openal.soft.done" value="true" /> + <mkdir dir="${build}/openal-soft" /> + <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> + <arg value="../../openal-soft"/> + <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-armv6hf.cmake"/> + </exec> + <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> + </target> + + <target name="c.build.openal.soft.gcc.default" unless="c.build.openal.soft.done"> + <property name="c.build.openal.soft.done" value="true" /> <mkdir dir="${build}/openal-soft" /> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> <arg value="../../openal-soft"/> + <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-default.cmake"/> </exec> <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> @@ -513,7 +561,7 @@ </target> <target name="c.build.openal.soft" - depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.use-blobs, c.build.openal.soft.windows, c.build.openal.soft.android, c.build.openal.soft.default"> + depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.use-blobs, c.build.openal.soft.windows, c.build.openal.soft.android, c.build.openal.soft.gcc.x86_32, c.build.openal.soft.gcc.armv6.soft, c.build.openal.soft.gcc.armv6.hard, c.build.openal.soft.gcc.default"> <copy todir="../${rootrel.build}/obj" failonerror="false"> <fileset dir="${build}/openal-soft" erroronmissingdir="false"> <include name="*openal.${native.library.suffix}" /> @@ -526,16 +574,18 @@ <!-- - Build the joal.jar file. --> - <target name="jar"> + <target name="jar" depends="init"> <!-- Prepare the manifest --> <copy file="joalversion" tofile="tempversion" overwrite="true"> <filterset> - <filter token="VERSION" value="${joal.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${joal.version}"/> <filter token="SCM_BRANCH" value="${joal.build.branch}"/> <filter token="SCM_COMMIT" value="${joal.build.commit}"/> - <filter token="BASEVERSION" value="${joal_base_version}" /> + <filter token="BASEVERSION" value="${jogamp.version.base}" /> + <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> </filterset> </copy> @@ -553,7 +603,7 @@ <delete file="tempversion"/> </target> - <target name="android.package" if="isAndroid"> + <target name="android.package" depends="init" if="isAndroid"> <aapt.signed jarsrcdir="${src.java}" jarbuilddir="${build}" @@ -564,8 +614,8 @@ androidmanifest.path="resources/android/AndroidManifest-joal.xml" androidresources.path="resources/android/res-joal" jarmanifest.path="tempversion" - version.code="${joal_int_version}" - version.name="${joal.version.plus}" /> + version.code="${jogamp.version.int}" + version.name="${jogamp.version}" /> </target> <!-- ================================================================== --> @@ -740,7 +790,7 @@ <antcall target="jar" inheritRefs="true" /> </target> - <target name="tag.build"> + <target name="tag.build" depends="init"> <copy file="${gluegen.build}/artifact.properties" todir="${build}" overwrite="true" failonerror="false"/> <echo message='joal.build.number=${joal.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='joal.build.id=${joal.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/> diff --git a/make/joal-alc.cfg b/make/joal-alc.cfg index bd5a1d1..efba5a6 100755 --- a/make/joal-alc.cfg +++ b/make/joal-alc.cfg @@ -26,6 +26,8 @@ Import java.io.UnsupportedEncodingException Import java.util.* Import com.jogamp.openal.* Import jogamp.openal.* +Import java.security.AccessController +Import java.security.PrivilegedAction # Factor out the OpenAL constants into their own interface Ignore ^AL_.+ diff --git a/make/joal-alcabstract-CustomJavaCode.java b/make/joal-alcabstract-CustomJavaCode.java index 3420cc2..debadad 100755 --- a/make/joal-alcabstract-CustomJavaCode.java +++ b/make/joal-alcabstract-CustomJavaCode.java @@ -1,11 +1,15 @@ private static final ALCProcAddressTable alcProcAddressTable; static { - alcProcAddressTable = new ALCProcAddressTable(); - if(null==alcProcAddressTable) { - throw new RuntimeException("Couldn't instantiate ALCProcAddressTable"); - } - alcProcAddressTable.reset(ALImpl.alDynamicLookupHelper); + alcProcAddressTable = AccessController.doPrivileged(new PrivilegedAction<ALCProcAddressTable>() { + public ALCProcAddressTable run() { + final ALCProcAddressTable alcProcAddressTable = new ALCProcAddressTable(); + if(null==alcProcAddressTable) { + throw new RuntimeException("Couldn't instantiate ALCProcAddressTable"); + } + alcProcAddressTable.reset(ALImpl.alDynamicLookupHelper); + return alcProcAddressTable; + } } ); } public static ALCProcAddressTable getALCProcAddressTable() { return alcProcAddressTable; } diff --git a/make/joal-alext.cfg b/make/joal-alext.cfg index d57b9a3..da63612 100644 --- a/make/joal-alext.cfg +++ b/make/joal-alext.cfg @@ -31,6 +31,8 @@ Import java.io.UnsupportedEncodingException Import java.util.* Import com.jogamp.openal.* Import jogamp.openal.* +Import java.security.AccessController +Import java.security.PrivilegedAction # Factor out the OpenAL constants into their own interface Ignore ^AL_.+ diff --git a/make/joal-alextabstract-CustomJavaCode.java b/make/joal-alextabstract-CustomJavaCode.java index e73dc60..e467fc7 100644 --- a/make/joal-alextabstract-CustomJavaCode.java +++ b/make/joal-alextabstract-CustomJavaCode.java @@ -1,11 +1,15 @@ private static final ALExtProcAddressTable alExtProcAddressTable; static { - alExtProcAddressTable = new ALExtProcAddressTable(); - if(null==alExtProcAddressTable) { - throw new RuntimeException("Couldn't instantiate ALExtProcAddressTable"); - } - alExtProcAddressTable.reset(ALImpl.alDynamicLookupHelper); + alExtProcAddressTable = AccessController.doPrivileged(new PrivilegedAction<ALExtProcAddressTable>() { + public ALExtProcAddressTable run() { + final ALExtProcAddressTable alExtProcAddressTable = new ALExtProcAddressTable(); + if(null==alExtProcAddressTable) { + throw new RuntimeException("Couldn't instantiate ALExtProcAddressTable"); + } + alExtProcAddressTable.reset(ALImpl.alDynamicLookupHelper); + return alExtProcAddressTable; + } } ); } public static ALExtProcAddressTable getALExtProcAddressTable() { return alExtProcAddressTable; } diff --git a/make/joal-common-CustomJavaCode.java b/make/joal-common-CustomJavaCode.java index be6b8a7..5df6cfd 100644 --- a/make/joal-common-CustomJavaCode.java +++ b/make/joal-common-CustomJavaCode.java @@ -7,22 +7,21 @@ static { throw new RuntimeException("Couldn't instantiate ALProcAddressTable"); } - alDynamicLookupHelper = (DynamicLibraryBundle) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - return new DynamicLibraryBundle(new ALDynamicLibraryBundleInfo()); - } - }); - if(null==alDynamicLookupHelper) { - throw new RuntimeException("Null ALDynamicLookupHelper"); - } - if(!alDynamicLookupHelper.isToolLibLoaded()) { - throw new RuntimeException("Couln't load native AL library"); - } - if(!alDynamicLookupHelper.isLibComplete()) { - throw new RuntimeException("Couln't load native AL/JNI glue library"); - } - alProcAddressTable.reset(alDynamicLookupHelper); + alDynamicLookupHelper = AccessController.doPrivileged(new PrivilegedAction<DynamicLibraryBundle>() { + public DynamicLibraryBundle run() { + final DynamicLibraryBundle bundle = new DynamicLibraryBundle(new ALDynamicLibraryBundleInfo()); + if(null==bundle) { + throw new RuntimeException("Null ALDynamicLookupHelper"); + } + if(!bundle.isToolLibLoaded()) { + throw new RuntimeException("Couln't load native AL library"); + } + if(!bundle.isLibComplete()) { + throw new RuntimeException("Couln't load native AL/JNI glue library"); + } + alProcAddressTable.reset(bundle); + return bundle; + } } ); } public static ALProcAddressTable getALProcAddressTable() { return alProcAddressTable; } diff --git a/make/joalversion b/make/joalversion index ee7d012..93a934f 100755 --- a/make/joalversion +++ b/make/joalversion @@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community Implementation-Title: Java Bindings for OpenAL Runtime Environment Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community @@ -11,3 +12,7 @@ Implementation-URL: http://jogamp.org/ Extension-Name: com.jogamp.openal Implementation-Vendor-Id: com.jogamp Trusted-Library: true +Permissions: all-permissions +Name: jogamp/openal/ +Sealed: true +@JAR_CODEBASE_TAG@ diff --git a/make/joalversion-test b/make/joalversion-test index 43d9c28..388b171 100644 --- a/make/joalversion-test +++ b/make/joalversion-test @@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community Implementation-Title: Test Java Bindings for OpenAL Runtime Environment on Android Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community diff --git a/make/joalversion-test-android b/make/joalversion-test-android index 43d9c28..388b171 100644 --- a/make/joalversion-test-android +++ b/make/joalversion-test-android @@ -4,6 +4,7 @@ Specification-Version: @BASEVERSION@ Specification-Vendor: JogAmp Community Implementation-Title: Test Java Bindings for OpenAL Runtime Environment on Android Implementation-Version: @VERSION@ +Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh index 7822d14..40f2e34 100755 --- a/make/scripts/make.joal.all.android-armv6-cross.sh +++ b/make/scripts/make.joal.all.android-armv6-cross.sh @@ -1,5 +1,9 @@ #! /bin/sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh +fi + export NODE_LABEL=. export HOST_UID=jogamp @@ -80,13 +84,16 @@ export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arc # Need to add toolchain bins to the PATH. export PATH_VANILLA=$PATH -export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$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 \ diff --git a/make/scripts/make.joal.all.linux-armv6-cross.sh b/make/scripts/make.joal.all.linux-armv6-cross.sh index c499f12..22f9b18 100755 --- a/make/scripts/make.joal.all.linux-armv6-cross.sh +++ b/make/scripts/make.joal.all.linux-armv6-cross.sh @@ -2,11 +2,11 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi -PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabi/bin:$PATH +PATH=`pwd`/../../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true @@ -36,6 +36,13 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + ant \ -Drootrel.build=build-linux-armv6 \ $* 2>&1 | tee make.joal.all.linux-armv6-cross.log diff --git a/make/scripts/make.joal.all.linux-armv6.sh b/make/scripts/make.joal.all.linux-armv6.sh index 71ae116..b55e4a0 100755 --- a/make/scripts/make.joal.all.linux-armv6.sh +++ b/make/scripts/make.joal.all.linux-armv6.sh @@ -23,9 +23,13 @@ fi # -Dtarget.targetlevel=1.6 \ # -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-linux-armv6 \ $* 2>&1 | tee make.joal.all.linux-armv6.log diff --git a/make/scripts/make.joal.all.linux-armv6hf-cross.sh b/make/scripts/make.joal.all.linux-armv6hf-cross.sh index 78f1110..fd0eb52 100755 --- a/make/scripts/make.joal.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.joal.all.linux-armv6hf-cross.sh @@ -2,11 +2,11 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi -PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH +PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true @@ -36,10 +36,15 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + ant \ -Drootrel.build=build-linux-armv6hf \ $* 2>&1 | tee make.joal.all.linux-armv6hf-cross.log - - diff --git a/make/scripts/make.joal.all.linux-armv6hf.sh b/make/scripts/make.joal.all.linux-armv6hf.sh index 24ae228..a9d7b21 100755 --- a/make/scripts/make.joal.all.linux-armv6hf.sh +++ b/make/scripts/make.joal.all.linux-armv6hf.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-armv6hf.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-armv6hf.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi if [ -z "$ANT_PATH" ] ; then @@ -23,9 +23,13 @@ fi # -Dtarget.targetlevel=1.6 \ # -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-linux-armv6hf \ $* 2>&1 | tee make.joal.all.linux-armv6hf.log diff --git a/make/scripts/make.joal.all.linux-i586.sh b/make/scripts/make.joal.all.linux-i586.sh deleted file mode 100755 index ba4e621..0000000 --- a/make/scripts/make.joal.all.linux-i586.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-i586.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-i586.sh -fi - -if [ -z "$ANT_PATH" ] ; then - if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then - ANT_PATH=/usr/share/ant - export ANT_PATH - echo autosetting ANT_PATH to $ANT_PATH - fi -fi -if [ -z "$ANT_PATH" ] ; then - echo ANT_PATH does not exist, set it - exit -fi - -# -Drootrel.build=build-586 \ -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ - -ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ - -Drootrel.build=build-i586 \ - $* 2>&1 | tee make.joal.all.linux-i586.log diff --git a/make/scripts/make.joal.all.linux-x86.sh b/make/scripts/make.joal.all.linux-x86.sh new file mode 100755 index 0000000..1adf02c --- /dev/null +++ b/make/scripts/make.joal.all.linux-x86.sh @@ -0,0 +1,30 @@ +#! /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 + +if [ -z "$ANT_PATH" ] ; then + if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then + ANT_PATH=/usr/share/ant + export ANT_PATH + echo autosetting ANT_PATH to $ANT_PATH + fi +fi +if [ -z "$ANT_PATH" ] ; then + echo ANT_PATH does not exist, set it + exit +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.joal.all.linux-x86.log diff --git a/make/scripts/make.joal.all.linux-x86_64.sh b/make/scripts/make.joal.all.linux-x86_64.sh index 553f757..b2d4505 100755 --- a/make/scripts/make.joal.all.linux-x86_64.sh +++ b/make/scripts/make.joal.all.linux-x86_64.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh +if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then + . $SDIR/setenv-build-jogl-x86_64.sh fi if [ -z "$ANT_PATH" ] ; then @@ -18,14 +18,13 @@ if [ -z "$ANT_PATH" ] ; then exit fi -# -Drootrel.build=build-x86_64 \ -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.joal.all.linux-x86_64.log diff --git a/make/scripts/make.joal.all.macosx.sh b/make/scripts/make.joal.all.macosx.sh index 50eaf85..192ad1b 100755 --- a/make/scripts/make.joal.all.macosx.sh +++ b/make/scripts/make.joal.all.macosx.sh @@ -4,9 +4,19 @@ if [ -e /opt-share/etc/profile.ant ] ; then . /opt-share/etc/profile.ant fi +JAVA_HOME=`/usr/libexec/java_home -version 1.7` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH # -Dc.compiler.debug=true +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +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.joal.all.sh b/make/scripts/make.joal.all.sh new file mode 100755 index 0000000..a6b3a1e --- /dev/null +++ b/make/scripts/make.joal.all.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +SDIR=`dirname $0` + +$SDIR/make.joal.all.linux-armv6-cross.sh \ +&& $SDIR/make.joal.all.linux-armv6hf-cross.sh \ +&& $SDIR/make.joal.all.linux-x86_64.sh \ +&& $SDIR/make.joal.all.linux-x86.sh \ +&& $SDIR/make.joal.all.android-armv6-cross.sh \ diff --git a/make/scripts/make.joal.all.solaris-x86_64.sh b/make/scripts/make.joal.all.solaris-x86_64.sh index 46490e3..1548031 100755 --- a/make/scripts/make.joal.all.solaris-x86_64.sh +++ b/make/scripts/make.joal.all.solaris-x86_64.sh @@ -20,6 +20,13 @@ fi # -Drootrel.build=build-x86_64 \ +export SOURCE_LEVEL=1.6 +export TARGET_LEVEL=1.6 +export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + +#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" +export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" + ant \ -Drootrel.build=build-solaris-x86_64 \ $* 2>&1 | tee make.joal.all.solaris-x86_64.log diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat index 48a5110..203fe45 100755 --- a/make/scripts/make.joal.all.win32.bat +++ b/make/scripts/make.joal.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.6.0_35_x32
-set JAVA_HOME=c:\jdk1.6.0_35_x32
+set J2RE_HOME=c:\jre1.7.0_25_x32
+set JAVA_HOME=c:\jdk1.7.0_25_x32
set ANT_PATH=C:\apache-ant-1.8.2
set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
@@ -11,4 +11,11 @@ set LIB_GEN=%THISDIR%\lib set CLASSPATH=.;%THISDIR%\build-win32\classes
REM -Dc.compiler.debug=true
+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.joal.all.win32.log 2>&1
diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat index 4caaad7..2fc480a 100755 --- a/make/scripts/make.joal.all.win64.bat +++ b/make/scripts/make.joal.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.6.0_35_x64
-set JAVA_HOME=c:\jdk1.6.0_35_x64
+set J2RE_HOME=c:\jre1.7.0_25_x64
+set JAVA_HOME=c:\jdk1.7.0_25_x64
set ANT_PATH=C:\apache-ant-1.8.2
set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
@@ -12,4 +12,11 @@ set LIB_GEN=%THISDIR%\lib set CLASSPATH=.;%THISDIR%\build-win64\classes
REM -Dc.compiler.debug=true
+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 -Dc.compiler.debug=true -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.joal.all.win64.log 2>&1
diff --git a/openal-soft b/openal-soft -Subproject 4e35b8521dea1e1fdf940b7bc719cf3a349bbf2 +Subproject 0df1e1ad30a0990591be4779ccc3d0034a3b33e diff --git a/src/java/com/jogamp/openal/ALFactory.java b/src/java/com/jogamp/openal/ALFactory.java index 0889d85..b365cd8 100644 --- a/src/java/com/jogamp/openal/ALFactory.java +++ b/src/java/com/jogamp/openal/ALFactory.java @@ -68,10 +68,7 @@ public class ALFactory { static { Platform.initSingleton(); - final String choice= AccessController.doPrivileged(new PrivilegedAction<String>() { - public String run() { - return Debug.getProperty("joal.openal.lib", true, null); - } }); + final String choice = Debug.getProperty("joal.openal.lib", true); boolean useSystem = Platform.OSType.MACOS == Platform.OS_TYPE; // default if( null != choice ) { if( choice.equals("system") ) { diff --git a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java index 59765fe..efb88d1 100644 --- a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java +++ b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java @@ -40,8 +40,8 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.*; -public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { - private static List<String> glueLibNames; +public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { + private static final List<String> glueLibNames; static { AccessController.doPrivileged(new PrivilegedAction<Object>() { public Object run() { @@ -62,13 +62,23 @@ public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { protected ALDynamicLibraryBundleInfo() { } - /** FIXME: not default, maybe local ? **/ + /** + * <p> + * Returns <code>true</code>, + * since we might load the library and allow symbol access to subsequent libs. + * </p> + */ @Override - public boolean shallLinkGlobal() { return true; } - - /** default **/ + public final boolean shallLinkGlobal() { return true; } + + /** + * {@inheritDoc} + * <p> + * Returns <code>false</code>. + * </p> + */ @Override - public boolean shallLookupGlobal() { return false; } + public final boolean shallLookupGlobal() { return false; } @Override public final List<String> getGlueLibNames() { @@ -76,7 +86,7 @@ public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { } @Override - public List<List<String>> getToolLibNames() { + public final List<List<String>> getToolLibNames() { List<List<String>> libNamesList = new ArrayList<List<String>>(); final List<String> alSystemLibNames = new ArrayList<String>(); @@ -138,12 +148,12 @@ public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo { } @Override - public boolean useToolGetProcAdressFirst(String funcName) { + public final boolean useToolGetProcAdressFirst(String funcName) { return true; } @Override - public RunnableExecutor getLibLoaderExecutor() { + public final RunnableExecutor getLibLoaderExecutor() { return DynamicLibraryBundle.getDefaultRunnableExecutor(); } } diff --git a/src/java/jogamp/openal/Debug.java b/src/java/jogamp/openal/Debug.java index b73c955..098b640 100644 --- a/src/java/jogamp/openal/Debug.java +++ b/src/java/jogamp/openal/Debug.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2012 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 @@ -39,6 +40,9 @@ package jogamp.openal; +import java.security.AccessController; +import java.security.PrivilegedAction; + import com.jogamp.common.util.PropertyAccess; @@ -50,15 +54,16 @@ public class Debug extends PropertyAccess { private static boolean debugAll; static { - PropertyAccess.addTrustedPrefix("joal.", Debug.class); + AccessController.doPrivileged(new PrivilegedAction<Object>() { + public Object run() { + PropertyAccess.addTrustedPrefix("joal."); + return null; + } } ); + verbose = isPropertyDefined("joal.verbose", true); debugAll = isPropertyDefined("joal.debug", true); } - public static final boolean isPropertyDefined(final String property, final boolean jnlpAlias) { - return PropertyAccess.isPropertyDefined(property, jnlpAlias, null); - } - public static boolean verbose() { return verbose; } @@ -68,6 +73,6 @@ public class Debug extends PropertyAccess { } public static boolean debug(String subcomponent) { - return debugAll() || isPropertyDefined("joal.debug." + subcomponent, true, null); + return debugAll() || isPropertyDefined("joal.debug." + subcomponent, true); } } diff --git a/www/index.html b/www/index.html index a718931..c0aa73a 100644 --- a/www/index.html +++ b/www/index.html @@ -15,7 +15,7 @@ <ul> <li><a href="http://jogamp.org/">Home</a></li> <li><a href="../../joal-demos/www">Demos</a></li> - <li><a href="../../jogamp-next/javadoc/joal/javadoc/">JavaDoc</a></li> + <li><a href="../../deployment/jogamp-next/javadoc/joal/javadoc/">JavaDoc</a></li> <li><a href="../../gluegen/www">Gluegen</a></li> <li><a href="../../wiki/index.php/Jogl_FAQ">Wiki</a></li> <li><a href="../../blog/">Blogs</a></li> @@ -32,7 +32,7 @@ <li><a href="http://kcat.strangesoft.net/openal.html">OpenAL-Soft</a></li> <li><a href="../../joal-demos/www/">JOAL Tutorials and Demos</a></li> <li><a href="http://forum.jogamp.org/joal-f951297.html">JOAL Forums</a></li> - <li><a href="../../jogamp-next/javadoc/joal/javadoc/">JOAL / Sound3D JavaDoc</a></li> + <li><a href="../../deployment/jogamp-next/javadoc/joal/javadoc/">JOAL / Sound3D JavaDoc</a></li> </ul> </div> <div id="text"> |