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
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
--- gluegen/make/build.xml.orig 2015-10-09 04:18:28 UTC
+++ gluegen/make/build.xml
@@ -375,10 +375,17 @@
<property name="c.src.dir.os" value="unix" />
</target>
- <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64" if="isFreeBSD" >
+ <target name="declare.freebsd.ppc" if="isFreeBSDPpc">
+ <echo message="FreeBSDPpc" />
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd" />
+ <property name="linker.cfg.id" value="linker.cfg.freebsd.ppc" />
<property name="c.src.dir.os" value="unix" />
</target>
+ <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64,declare.freebsd.ppc" if="isFreeBSD" >
+ <property name="c.src.dir.os" value="unix" />
+ </target>
+
<target name="declare.hpux" if="isHPUX">
<echo message="HP-UX" />
<property name="compiler.cfg.id" value="compiler.cfg.hpux" />
@@ -408,7 +415,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>
@@ -605,7 +612,7 @@
<srcfiles dir= "${src.jcpp}" includes="**"/>
<srcfiles dir= "${c.grammar}" includes="*.g"/>
<srcfiles dir= "${j.grammar}" includes="*.g"/>
- <mapper type="merge" to="${build}/gluegen.jar"/>
+ <mapper type="merge" to="${build}/gluegen2.jar"/>
</uptodate>
<uptodate property="gluegen.build.skip.java2">
<srcfiles dir= "." includes="*.xml"/>
@@ -613,7 +620,7 @@
<srcfiles dir= "${src.jcpp}" includes="**"/>
<srcfiles dir= "${c.grammar}" includes="*.g"/>
<srcfiles dir= "${j.grammar}" includes="*.g"/>
- <mapper type="merge" to="${build}/gluegen-rt.jar"/>
+ <mapper type="merge" to="${build}/gluegen2-rt.jar"/>
</uptodate>
<condition property="gluegen.build.skip.java" value="true">
<or>
@@ -763,7 +770,7 @@
</copy>
<!-- Build gluegen.jar. -->
- <jar destfile="${build}/gluegen.jar" manifest="${build}/Manifest.temp" filesonly="true">
+ <jar destfile="${build}/gluegen2.jar" manifest="${build}/Manifest.temp" filesonly="true">
<service type="javax.annotation.processing.Processor">
<provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/>
</service>
@@ -842,7 +849,7 @@
</copy>
<!-- Build gluegen-rt.jar. -->
- <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp" filesonly="true">
+ <jar destfile="${build}/gluegen2-rt.jar" manifest="${build}/Manifest-rt.temp" filesonly="true">
<fileset dir="${classes}">
<include name="com/jogamp/gluegen/runtime/*.class" />
<include name="com/jogamp/common/**" />
--- 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);
|
