From 77ae1b75f3c6feab97a4fffea44aadbd6e1d0b15 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 2 Feb 2020 05:36:38 +0100
Subject: When explicitly generating native header, avoid implicit referenced
 classes.

Thanks to Phil Jordan, who is debating certain build issues of JOGL with me,
we figured that certain generated header files ended up in the wrong build folder.
E.g. on GNU/Linux, jogamp_nativewindow_windows_GDI.h ended up in build-x86_64/nativewindow/gensrc/native/drm/

This happens due to the new java11 way of generating header files using javac.
Per default, all referenced files are being compiled and header files were generated
in this case for all of them using the given '-h location' argument.
Since nativewindow generates headers for the new drm functionality first (where available),
all headers of all included referenced classes ended up in this drm build location.
Subsequent javac was skipped 'thanks' to the already existing class files ;-)

This patch disables implicit class file creation when explicitly generating headers only
using the javac argument '-implicit:none'.

This is done for the whole JOGL project (nativewindow, jogl and newt).
Other JogAmp modules should not be concerned due to the lack of overspecific
platform parts ..
---
 make/build-newt.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/make/build-newt.xml b/make/build-newt.xml
index ec3d95134..49715f143 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -265,6 +265,7 @@
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/kd/WindowDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create Intel GDL native headers -->
@@ -284,6 +285,7 @@
             <include name="jogamp/newt/driver/intel/gdl/DisplayDriver.java" />
             <include name="jogamp/newt/driver/intel/gdl/ScreenDriver.java" />
             <include name="jogamp/newt/driver/intel/gdl/WindowDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create Broadcom EGL native headers -->
@@ -301,6 +303,7 @@
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>
             <include name="jogamp/newt/driver/bcm/egl/WindowDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create Broadcom VideoCore IV native headers -->
@@ -320,6 +323,7 @@
             <include name="jogamp/newt/driver/bcm/vc/iv/DisplayDriver.java" />
             <include name="jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java" />
             <include name="jogamp/newt/driver/bcm/vc/iv/WindowDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create EGL GBM native headers -->
@@ -339,6 +343,7 @@
             <include name="jogamp/newt/driver/egl/gbm/DisplayDriver.java" />
             <include name="jogamp/newt/driver/egl/gbm/ScreenDriver.java" />
             <include name="jogamp/newt/driver/egl/gbm/WindowDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create Windows native headers -->
@@ -358,6 +363,7 @@
             <include name="jogamp/newt/driver/windows/WindowDriver.java" />
             <include name="jogamp/newt/driver/windows/ScreenDriver.java" />
             <include name="jogamp/newt/driver/windows/DisplayDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create MacOS native headers -->
@@ -377,6 +383,7 @@
             <include name="jogamp/newt/driver/macosx/WindowDriver.java" />
             <include name="jogamp/newt/driver/macosx/ScreenDriver.java" />
             <include name="jogamp/newt/driver/macosx/DisplayDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create iOS native headers -->
@@ -396,6 +403,7 @@
             <include name="jogamp/newt/driver/ios/WindowDriver.java" />
             <include name="jogamp/newt/driver/ios/ScreenDriver.java" />
             <include name="jogamp/newt/driver/ios/DisplayDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <!-- create X11 native headers -->
@@ -417,6 +425,7 @@
             <include name="jogamp/newt/driver/x11/DisplayDriver.java" />
             <include name="jogamp/newt/driver/x11/RandR11.java" />
             <include name="jogamp/newt/driver/x11/RandR13.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
         
         <javac destdir="${classes}"
@@ -451,6 +460,7 @@
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="jogl_nativewindow_gluegen_android.classpath"/>
             <include name="jogamp/newt/driver/android/WindowDriver.java" />
+          <compilerarg value="-implicit:none" />
         </javac>
 
         <javac destdir="${classes}"
-- 
cgit v1.2.3