Skip to content
Success

Changes

Summary

  1. Changes to make gluegen build with NDK r7 (details)
  2. Update and cleanup cpptasks build & archive. (details)
  3. android crosscompile script, use android-ndk-r7b but favor generic (details)
  4. cpptasks: Cleanup patch file and move single patches to obsolete for (details)
  5. make.gluegen.all.linux-armv7-cross.sh: Use common TARGET_PLATFORM_ROOT (details)
  6. android build/test fixes and refinement (details)
  7. build: Move c.compiler.debug, c.compiler.use-debug and (details)
  8. android test: Specify 'java.io.tempdir' and add TestJarsInJar.apk / (details)
  9. TempJarCache: Check for NULL jarURL and reuse contains queries (details)
  10. Don't build and use gluegen.apk (compile time only) ; Don't test (details)
  11. gluegen-cpptasks-android-armv7: Add 'gluegen.cpptasks.detect.os.custom' (details)
Commit d51d2aaad01d1c8188193a7913c6ef0fc38ea798 by edwin.vane
Changes to make gluegen build with NDK r7

- A bug in cpptasks was getting in the way of a working build with NDK
  r7. A local patch to cpptasks fixed the bug.
  - The patch is added as make/lib/cpptasks_gcclinker.patch and applies
    cleanly to cpptasts @ revision 177.
  - The result of building cpptasks r177 with this patch is part of the
    commit as well.
- Cleaned up and simplified the android cross-compile script in
  make/scripts.
- Cleaned up arguments passed to gcc for compiling and linking to look
  more like the command lines used for building NDK samples.
  - Some differences are necessary as cpptasks won't let us specify any
    binary other than 'gcc' for building. See
    gluegen-cpptasks-android-armv7.xml for comments on the matter.
- Thinking forward to x86 support, generalized jogamp-androidtasks.xml
  to install the gluegen shared library in a subdirectory of image/lib
  named for the targetted ABI for packaging with aapt. This file is
  no-longer ARM-specific.
The file was modifiedmake/jogamp-androidtasks.xml (diff)
The file was addedmake/lib/cpptasks_gcclinker.patch (diff)
The file was modifiedmake/lib/gluegen-cpptasks-android-armv7.xml (diff)
The file was modifiedmake/build-test.xml (diff)
The file was modifiedmake/scripts/make.gluegen.all.android-armv7-cross.sh (diff)
The file was modifiedmake/lib/cpptasks.jar (diff)
The file was modifiedmake/build.xml (diff)
Commit b31f1885fab139fb3dde9f04304406402650eb83 by Sven Gothel
Update and cleanup cpptasks build & archive.

Including Edwin Vane's work in commit d51d2aaad01d1c8188193a7913c6ef0fc38ea798
The file was removedmake/lib/archive/cpptasks-1.0b5-darwin-patch.diff (diff)
The file was modifiedmake/lib/cpptasks.jar (diff)
The file was addedmake/lib/archive/cpptasks/obsolete/cpptasks-patch-suncc-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz (diff)
The file was removedmake/lib/archive/cpptasks.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b (diff)
The file was removedmake/lib/archive/cpptasks.jar-orig-c91f003551542c2aab62dd8ef89a7894c7e50689 (diff)
The file was removedmake/lib/archive/cpptasks-1.0b5.zip (diff)
The file was addedmake/lib/archive/cpptasks/cpptasks-1.0b5.zip (diff)
The file was removedmake/lib/archive/CppTasksGCCNamespaceHack.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b (diff)
The file was modifiedmake/lib/cpptasks-version.txt (diff)
The file was removedmake/lib/archive/cpptasks-patch-orig-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz (diff)
The file was addedmake/lib/archive/cpptasks/cpptasks-1.0b5-darwin.patch (diff)
The file was addedmake/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch (diff)
The file was addedmake/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt (diff)
The file was removedmake/lib/cpptasks_gcclinker.patch (diff)
The file was addedmake/lib/archive/cpptasks/cpptasks-1.0b5-gcclinker.patch (diff)
Commit bf03a3c4db9550f890e7ea5b0b46962ecaa66a92 by Sven Gothel
android crosscompile script, use android-ndk-r7b but favor generic android-ndk (sym-link)
The file was modifiedmake/scripts/make.gluegen.all.android-armv7-cross.sh (diff)
Commit cb966d7feb89dd1ad811502c3f2aa1d37a503329 by Sven Gothel
cpptasks: Cleanup patch file and move single patches to obsolete for clarification
The file was removedmake/lib/archive/cpptasks/cpptasks-1.0b5-darwin.patch (diff)
The file was modifiedmake/lib/cpptasks.jar (diff)
The file was modifiedmake/lib/archive/cpptasks/cpptasks-1.0b5.patches.txt (diff)
The file was addedmake/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-darwin.patch (diff)
The file was addedmake/lib/archive/cpptasks/obsolete/cpptasks-1.0b5-gcclinker.patch (diff)
The file was modifiedmake/lib/archive/cpptasks/cpptasks-1.0b5-accumulated.patch (diff)
The file was removedmake/lib/archive/cpptasks/cpptasks-1.0b5-gcclinker.patch (diff)
Commit eb68551873f47261a812e81427fc4ba7e55b197a by Sven Gothel
make.gluegen.all.linux-armv7-cross.sh: Use common TARGET_PLATFORM_ROOT
The file was modifiedmake/scripts/make.gluegen.all.linux-armv7-cross.sh (diff)
Commit f303bc43437e2fa6ccc8d3f8facd2e5dc7c55069 by Sven Gothel
android build/test fixes and refinement

