Fix Bug 516 (Determine Java Version); Minor fixes (jogamp/common/** ..)

Current minimum requirements are:
   - Java 1.6 (Level 6.0)
   - Android SDK API Level 9 (Version 2.3 Gingerbread)

Official production builds are performed w/ Java 1.6.
   - Java 1.6 (Level 6.0)
   - Android SDK API Level 9 (Version 2.3 Gingerbread)

Android supports Java language level 6.0.
Nevertheless, it cannot be guaranteed whether the Android API
supports all classes and methods of Java 1.6.
It is required for JogAmp developers to validate Android compatibility
by an Android crosscompilation build.

Current GlueGen code utilizes some minor Java 1.6 features
which could be replaced, however it's not desired at this point
since we have no mode hard Java 1.5 constraints.

Notes:
  - On OS X 10.5.8, only the 64bit version of Java6 is available
    and hence the only supported one on Leopard.

+++

Pushing determination of host (compiletime) and target (runtime) Java version
to 'jogamp-env.xml'.

jogamp-env.xml uses:
  env: SOURCE_LEVEL  -> propery: target.sourcelevel  def.: ${ant.java.version} >=1.6 (!)
  env: TARGET_LEVEL  -> propery: target.targetlevel  def.: ${ant.java.version} >=1.6 (!)
  env: TARGET_RT_JAR -> propery: target.rt.jar       def.: ${java.home}/lib/rt.jar

Either all above values are set, or none at all (default),
otherwise a build error is being thrown.

Further more we have the compiletime properties:
  host.sourcelevel  def.: ${ant.java.version} >= 1.6 (!)
  host.targetlevel  def.: ${ant.java.version} >= 1.6 (!)
  host.rt.jar       def.: ${java.home}/lib/rt.jar

+++

- 'javac.memorymax' defaults to 1024m now.

1 files changed, 15 insertions, 24 deletions

diff --git a/make/build.xml b/make/build.xml
index 87678bc..74f9078 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -11,14 +11,6 @@
   -->
 <project name="GlueGen" basedir="." default="all">
 
-  <fail message="Please build using Ant 1.8.0 or higher.">
-      <condition>
-          <not>
-              <antversion atleast="1.8.0"/>
-          </not>
-      </condition>
-  </fail>
-
   <import file="gluegen-cpptasks.xml" />
   <import file="jogamp-archivetasks.xml" />
   <import file="jogamp-androidtasks.xml" />
@@ -45,7 +37,8 @@
     <!-- Declare all paths and user defined variables. -->
 
     <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
-    <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
+    <!-- property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /-->
+    <property name="javadoc.link" value="http://docs.oracle.com/javase/6/docs/api/" />
 
     <!-- The source and build directories. -->
     <property name="project.root"  value=".." />
@@ -139,17 +132,9 @@
     <property name="archive.name"     value="gluegen-${gluegen.version}-${os.and.arch}" />
     <property name="archive"          value="${build}/${archive.name}" />
 
-    <property name="target.sourcelevel" value="1.5" />
-    <property name="host.sourcelevel"   value="1.5" />
-    <property name="javacdebug"       value="true" /> 
-    <property name="javacdebuglevel"  value="source,lines" /> 
-    <!--property name="javacdebuglevel"  value="source,lines,vars" /--> 
-    <!-- property name="javac.memorymax"  value="128m" /-->  <!-- I ran out of memory with these .. linux x86_64 6u14 -->
-    <property name="javac.memorymax"  value="512m" /> 
-
     <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig}" />
     <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/>
-    <property name="jogamp.common.classes" value="com/jogamp/common/**"/>
+    <property name="jogamp.common.classes" value="com/jogamp/common/** jogamp/common/**"/>
   </target>
 
   <!--
@@ -663,24 +648,30 @@
     <!-- Build GlueGen using the generated Java files along with the
       - original source. -->
 
-    <!--compile gluegen-rt with source=1.5 first-->
+    <!--compile gluegen-rt first-->
     <javac destdir="${classes}"
            includeAntRuntime="false"
            includes="${gluegen-rt.classes} ${jogamp.common.classes}"
            excludes="${gluegen.excludes.all}"
            memoryMaximumSize="${javac.memorymax}"
-           source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+           source="${target.sourcelevel}" 
+           target="${target.targetlevel}" 
+           bootclasspath="${target.rt.jar}"
+           debug="${javacdebug}" debuglevel="${javacdebuglevel}">
       <src path="${src.java}" />
       <src path="${src.generated.java}" />
       <classpath refid="gluegencompile.classpath" />
     </javac>
 
-    <!--compile gluegen with source=1.5-->
+    <!--compile gluegen (compile time) -->
     <javac destdir="${classes}"
            includeAntRuntime="true"
            excludes="${gluegen.excludes.all} ${gluegen-rt.classes}"
            memoryMaximumSize="${javac.memorymax}"
-           source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+           source="${host.sourcelevel}" 
+           target="${host.targetlevel}" 
+           bootclasspath="${host.rt.jar}"
+           debug="${javacdebug}" debuglevel="${javacdebuglevel}">
       <src path="${src.java}" />
       <src path="${src.generated.java}" />
       <classpath refid="gluegencompile.classpath" />
@@ -816,8 +807,8 @@
              sourcepath="${src.java};${src.generated.java}"
              destdir="${javadoc.gluegen.path}" windowtitle="GlueGen Runtime Documentation"
              overview="../src/java/com/jogamp/gluegen/package.html"
-             source="1.5"
-             maxmemory="256m" >
+             source="${target.sourcelevel}"
+             maxmemory="${javac.memorymax}" >
         <classpath path="${classes}"/>
         <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
     </javadoc>