From 8c406de8eb50cf785b407e2facb3502e364a66ce Mon Sep 17 00:00:00 2001
From: Wade Walker <wwalker3@austin.rr.com>
Date: Fri, 7 Mar 2014 16:28:41 -0600
Subject: Remove warnings, turn on linting, fix Eclipse.

Removed warnings due to memoryMaximumSize being ignored when javac isn't
forked. Turned on all linting. Changed the arguments of
uncomment-function-params so it will run from within Eclipse properly
(using basedir instead of user.dir, since only the former will be
properly set both inside Eclipse and on the command line).
---
 make/build-test.xml |  5 ++++-
 make/build.xml      | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/make/build-test.xml b/make/build-test.xml
index b1ae12d0..0325cdf2 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -100,7 +100,9 @@
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
                bootclasspath="${target.rt.jar}"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}"/>
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <compilerarg value="-Xlint:all"/>
+        </javac>
         <copy file="joclversion-test"
             tofile="${build.test}/manifest-test.mf"
             overwrite="true">
@@ -135,6 +137,7 @@
                bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.test}" />
+            <compilerarg value="-Xlint:all"/>
         </javac>
         <copy file="joclversion-test-android"
             tofile="${build.test}/manifest-test-android.mf"
diff --git a/make/build.xml b/make/build.xml
index e7425eba..5bd8c6e3 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -335,6 +335,7 @@
                bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${basedir}/../etc/src"/>
+            <compilerarg value="-Xlint:all"/>
         </javac>
 
         <taskdef name="update-headers"            classname="com.jogamp.ant.HeaderFileDownloader"     classpath="${etc.build.dir}"/>
@@ -356,8 +357,9 @@
         <mkdir dir="${headers.dest}"/>
 
         <!--uncomment function names in c headers and copy modified files into include path-->
-        <uncomment-function-params src="${headers.orig}/cl.h" dest="${headers.dest}/cl.h"/>
-        <uncomment-function-params src="${headers.orig}/cl_gl.h" dest="${headers.dest}/cl_gl.h"/>
+        <!-- need to pass in basedir or it won't work inside Eclipse, where user.dir is Eclipse's bin dir-->
+        <uncomment-function-params src="${basedir}/${headers.orig}/cl.h" dest="${basedir}/${headers.dest}/cl.h"/>
+        <uncomment-function-params src="${basedir}/${headers.orig}/cl_gl.h" dest="${basedir}/${headers.dest}/cl_gl.h"/>
 
         <!--nothing to uncomment in this headers-->
         <copy file="${headers.orig}/cl_platform.h" toDir="${headers.dest}" overwrite="true"/>
@@ -552,7 +554,6 @@
         <javac destdir="${classes}" 
                includeantruntime="false"
                excludes="${java.part.android}"
-               memoryMaximumSize="${javac.memorymax}"
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
@@ -561,6 +562,9 @@
         	<classpath refid="javac.classpath"/>
         	<src path="${src.java}" />
             <src path="${src.generated.java}" />
+            <compilerarg value="-Xlint:all"/>
+            <!-- suppress warning due to @CLProperty annotation, which is used at runtime but not during compilation -->
+            <compilerarg value="-Xlint:-processing"/>
         </javac>
     </target>
 
@@ -568,7 +572,6 @@
         <!--compile gluegen-rt-android last-->
         <javac destdir="${classes}" 
                includeantruntime="false"
-               memoryMaximumSize="${javac.memorymax}"
                encoding="UTF-8"
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
@@ -577,6 +580,7 @@
         	<classpath refid="javac.android.classpath"/>
         	<src path="${src.java}" />
             <src path="${src.generated.java}" />
+            <compilerarg value="-Xlint:all"/>
         </javac>
     </target>
 
-- 
cgit v1.2.3