remote test fix:
  - run targetcommand w/ explicit root via 'su'
  - rsync: more excludes, only use '-rt'
  - explicit chmod 644 on results
  - adb commands include naming of remote machine: -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT}

GlueGen-cpptasks-android-armv7:
  - use unique project name (warning)
  - gcc +
     -fpic
     -D__unix__
  - ld +
     -fpic
     -nostdlib
     -Bdynamic
     -Wl,-dynamic-linker,/system/bin/linker
     -Wl,-z,nocopyreloc
     explicit add 'dl' to list of libs
The file was modifiedmake/build-test.xml (diff)
The file was modifiedmake/scripts/make.gluegen.all.android-armv7-cross.sh (diff)
The file was modifiedmake/lib/gluegen-cpptasks-android-armv7.xml (diff)
Commit 67a89a1d9ff17c4d6815e21502c55bf533b62416 by Sven Gothel
build: Move c.compiler.debug, c.compiler.use-debug and c.compiler.optimise from build.xml -> gluegen-cpptasks-base.xml

- unifies definition
- echo values
The file was modifiedmake/gluegen-cpptasks-base.xml (diff)
The file was modifiedmake/build.xml (diff)
Commit 5a68344ea254e70d88c754a011fd06d2bb87aaa7 by Sven Gothel
android test: Specify 'java.io.tempdir' and add TestJarsInJar.apk / Disable most of tests in TestJarUtil
The file was modifiedsrc/junit/com/jogamp/junit/util/JunitTracer.java (diff)
The file was addedmake/lib/TestJarsInJar.apk (diff)
The file was modifiedmake/build-test.xml (diff)
The file was modifiedsrc/junit/com/jogamp/common/util/TestJarUtil.java (diff)
Commit be3c68fada7cf9503f3d501d29283628e0056bcb by Sven Gothel
TempJarCache: Check for NULL jarURL and reuse contains queries
The file was modifiedsrc/java/com/jogamp/common/util/cache/TempJarCache.java (diff)
Commit 238a669b5163e76d79dcf298b3c63381821e01ba by Sven Gothel
Don't build and use gluegen.apk (compile time only) ; Don't test classloader -> JarURL on Android

All [remaining] tests passed on Android!
The file was modifiedsrc/junit/com/jogamp/gluegen/test/junit/generation/PCPPTest.java (diff)
The file was modifiedmake/build.xml (diff)
The file was modifiedmake/build-test.xml (diff)
The file was addedmake/scripts/adb-uninstall-all.sh (diff)
The file was modifiedsrc/junit/com/jogamp/common/util/TestTempJarCache.java (diff)
Commit 85d3068b842af1aa50295a652e037ecb2510d765 by Sven Gothel
gluegen-cpptasks-android-armv7: Add 'gluegen.cpptasks.detect.os.custom' target which makes it self-contained

build script and jenkins-node startup-script solely use env-vars.

Remove env. TARGET_ARCH, which was same as TARGET_TRIPPLE.
The file was modifiedmake/scripts/make.gluegen.all.android-armv7-cross.sh (diff)
The file was modifiedmake/lib/gluegen-cpptasks-android-armv7.xml (diff)