diff options
author | Sven Gothel <[email protected]> | 2019-08-18 23:53:27 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-08-18 23:53:27 +0200 |
commit | 6f987f16c808242b61263d76bd7d72e148a0af24 (patch) | |
tree | 683d91bc5605e4a10897e70b2dafd65bc5680b46 /src/java | |
parent | 175392ceeba5f69aa5ac90e4021490ade742a323 (diff) |
Bug 1363: Java 11: Complete renaming JEP 178 compatible native lib basename gluegen-rt -> gluegen_rt
- Fix finding native library for Elf parsing
- Fix one unit test
- Fix comments
Completes commit 330dad069dee5a0cc0480cf5cd9052000004223a
Diffstat (limited to 'src/java')
6 files changed, 8 insertions, 8 deletions
diff --git a/src/java/com/jogamp/common/nio/AbstractBuffer.java b/src/java/com/jogamp/common/nio/AbstractBuffer.java index 2da6440..a774c39 100644 --- a/src/java/com/jogamp/common/nio/AbstractBuffer.java +++ b/src/java/com/jogamp/common/nio/AbstractBuffer.java @@ -48,7 +48,7 @@ public abstract class AbstractBuffer<B extends AbstractBuffer> implements Native protected int position; static { - Platform.initSingleton(); // loads native gluegen-rt library + Platform.initSingleton(); // loads native gluegen_rt library } /** diff --git a/src/java/com/jogamp/common/nio/PointerBuffer.java b/src/java/com/jogamp/common/nio/PointerBuffer.java index e9138ac..7498756 100644 --- a/src/java/com/jogamp/common/nio/PointerBuffer.java +++ b/src/java/com/jogamp/common/nio/PointerBuffer.java @@ -53,7 +53,7 @@ public class PointerBuffer extends AbstractBuffer<PointerBuffer> { protected LongObjectHashMap dataMap = null; static { - Platform.initSingleton(); // loads native gluegen-rt library + Platform.initSingleton(); // loads native gluegen_rt library } /** no backup array, use for direct usage only */ diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java index bbe97af..2a42bed 100644 --- a/src/java/com/jogamp/common/os/NativeLibrary.java +++ b/src/java/com/jogamp/common/os/NativeLibrary.java @@ -209,7 +209,7 @@ public final class NativeLibrary implements DynamicLookupHelper { macOSXLibName, searchSystemPath, searchSystemPathFirst, loader); - Platform.initSingleton(); // loads native gluegen-rt library + Platform.initSingleton(); // loads native gluegen_rt library final DynamicLinker dynLink = getDynamicLinker(); diff --git a/src/java/com/jogamp/common/os/Platform.java b/src/java/com/jogamp/common/os/Platform.java index 1bd3b9d..ca3d60b 100644 --- a/src/java/com/jogamp/common/os/Platform.java +++ b/src/java/com/jogamp/common/os/Platform.java @@ -321,7 +321,7 @@ public class Platform extends PlatformPropsImpl { DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl); // JVM bug workaround - JVMUtil.initSingleton(); // requires gluegen-rt, one-time init. + JVMUtil.initSingleton(); // requires gluegen_rt, one-time init. // AWT Headless determination if( !PropertyAccess.getBooleanProperty("java.awt.headless", true) && @@ -354,7 +354,7 @@ public class Platform extends PlatformPropsImpl { } /** - * kick off static initialization of <i>platform property information</i> and <i>native gluegen-rt lib loading</i> + * kick off static initialization of <i>platform property information</i> and <i>native gluegen_rt lib loading</i> */ public static void initSingleton() { } diff --git a/src/java/jogamp/common/os/MachineDataInfoRuntime.java b/src/java/jogamp/common/os/MachineDataInfoRuntime.java index 625e537..0b920f5 100644 --- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java +++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java @@ -128,7 +128,7 @@ public class MachineDataInfoRuntime { private static MachineDataInfo getRuntimeImpl() { try { - Platform.initSingleton(); // loads native gluegen-rt library + Platform.initSingleton(); // loads native gluegen_rt library } catch (final UnsatisfiedLinkError err) { return null; } diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java index 2900c99..1d38f30 100644 --- a/src/java/jogamp/common/os/PlatformPropsImpl.java +++ b/src/java/jogamp/common/os/PlatformPropsImpl.java @@ -405,7 +405,7 @@ public abstract class PlatformPropsImpl { * For Elf parsing one of the following binaries is used: * <ul> * <li>Linux: Current executable</li> - * <li>Android: Found gluegen-rt library</li> + * <li>Android: Found gluegen_rt library</li> * <li>Other: A found java/jvm native library.</li> * </ul> * </p> @@ -417,7 +417,7 @@ public abstract class PlatformPropsImpl { File file = null; try { if( OSType.ANDROID == osType ) { - file = new File(NativeLibrary.findLibrary("gluegen-rt", PlatformPropsImpl.class.getClassLoader())); + file = new File(NativeLibrary.findLibrary("gluegen_rt", PlatformPropsImpl.class.getClassLoader())); } else { if( OSType.LINUX == osType ) { file = new File("/proc/self/exe"); |