diff options
| -rw-r--r-- | src/java/com/jogamp/common/jvm/JNILibLoaderBase.java | 2 | ||||
| -rwxr-xr-x | src/java/com/jogamp/common/os/DynamicLibraryBundle.java | 32 | ||||
| -rwxr-xr-x | src/java/com/jogamp/common/os/NativeLibrary.java | 8 |
3 files changed, 21 insertions, 21 deletions
diff --git a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java index 8d26bf4..e80c225 100644 --- a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java +++ b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java @@ -214,7 +214,7 @@ public class JNILibLoaderBase { throw (UnsatisfiedLinkError) new UnsatisfiedLinkError("can not load library "+libraryName).initCause(e); } } else { - // System.out.println("sun.boot.library.path=" + Debug.getProperty("sun.boot.library.path", false)); + // System.err.println("sun.boot.library.path=" + Debug.getProperty("sun.boot.library.path", false)); System.loadLibrary(libraryName); } } diff --git a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java index 56029a2..823b128 100755 --- a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java +++ b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java @@ -74,7 +74,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { } this.info = info; if(DEBUG) { - System.out.println("DynamicLibraryBundle.init start with: "+info.getClass().getName()); + System.err.println("DynamicLibraryBundle.init start with: "+info.getClass().getName()); } nativeLibraries = new ArrayList(); toolLibNames = info.getToolLibNames(); @@ -89,13 +89,13 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { toolGetProcAddressHandle = 0; } if(DEBUG) { - System.out.println("DynamicLibraryBundle.init Summary: "+info.getClass().getName()); - System.out.println(" toolGetProcAddressFuncNameList: "+toolGetProcAddressFuncNameList); - System.out.println(" Tool Lib Names : "+toolLibNames); - System.out.println(" Tool Lib Loaded: "+getToolLibLoadedNumber()+"/"+getToolLibNumber()+", complete "+isToolLibComplete()); - System.out.println(" Glue Lib Names : "+glueLibNames); - System.out.println(" Glue Lib Loaded: "+getGlueLibLoadedNumber()+"/"+getGlueLibNumber()+", complete "+isGlueLibComplete()); - System.out.println(" All Complete: "+isLibComplete()); + System.err.println("DynamicLibraryBundle.init Summary: "+info.getClass().getName()); + System.err.println(" toolGetProcAddressFuncNameList: "+toolGetProcAddressFuncNameList); + System.err.println(" Tool Lib Names : "+toolLibNames); + System.err.println(" Tool Lib Loaded: "+getToolLibLoadedNumber()+"/"+getToolLibNumber()+", complete "+isToolLibComplete()); + System.err.println(" Glue Lib Names : "+glueLibNames); + System.err.println(" Glue Lib Loaded: "+getGlueLibLoadedNumber()+"/"+getGlueLibNumber()+", complete "+isGlueLibComplete()); + System.err.println(" All Complete: "+isLibComplete()); } } @@ -156,7 +156,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { String name = (String) iter.next(); aptr = dynamicLookupFunctionOnLibs(name); if(DEBUG) { - System.out.println("getToolGetProcAddressHandle: "+name+" -> 0x"+Long.toHexString(aptr)); + System.err.println("getToolGetProcAddressHandle: "+name+" -> 0x"+Long.toHexString(aptr)); } } return aptr; @@ -175,14 +175,14 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { private void loadLibraries() { if( null == toolLibNames || toolLibNames.size() == 0) { if(DEBUG) { - System.out.println("No Tool native library names given"); + System.err.println("No Tool native library names given"); } return; } if( null == glueLibNames || glueLibNames.size() == 0 ) { if(DEBUG) { - System.out.println("No Glue native library names given"); + System.err.println("No Glue native library names given"); } return; } @@ -218,21 +218,21 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { lib = loadFirstAvailable(libNames, loader, info.shallLinkGlobal()); if ( null == lib ) { if(DEBUG) { - System.out.println("Unable to load any Tool library of: "+libNames); + System.err.println("Unable to load any Tool library of: "+libNames); } } else { nativeLibraries.add(lib); toolLibLoaded[i]=true; toolLibLoadedNumber++; if(DEBUG) { - System.out.println("Loaded Tool library: "+lib); + System.err.println("Loaded Tool library: "+lib); } } } } if( !isToolLibLoaded() ) { if(DEBUG) { - System.out.println("No Tool libraries loaded"); + System.err.println("No Tool libraries loaded"); } return; } @@ -246,12 +246,12 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { try { res = GlueJNILibLoaderBase.loadLibrary(libName, ignoreError); if(DEBUG && !res) { - System.out.println("Info: Could not load JNI/Glue library: "+libName); + System.err.println("Info: Could not load JNI/Glue library: "+libName); } } catch (UnsatisfiedLinkError e) { res = false; if(DEBUG) { - System.out.println("Unable to load JNI/Glue library: "+libName); + System.err.println("Unable to load JNI/Glue library: "+libName); e.printStackTrace(); } } diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java index 97aabae..2c7e596 100755 --- a/src/java/com/jogamp/common/os/NativeLibrary.java +++ b/src/java/com/jogamp/common/os/NativeLibrary.java @@ -181,7 +181,7 @@ public class NativeLibrary implements DynamicLookupHelper { for (Iterator iter = possiblePaths.iterator(); iter.hasNext(); ) { String path = (String) iter.next(); if (DEBUG) { - System.out.println("Trying to load " + path); + System.err.println("Trying to load " + path); } ensureNativeLibLoaded(); long res; @@ -192,14 +192,14 @@ public class NativeLibrary implements DynamicLookupHelper { } if (res != 0) { if (DEBUG) { - System.out.println("Successfully loaded " + path + ": res = 0x" + Long.toHexString(res)); + System.err.println("Successfully loaded " + path + ": res = 0x" + Long.toHexString(res)); } return new NativeLibrary(res, path); } } if (DEBUG) { - System.out.println("Did not succeed in loading (" + windowsLibName + ", " + unixLibName + ", " + macOSXLibName + ")"); + System.err.println("Did not succeed in loading (" + windowsLibName + ", " + unixLibName + ", " + macOSXLibName + ")"); } // For now, just return null to indicate the open operation didn't @@ -275,7 +275,7 @@ public class NativeLibrary implements DynamicLookupHelper { // from the LWJGL library String clPath = getPathFromClassLoader(libName, loader); if (DEBUG) { - System.out.println("Class loader path to " + libName + ": " + clPath); + System.err.println("Class loader path to " + libName + ": " + clPath); } if (clPath != null) { paths.add(clPath); |