From c834ffbeffe454f758089c6ee17f8863acc3e7c5 Mon Sep 17 00:00:00 2001 From: Sven Gothel 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: --- 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(-) 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 @@ - @@ -667,7 +665,11 @@ - + + + + - + - + 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. --> - + 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 @@ - +