Skip to content
The Jenkins Controller is preparing for shutdown. No new builds can be started.
Success

Changes

Summary

  1. Fix Bug 843: Remove  Platform's requirement and use of (details)
  2. Fix Bug 844: Cannot ctor URI w/ scheme alone, use string-based (details)
  3. Bug 845: Add support for one big-fat jar file [java classes plus all (details)
  4. Bug 845: Fix JNILibLoaderBase.addNativeJarLibsImpl(..) fat-jar case. (details)
  5. Bug 846: Add manual test case for One-Jar (using 0.97.1) (details)
  6. JNILibLoaderBase.addNativeJarLibsImpl(..): Cleanup debug message (details)
  7. IOUtil/JarUtil: Add more detail debug information for URI (details)
Commit 506ae5e9fd258db7bfe737999e769477a32643a7 by Sven Gothel
Fix Bug 843: Remove  Platform's requirement and use of TempJarCache.bootstrapNativeLib(),  allowing versatile use of 1st native jar file (big-java-jar w/  big-native-jar)

The remaining Platform dependency existed in IOUtil.copyStream2Stream(..), used by JarUtil.extract(..),
i.e. the MachineDescription's PAGE_SIZE.

Solved by using a const buffer size of 4096 bytes.
The file was modified src/java/com/jogamp/common/util/JarUtil.java (diff)
The file was modified src/java/com/jogamp/common/util/IOUtil.java (diff)
The file was modified src/java/com/jogamp/common/util/cache/TempJarCache.java (diff)
The file was modified src/java/com/jogamp/common/os/Platform.java (diff)
Commit 1a8d2c627dbab5234aea72a458c00b6bba28add0 by Sven Gothel
Fix Bug 844: Cannot ctor URI w/ scheme alone, use string-based concatenation native URI root and jar file.
The file was modified src/junit/com/jogamp/common/util/TestTempJarCache.java (diff)
The file was modified src/java/com/jogamp/common/util/IOUtil.java (diff)
The file was modified src/java/com/jogamp/common/jvm/JNILibLoaderBase.java (diff)
The file was modified src/java/com/jogamp/common/util/JarUtil.java (diff)
Commit 4aa1478b2e4f1401b08d093461b37a14c9501c29 by Sven Gothel
Bug 845: Add support for one big-fat jar file [java classes plus all native 'os.and.arch' libraries]

JNILibLoaderBase.addNativeJarLibsImpl(..):

If the modules's jar file contains the folder 'natives/<os.and.arch>/'
we assume a big-fat jar and attempt to load all native libraries from the same.

The test for above folder is performed via the class ClassLoader's getResource(..)
and is considered inexpensive.

If the folder exists and native libraries could be loaded, the method returns successfull.

Otherwise, the 'slim' jar file is attempted to be loaded, even if such folder exist.
The file was modified src/java/com/jogamp/common/jvm/JNILibLoaderBase.java (diff)
The file was modified src/java/com/jogamp/common/util/JarUtil.java (diff)
The file was modified src/java/com/jogamp/common/util/cache/TempJarCache.java (diff)
The file was modified src/junit/com/jogamp/common/util/TestTempJarCache.java (diff)
Commit b05f716cbcbc379588050c8f3d91579b3a14ec88 by Sven Gothel
Bug 845: Fix JNILibLoaderBase.addNativeJarLibsImpl(..) fat-jar case.

Always use the jar-basename when calling TempJarCache.addNativeLibs(..),
otherwise it is mapped and loaded multiple times leading to different native libraries.

Simplify addNativeJarLibsImpl(..) argument semantics by passing complete jarBasename
and nativeJarBasename (w/ suffix).

Added manual test scripts validating [gluegen + jogl] usage
with multi (Bug 843) and fat (Bug 845) jar configurations.
The file was addedtest/TestMultiAndFatJar/make-fat_and_multi.sh (diff)
The file was modified src/java/com/jogamp/common/jvm/JNILibLoaderBase.java (diff)
The file was addedtest/TestMultiAndFatJar/run-fat.sh (diff)
The file was addedtest/TestMultiAndFatJar/run-multi.sh (diff)
The file was modified src/java/com/jogamp/common/util/cache/TempJarCache.java (diff)
Commit 01c5d59c5245068b0d005ccbb64f8d0aa5165f12 by Sven Gothel
Bug 846: Add manual test case for One-Jar (using 0.97.1)

Note: One-Jar lacks support of a URL handler for it's
jar-in-jar files and hence we would need to extract the jar-in-jar resources w/ our TempJarCache
from one one-jar file .. too bad. Looks like it's incomplete.
The file was modified test/TestMultiAndFatJar/run-fat.sh (diff)
The file was addedtest/TestEclipse_JarInJar/make-jarinjar.sh (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/lib/README.txt (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/one-jar/build.onejar.xml (diff)
The file was addedtest/TestOneJar_InJar/one-jar-license.txt (diff)
The file was addedtest/TestOneJar_InJar/run-one.sh (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/ide/eclipse/test-jogamp01 (JarLaunch build).launch (diff)
The file was modified test/TestMultiAndFatJar/run-multi.sh (diff)
The file was addedtest/TestEclipse_JarInJar/run-jarinjar.sh (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/ide/eclipse/jogamp01-suite.launch (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/one-jar/dist/one-jar-boot-0.97.jar (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/junit/jogamp/test/Jogamp01Suite.java (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/build.xml (diff)
The file was addedtest/TestEclipse_JarInJar/lala02.orig.jar (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/one-jar/dist/one-jar-ant-task.xml (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/src/jogamp/main/Jogamp01Main.java (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/one-jar/dist/one-jar-ant-task-0.97.jar (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/test/jogamp/test/Test.java (diff)
The file was addedtest/TestOneJar_InJar/make-one_jar.sh (diff)
The file was addedtest/TestOneJar_InJar/jogamp01/one-jar/lib/junit-3.8.1.jar (diff)
Commit 3c9812c130fac9237a2dc2e18a6639ec3583eed7 by Sven Gothel
JNILibLoaderBase.addNativeJarLibsImpl(..): Cleanup debug message creation.
The file was modified src/java/com/jogamp/common/jvm/JNILibLoaderBase.java (diff)
Commit ca7a1864a1624539048809d0a1c491f57c145d15 by Sven Gothel
IOUtil/JarUtil: Add more detail debug information for URI transformation; IOUtil.toURL(..) handle exception at 'new File(uri)'
The file was modified src/java/com/jogamp/common/util/IOUtil.java (diff)
The file was modified src/java/com/jogamp/common/util/JarUtil.java (diff)