summaryrefslogtreecommitdiffstats
path: root/make/build-common.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-08-19 11:19:17 +0200
committerSven Gothel <[email protected]>2019-08-19 11:19:17 +0200
commitc834ffbeffe454f758089c6ee17f8863acc3e7c5 (patch)
tree15dd5b7cbae33826cc119270527a74121f887b28 /make/build-common.xml
parent4eaa83358b6518c667e9517685eeaafaef692656 (diff)
Fixed clean target so it doesn't fail if GlueGenTask is not present
If gluegen was cleaned, the GlueGenTask would be absent, which would cause a failure in jogl clean (even though GlueGenTask isn't needed in the clean target). So, modified the jogl build so it doesn't load GlueGenTask in the clean target. Orig commit by Wade Walker. This alternative patch uses the ant target common.gluegen.init to define the 'gluegen' task post gluegen compile check and pre 'gluegen' call, avoiding the if-then-else ant-task state query: <equals arg1="${ant.project.invoked-targets}" arg2="clean" />
Diffstat (limited to 'make/build-common.xml')
-rw-r--r--make/build-common.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index 84a2e3014..a17b7ca6f 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -270,8 +270,6 @@
<pathelement location="${gluegen.jar}" />
<pathelement location="${antlr.jar}" />
</path>
- <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
- classpathref="gluegen.classpath" />
<property name="gluegen-gl.jar" value="${build.jogl}/gluegen-gl.jar" />
@@ -667,7 +665,11 @@
<!--
- Build GlueGen
-->
- <target name="common.gluegen.build" depends="common.init" unless="common.gluegen.build.done">
+ <target name="common.gluegen.init" depends="common.init, common.gluegen.build">
+ <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
+ classpathref="gluegen.classpath" />
+ </target>
+ <target name="common.gluegen.build" unless="common.gluegen.build.done">
<property name="common.gluegen.build.done" value="true" />
<!-- Run the GlueGen build to ensure that the GlueGen ANT task