Ant build.xml: Build target is 1.6; Pick up TARGET_RT_JAR (-> JRE 1.6 rt.jar); Respect javacdebug* props, def. is none.

3 files changed, 35 insertions, 5 deletions

diff --git a/Jake2.sh b/Jake2.sh
index 4fa1dcb..1d25634 100755
--- a/Jake2.sh
+++ b/Jake2.sh
@@ -18,7 +18,9 @@ X_ARGS="-Xmx100M"
 #D_ARGS="-Dnewt.debug.Window.MouseEvent"
 #D_ARGS="-Dnewt.debug.Window.KeyEvent"
 #D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.Window"
-#D_ARGS="-Djogl.debug=all"
+#D_ARGS="-Dnewt.debug.Window"
+#D_ARGS="-Djogl.debug=all -Dnewt.debug=all"
+#D_ARGS="-Dnewt.debug=all -Dnativewindow.debug.NativeWindow"
 #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL"
 #D_ARGS="-Djogl.debug.DebugGL"
 #D_ARGS="-Djogl.debug.TraceGL"
@@ -36,7 +38,7 @@ X_ARGS="-Xmx100M"
 #G_ARGS="+set s_impl joal +set timeout 12000 +set cl_timeout 12000 +set gl_mode 0"
 #G_ARGS="+set s_impl joal +set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref jogldummy"
 #G_ARGS="+set s_impl joal +set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref joglgl2"
-G_ARGS="+set s_impl joal +set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref jogles2"
+#G_ARGS="+set s_impl joal +set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref jogles2"
 #G_ARGS="+set s_impl joal +set timeout 12000 +set cl_timeout 12000 +set gl_mode 0 +set vid_ref jogles1"
 
 # G_ARGS2="+set vid_fullscreen 1"
@@ -45,4 +47,4 @@ G_ARGS="+set s_impl joal +set timeout 12000 +set cl_timeout 12000 +set gl_mode 0
 # G_ARGS2="+set r_shadows 0 +set gl_shadows 0 +set gl_dynamic 0"
 # G_ARGS2="+connect 10.1.0.52"
 
-exec java $X_ARGS -cp $CP $D0_ARGS $D_ARGS jake2.Jake2 $G_ARGS $G_ARGS2 $*
+exec java $X_ARGS -cp $CP $D0_ARGS $D_ARGS jake2.Jake2 $G_ARGS $G_ARGS2 $* 2>&1 | tee Jake2.log
diff --git a/build.sh b/build.sh
index f5515d3..d281c61 100644
--- a/build.sh
+++ b/build.sh
@@ -5,4 +5,10 @@ CP=$CP:lib/xerces/xercesImpl.jar:lib/xerces/xml-apis.jar
 CP=$CP:lib/proguard/proguard.jar
 CP=$CP:$JAVA_HOME/lib/tools.jar
 
-java -Dant.home=lib/ant -cp $CP org.apache.tools.ant.Main -buildfile build.xml $@
\ No newline at end of file
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+#    -Djavacdebug=true  \
+#    -Djavacdebuglevel="source,lines,vars" \
+
+java \
+    -Dant.home=lib/ant -cp $CP org.apache.tools.ant.Main -buildfile build.xml $@
diff --git a/build.xml b/build.xml
index f61b640..e2547d8 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,6 @@
 <!-- Buildfile -->
 <project name="jake2" default="usage" basedir=".">
+    <property environment="env" />
 
     <taskdef name="proguard" classname="proguard.ant.ProGuardTask">
         <classpath>
@@ -18,6 +19,25 @@
     <property name="build" location="build"/>
     <property name="dist" location="dist"/>
 
+    <property name="javacdebug"       value="false" /> 
+    <property name="javacdebuglevel"  value="" /> 
+
+    <condition property="target.rt.jar" value="${env.TARGET_RT_JAR}">
+        <not>
+         <equals arg1="${env.TARGET_RT_JAR}" arg2="$${env.TARGET_RT_JAR}" casesensitive="true" />
+        </not>
+    </condition>
+    <!-- Default value for std Java (incl. Java7 on OS X) -->
+    <condition property="target.rt.jar"
+               value="${java.home}/lib/rt.jar">
+               <available file="${java.home}/lib/rt.jar"/>
+    </condition>
+    <!-- Default fallback value for Java6 OS X -->
+    <condition property="target.rt.jar"
+               value="${java.home}/../Classes/classes.jar">
+               <available file="${java.home}/../Classes/classes.jar"/>
+    </condition>
+
     <!-- different classpaths -->
     <path id="build.class.path">
         <pathelement location="lib/jogamp/gluegen-rt.jar"/>
@@ -48,7 +68,9 @@
 
     <!-- compile -->
     <target name="compile" depends="init">
-        <javac destdir="${build}" optimize="on" debug="off" source="1.6">
+        <javac destdir="${build}" 
+               source="1.6" target="1.6" bootclasspath="${target.rt.jar}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src}"/>
             <include name="jake2/**"/>
             <classpath refid="build.class.path"/>