1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Index: gluegen2/src/junit/com/jogamp/common/util/TestTempJarCache.java
===================================================================
--- gluegen2.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java
+++ gluegen2/src/junit/com/jogamp/common/util/TestTempJarCache.java
@@ -196,8 +196,8 @@ public class TestTempJarCache extends Si
@Test
public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
- final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen-rt-natives-"+Platform.getOSAndArch()+".jar");
- final String libBaseName = "gluegen-rt";
+ final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar");
+ final String libBaseName = "gluegen2-rt";
final ClassLoader cl = getClass().getClassLoader();
final Uri jarUri = JarUtil.getJarUri(TempJarCache.class.getName(), cl);
Index: gluegen2/src/java/com/jogamp/common/os/Platform.java
===================================================================
--- gluegen2.orig/src/java/com/jogamp/common/os/Platform.java
+++ gluegen2/src/java/com/jogamp/common/os/Platform.java
@@ -256,7 +256,7 @@ public class Platform extends PlatformPr
private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
/** fixed basename of JAR file and native library */
- private static final String libBaseName = "gluegen-rt";
+ private static final String libBaseName = "gluegen2-rt";
//
// static initialization order:
@@ -317,7 +317,7 @@ public class Platform extends PlatformPr
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
// JVM bug workaround
- JVMUtil.initSingleton(); // requires gluegen-rt, one-time init.
+ JVMUtil.initSingleton(); // requires gluegen2-rt, one-time init.
// AWT Headless determination
if( !PropertyAccess.getBooleanProperty("java.awt.headless", true) &&
@@ -350,7 +350,7 @@ public class Platform extends PlatformPr
}
/**
- * 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 gluegen2-rt lib loading</i>
*/
public static void initSingleton() { }
Index: gluegen2/make/build.xml
===================================================================
--- gluegen2.orig/make/build.xml
+++ gluegen2/make/build.xml
@@ -420,7 +420,7 @@
<property name="c.compiler.src.files.common" value="src/native/common/*.c" />
<property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" />
- <property name="output.lib.name" value="gluegen-rt" />
+ <property name="output.lib.name" value="gluegen2-rt" />
<condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition>
<condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition>
<condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition>
@@ -497,13 +497,13 @@
<antcall target="c.manifest" inheritRefs="true" />
<native.tag.jar objdir="${build}/obj"
- nativejarfile="${build}/gluegen-rt-natives-${os.and.arch}.jar"
+ nativejarfile="${build}/gluegen2-rt-natives-${os.and.arch}.jar"
manifestfile="${build}/Manifest-rt-natives.temp"
module="common"
- includelibs="*gluegen-rt.${native.library.suffix}" />
+ includelibs="*gluegen2-rt.${native.library.suffix}" />
<!-- Produce duplicates for different configurations, since non-native-jar aliasing (Bug 1023/Bug 1024) -->
- <copy file="${build}/gluegen-rt-natives-${os.and.arch}.jar" tofile="${build}/gluegen-rt-android-natives-${os.and.arch}.jar"/>
+ <copy file="${build}/gluegen2-rt-natives-${os.and.arch}.jar" tofile="${build}/gluegen-rt-android-natives-${os.and.arch}.jar"/>
</target>
<!-- ================================================================== -->
|
