From c834ffbeffe454f758089c6ee17f8863acc3e7c5 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 19 Aug 2019 11:19:17 +0200
Subject: 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" />
---
 make/build-common.xml       | 8 +++++---
 make/build-jogl.xml         | 4 ++--
 make/build-nativewindow.xml | 2 +-
 make/build-oculusvr.xml     | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'make')

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
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 49d6f8d5d..60c1e58ea 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -790,7 +790,7 @@
        - from the C GL headers.  This involves setting the taskdef and creating
        - the classpath reference id then running the task on each header.
       -->
-    <target name="build.gluegen-gl.jar" depends="init, common.gluegen.build, setup-manifestfile">
+    <target name="build.gluegen-gl.jar" depends="init, common.gluegen.init, setup-manifestfile">
         <javac destdir="${classes}"
                includes="${java.part.gluegen-gl-rt}"
                fork="yes"
@@ -1068,7 +1068,7 @@
             <classpath refid="pipeline.classpath" />
         </java>
     </target>          
-    <target name="java.generate.composable.pipeline.custom" depends="init, common.gluegen.build, java.generate.composable.pipeline.custom.glfixfunc">
+    <target name="java.generate.composable.pipeline.custom" depends="init, common.gluegen.init, java.generate.composable.pipeline.custom.glfixfunc">
     </target>
 
     <!-- ================================================================== -->
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 46eab57ba..f1b5cd4a9 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -269,7 +269,7 @@
        - from the C GL headers.  This involves setting the taskdef and creating
        - the classpath reference id then running the task on each header.
       -->
-    <target name="java.generate" depends="init, common.gluegen.build, java.generate.check" unless="java.generate.skip">
+    <target name="java.generate" depends="init, common.gluegen.init, java.generate.check" unless="java.generate.skip">
 
         <!-- Use the GlueGen task to generate the Java files -->
 
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index 2fa7b16fa..8466f9203 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -163,7 +163,7 @@
         <!--property name="java.generate.skip" value="true"/-->
     </target>
 
-    <target name="java.generate" depends="init, common.gluegen.build, java.generate.check" unless="java.generate.skip">
+    <target name="java.generate" depends="init, common.gluegen.init, java.generate.check" unless="java.generate.skip">
         <echo message="Generating OVR" />
         <gluegen src="${config.oculusvr}/oculusvr.c"
                  outputRootDir="${build.oculusvr}"
-- 
cgit v1.2.3