From 022c31eefaa0c11fbc069fd35cf5311a556c9ae5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 24 Jan 2014 13:05:11 +0100 Subject: Bug 856 - Android: Support dual ABI (x86 i686 *and* ARMv7arm), i.e. pick 'best' ABI - Use 'os.arch' as a prelim CPUType for MachineDescription - Always attempt to load a binary and parse it's elf header - Linux: self-exe - Android: gluegen-rt library - Other: java lib - Always use details (ABI) if ARM - Android: Check CPU_TYPE and CPU_TYPE2 // FIXME / HACK: // We use sCPUType for MachineDescriptionRuntime.getStatic() // until we have determined the final CPU_TYPE, etc. // MachineDescriptionRuntime gets notified via MachineDescriptionRuntime.notifyPropsInitialized() below. // // We could use Elf Ehdr's machine value to determine the bit-size // used for it's offset table! // However, 'os.arch' should be a good guess for this task. Tested manually on - Linux x86, x86_64, armhf (raspi) - Android intel and arm - Windows x86_64 - OSX x86_64 --- make/scripts/adb-logcat.sh | 2 +- make/scripts/java-win32.bat | 3 ++- make/scripts/java-win64.bat | 3 ++- make/scripts/runtest-x32.bat | 4 ++-- make/scripts/runtest-x64.bat | 4 ++-- make/scripts/runtest.sh | 8 ++++---- 6 files changed, 13 insertions(+), 11 deletions(-) (limited to 'make/scripts') diff --git a/make/scripts/adb-logcat.sh b/make/scripts/adb-logcat.sh index ea4be3d..443011f 100755 --- a/make/scripts/adb-logcat.sh +++ b/make/scripts/adb-logcat.sh @@ -1,4 +1,4 @@ sdir=`dirname $0` adb $* logcat -c -adb $* logcat +adb $* logcat 2>&1 | tee adb-logcat.log diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index 12a95a3..b59a0cf 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -13,7 +13,8 @@ set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\test\build\gluegen-test.jar;lib\ echo CP_ALL %CP_ALL% -set D_ARGS="-Djogamp.debug.IOUtil" +set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" +REM set D_ARGS="-Djogamp.debug.IOUtil" REM set D_ARGS="-Djogamp.debug=all" %J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1 diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index c8e6be8..cb610e0 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -13,7 +13,8 @@ set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\test\build\gluegen-test.jar;lib\ echo CP_ALL %CP_ALL% -set D_ARGS="-Djogamp.debug.IOUtil" +set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" +REM set D_ARGS="-Djogamp.debug.IOUtil" REM set D_ARGS="-Djogamp.debug=all" %J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1 diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat index a594f4a..5e358a8 100755 --- a/make/scripts/runtest-x32.bat +++ b/make/scripts/runtest-x32.bat @@ -1,6 +1,6 @@ -REM scripts\java-win32.bat com.jogamp.common.GlueGenVersion +scripts\java-win32.bat com.jogamp.common.GlueGenVersion REM scripts\java-win32.bat com.jogamp.common.util.TestVersionInfo REM scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter REM scripts\java-win32.bat com.jogamp.common.os.TestElfReader01 -scripts\java-win32.bat com.jogamp.common.util.TestIOUtilURIHandling +REM scripts\java-win32.bat com.jogamp.common.util.TestIOUtilURIHandling diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat index d356b30..6451e5d 100755 --- a/make/scripts/runtest-x64.bat +++ b/make/scripts/runtest-x64.bat @@ -1,11 +1,11 @@ -REM scripts\java-win64.bat com.jogamp.common.GlueGenVersion +scripts\java-win64.bat com.jogamp.common.GlueGenVersion REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter REM scripts\java-win64.bat com.jogamp.common.os.TestElfReader01 REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtil01 REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtilURICompose -scripts\java-win64.bat com.jogamp.common.util.TestIOUtilURIHandling +REM scripts\java-win64.bat com.jogamp.common.util.TestIOUtilURIHandling REM scripts\java-win64.bat com.jogamp.common.net.TestUrisWithAssetHandler REM scripts\java-win64.bat com.jogamp.common.net.TestURIQueryProps diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 7651bc5..832d7af 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -41,7 +41,7 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup" #D_ARGS="-Djogamp.debug.TraceLock" -#D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary" +D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary" #D_ARGS="-Djogamp.debug.JarUtil" #D_ARGS="-Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.TempFileCache" @@ -52,7 +52,7 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.Lock" #D_ARGS="-Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.debug.Lock.TraceLock" -D_ARGS="-Djogamp.debug.IOUtil" +#D_ARGS="-Djogamp.debug.IOUtil" #D_ARGS="-Djogamp.debug=all" function onetest() { @@ -95,8 +95,8 @@ function onetest() { #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtilURICompose 2>&1 | tee -a $LOG -#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG -onetest com.jogamp.common.util.TestIOUtilURIHandling 2>&1 | tee -a $LOG +onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestIOUtilURIHandling 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG -- cgit v1.2.3