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
|
Index: libjogl2-java/make/build-common.xml
===================================================================
--- libjogl2-java.orig/make/build-common.xml
+++ libjogl2-java/make/build-common.xml
@@ -13,7 +13,7 @@
</fail>
<!-- Pull in GlueGen cpptasks build file -->
- <property name="gluegen.root" value="../../gluegen" />
+ <property name="gluegen.root" value="/usr/share/gluegen2/" />
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
<import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
<import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
@@ -22,7 +22,7 @@
<!-- Add JOAL (optional) -->
<property name="joal.root" value="../../joal" />
- <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
+ <property name="ant-contrib.jar" value="/usr/share/java/ant-contrib.jar" />
<condition property="rootrel.build" value="build">
<not>
@@ -213,7 +213,7 @@
<property name="gluegen.build.xml" value="${gluegen.make}/build.xml" />
<property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" />
<property name="obj.gluegen" value="${build.gluegen}/obj"/>
- <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" />
+ <property name="gluegen.jar" value="/usr/share/java/gluegen2.jar" />
<property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional -->
@@ -438,7 +438,7 @@
</path>
<!-- JavaSE combinations -->
- <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" />
+ <property name="gluegen-rt.jar" value="/usr/share/java/gluegen2-rt.jar" />
<property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
<property name="gluegen-test-util.jar" value="${build.gluegen}/gluegen-test-util.jar" />
<property name="jogl-test.jar" value="${jar}/jogl-test.jar"/>
@@ -649,7 +649,10 @@
<!-- Run the GlueGen build to ensure that the GlueGen ANT task
- has been built. -->
- <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false"/>
+ <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
+ <property name="build" value="${basedir}/../"/>
+ <property name="test.dir" value="${basedir}/../test"/>
+ </ant>
</target>
Index: libjogl2-java/make/build.xml
===================================================================
--- libjogl2-java.orig/make/build.xml
+++ libjogl2-java/make/build.xml
@@ -327,7 +327,7 @@
</target>
<target name="tag.build" depends="init">
- <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
+ <copy file="/usr/share/gluegen2/artifact.properties" todir="${build}" overwrite="true"/>
<echo message='jogl.build.version=${jogamp.version}${line.separator}' file="${build}/artifact.properties" append="true"/>
<echo message='jogl.build.number=${jogl.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/>
<echo message='jogl.build.id=${jogl.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/>
|
