--- gluegen/make/build.xml.orig 2015-10-09 04:18:28 UTC
+++ gluegen/make/build.xml
@@ -375,10 +375,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -408,7 +422,7 @@
-
+
@@ -605,7 +619,7 @@
-
+
@@ -613,7 +627,7 @@
-
+
@@ -763,7 +777,7 @@
-
+
@@ -842,7 +856,7 @@
-
+
--- gluegen/src/java/com/jogamp/common/os/Platform.java.orig 2015-10-09 04:18:28 UTC
+++ gluegen/src/java/com/jogamp/common/os/Platform.java
@@ -256,7 +256,7 @@ public class Platform extends PlatformPropsImpl {
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:
--- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2015-10-09 04:18:28 UTC
+++ gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java
@@ -196,8 +196,8 @@ public class TestTempJarCache extends SingletonJunitCa
@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);