diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 9 | ||||
| -rw-r--r-- | make/make.jogl.all.x86.sh | 2 | ||||
| -rw-r--r-- | make/make.jogl.all.x86_64.sh | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/make/build.xml b/make/build.xml index 55e972b..3511f58 100644 --- a/make/build.xml +++ b/make/build.xml @@ -21,6 +21,8 @@ </not> </condition> + <property file="../${rootrel.build}/artifact.properties"/> + <!-- - Make sure that jogl-demos.jar is not on the CLASSPATH; this can - cause builds to fail since if this Java process has the jar file @@ -259,7 +261,12 @@ </jar> </target> - <target name="all" depends="init, all-desktop, all-gles" /> + <target name="all" depends="init, all-desktop, all-gles, tag.build" /> + + <target name="tag.build"> + <copy file="${jogl.root}/${rootrel.build}/artifact.properties" todir="../${rootrel.build}" overwrite="true"/> + <echo file="../${rootrel.build}/artifact.properties" message='jogl-demos.build.number=${jogl-demos.build.number}${line.separator}' append="true"/> + </target> <target name="javadoc" depends="init"> <mkdir dir="${javadoc}" /> diff --git a/make/make.jogl.all.x86.sh b/make/make.jogl.all.x86.sh index ea37ad9..41fa16b 100644 --- a/make/make.jogl.all.x86.sh +++ b/make/make.jogl.all.x86.sh @@ -6,6 +6,6 @@ ant \ -Djogl.cg=1 \ - -Duser.swt.jar=$HOME/.java/swt-3.5.2-gtk-linux-x86.jar \ + -Duser.swt.jar=$HOME/.java/swt-3.6-gtk-linux-x86.jar \ -Drootrel.build=build-x86 \ $* 2>&1 | tee make.jogl.all.x86.log diff --git a/make/make.jogl.all.x86_64.sh b/make/make.jogl.all.x86_64.sh index 4fc7641..1d4c96c 100644 --- a/make/make.jogl.all.x86_64.sh +++ b/make/make.jogl.all.x86_64.sh @@ -10,6 +10,6 @@ ant \ -DskipSourceZIP=true \ -Djogl.cg=1 \ - -Duser.swt.jar=$HOME/.java/swt-3.5.2-gtk-linux-x86_64.jar \ + -Duser.swt.jar=$HOME/.java/swt-3.6-gtk-linux-x86_64.jar \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.jogl.all.x86_64.log |