Add javadoc arg (property 'javadoc.xarg1') '-Xdoclint:none' if java >= 1.8 (GlueGen commit d8dff4c9f2186749b167195eeb339c33f56864e8)

5 files changed, 14 insertions, 0 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index f9238fa1b..3814d172a 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1923,6 +1923,7 @@
                  bottom="${javadoc.bottom}" >
           <classpath refid="nativewindow_gluegen.classpath"/>
           <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
@@ -1939,6 +1940,7 @@
                  bottom="${javadoc.bottom}" >
           <classpath refid="nativewindow_gluegen.classpath"/>
           <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
@@ -1955,6 +1957,7 @@
          bottom="${javadoc.bottom}" >
           <classpath refid="nativewindow_gluegen.classpath"/>
           <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index a757c0f55..92a2bf9d0 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -888,6 +888,7 @@
                  maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
@@ -903,6 +904,7 @@
                  maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
                                                                                                                                    
@@ -918,6 +920,7 @@
                  maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
diff --git a/make/build-newt.xml b/make/build-newt.xml
index cbfd83a52..cf8330eb1 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -890,6 +890,7 @@
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="jogl_doc.classpath"/>
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
@@ -906,6 +907,7 @@
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
          <classpath refid="jogl_doc.classpath"/>
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
@@ -922,6 +924,7 @@
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="jogl_doc.classpath"/>
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index aa0308365..48d48056d 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -686,6 +686,7 @@
                  bottom="" >
           <classpath refid="nativewindow_gluegen.classpath"/>
           <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+          <arg value="${javadoc.xarg1}"/>
         </javadoc>
     </target>
 
diff --git a/make/build.xml b/make/build.xml
index e2aa471c7..14c1a3c09 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -430,6 +430,7 @@
             <link offline="false" href="${gluegen.link}" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/> 
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+            <arg value="${javadoc.xarg1}"/>
         </javadoc>
         <copy todir="${javadoc.jogl.public.path}/resources" overwrite="true">
             <fileset dir="${gluegen.make}/doc/javadoc/resources" includes="*" />
@@ -457,6 +458,7 @@
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <link offline="false" href="../javadoc_nativewindow_spec" />
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+            <arg value="${javadoc.xarg1}"/>
         </javadoc>
         <copy todir="${javadoc.jogl.spec.path}/resources" overwrite="true">
             <fileset dir="${gluegen.make}/doc/javadoc/resources" includes="*" />
@@ -483,6 +485,7 @@
             <link offline="false" href="${gluegen.link}" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+            <arg value="${javadoc.xarg1}"/>
         </javadoc>
         <copy todir="${javadoc.jogl.dev.path}/resources" overwrite="true">
             <fileset dir="${gluegen.make}/doc/javadoc/resources" includes="*" />
@@ -509,6 +512,7 @@
             <link offline="false" href="${gluegen.link}" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
+            <arg value="${javadoc.xarg1}"/>
         </javadoc>
         <copy todir="${javadoc.nw.spec.path}/resources" overwrite="true">
             <fileset dir="${gluegen.make}/doc/javadoc/resources" includes="*" />