| 1 |
Index: jogl-v2.0-rc9/make/build-common.xml
|
| 2 |
===================================================================
|
| 3 |
--- jogl-v2.0-rc9.orig/make/build-common.xml 2012-06-19 05:23:28.000000000 +0200
|
| 4 |
+++ jogl-v2.0-rc9/make/build-common.xml 2012-07-02 03:25:02.878529381 +0200
|
| 5 |
@@ -13,13 +13,13 @@
|
| 6 |
</fail>
|
| 7 |
|
| 8 |
<!-- Pull in GlueGen cpptasks build file -->
|
| 9 |
- <property name="gluegen.root" value="../../gluegen" />
|
| 10 |
+ <property name="gluegen.root" value="/usr/share/gluegen2/" />
|
| 11 |
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
|
| 12 |
<import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
|
| 13 |
<import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
|
| 14 |
<import file="${gluegen.root}/make/jogamp-env.xml" />
|
| 15 |
|
| 16 |
- <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
|
| 17 |
+ <property name="ant-contrib.jar" value="/usr/share/java/ant-contrib.jar" />
|
| 18 |
|
| 19 |
<condition property="rootrel.build" value="build">
|
| 20 |
<not>
|
| 21 |
@@ -207,7 +207,7 @@
|
| 22 |
<property name="gluegen.build.xml" value="${gluegen.make}/build.xml" />
|
| 23 |
<property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" />
|
| 24 |
<property name="obj.gluegen" value="${build.gluegen}/obj"/>
|
| 25 |
- <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" />
|
| 26 |
+ <property name="gluegen.jar" value="/usr/share/java/gluegen2.jar" />
|
| 27 |
<property name="ant.jar" value="${ant.home}/lib/ant.jar" />
|
| 28 |
<property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
|
| 29 |
|
| 30 |
@@ -397,7 +397,7 @@
|
| 31 |
</path>
|
| 32 |
|
| 33 |
<!-- JavaSE combinations -->
|
| 34 |
- <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" />
|
| 35 |
+ <property name="gluegen-rt.jar" value="/usr/share/java/gluegen2-rt.jar" />
|
| 36 |
<property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
|
| 37 |
<property name="jogl.test.jar" value="${jar}/jogl.test.jar"/>
|
| 38 |
<property name="jogl.test-android.jar" value="${jar}/jogl.test-android.jar"/>
|
| 39 |
@@ -552,7 +552,10 @@
|
| 40 |
|
| 41 |
<!-- Run the GlueGen build to ensure that the GlueGen ANT task
|
| 42 |
- has been built. -->
|
| 43 |
- <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false"/>
|
| 44 |
+ <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
|
| 45 |
+ <property name="build" value="${basedir}/../"/>
|
| 46 |
+ <property name="test.dir" value="${basedir}/../test"/>
|
| 47 |
+ </ant>
|
| 48 |
</target>
|
| 49 |
|
| 50 |
|
| 51 |
Index: jogl-v2.0-rc9/make/build.xml
|
| 52 |
===================================================================
|
| 53 |
--- jogl-v2.0-rc9.orig/make/build.xml 2012-06-19 05:23:28.000000000 +0200
|
| 54 |
+++ jogl-v2.0-rc9/make/build.xml 2012-07-02 03:24:29.006530137 +0200
|
| 55 |
@@ -276,7 +276,7 @@
|
| 56 |
</target>
|
| 57 |
|
| 58 |
<target name="tag.build" depends="init">
|
| 59 |
- <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
|
| 60 |
+ <copy file="/usr/share/gluegen2/artifact.properties" todir="${build}" overwrite="true"/>
|
| 61 |
<echo message='jogl.build.number=${jogl.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/>
|
| 62 |
<echo message='jogl.build.id=${jogl.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/>
|
| 63 |
<echo message='jogl.build.branch=${jogl.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/>
|
Parent Directory
| 
Revision Log