From 6f987f16c808242b61263d76bd7d72e148a0af24 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 18 Aug 2019 23:53:27 +0200 Subject: 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 --- src/java/com/jogamp/common/nio/AbstractBuffer.java | 2 +- src/java/com/jogamp/common/nio/PointerBuffer.java | 2 +- src/java/com/jogamp/common/os/NativeLibrary.java | 2 +- src/java/com/jogamp/common/os/Platform.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/java/com') 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 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 { 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 platform property information and native gluegen-rt lib loading + * kick off static initialization of platform property information and native gluegen_rt lib loading */ public static void initSingleton() { } -- cgit v1.2.3