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-oculusvr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'make/build-oculusvr.xml')

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