diff -Nru jogl2-2.0-rc3/make/build-common.xml jogl2-2.0-rc3-gil/make/build-common.xml --- jogl2-2.0-rc3/make/build-common.xml 2011-12-04 18:04:17.809440841 +0100 +++ jogl2-2.0-rc3-gil/make/build-common.xml 2011-12-04 18:01:31.669451350 +0100 @@ -13,13 +13,13 @@ </fail> <!-- Pull in GlueGen cpptasks build file --> - <property name="gluegen.root" value="../../gluegen" /> + <property name="gluegen.root" value="/usr/share/gluegen2-source/" /> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> <import file="${gluegen.root}/make/jogamp-archivetasks.xml" /> <import file="${gluegen.root}/make/jogamp-androidtasks.xml" /> <import file="${gluegen.root}/make/jogamp-env.xml" /> - <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/ant-contrib.jar" /> <condition property="rootrel.build" value="build"> <not> @@ -180,7 +180,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="ant.jar" value="${ant.home}/lib/ant.jar" /> <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> @@ -355,7 +355,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="jogl.test.jar" value="${jar}/jogl.test.jar"/> <!-- JavaSE combinations . AWT --> @@ -476,7 +476,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> diff -Nru jogl2-2.0-rc3/make/build.xml jogl2-2.0-rc3-gil/make/build.xml --- jogl2-2.0-rc3/make/build.xml 2011-10-06 15:52:37.000000000 +0200 +++ jogl2-2.0-rc3-gil/make/build.xml 2011-12-04 18:06:29.418432517 +0100 @@ -325,7 +325,7 @@ </target> <target name="tag.build" depends="init"> - <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/> + <copy file="/usr/share/gluegen2-source/artifact.properties" todir="${build}" overwrite="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"/> <echo message='jogl.build.branch=${jogl.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/>