From 9f2461fb70325b119c400e250574cfdebf84dabf Mon Sep 17 00:00:00 2001
From: Ioannis Tsakpinis <iotsakp@gmail.com>
Date: Fri, 2 Apr 2010 18:45:19 +0000
Subject: [PATCH] Fixed debug builds.

---
 build.xml                          | 21 ++++++++++++++-------
 platform_build/build-generator.xml | 22 +++++++++++++++++++---
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index c92a3d2c..8c237498 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,7 @@
 <project name="LWJGL" default="all" basedir=".">
 
+	<property name="build.sysclasspath" value="last" />
+
 	<import file="platform_build/build-definitions.xml"/>
 	<import file="platform_build/build-generator.xml"/>
 	<import file="platform_build/build-applet.xml"/>
@@ -58,13 +60,16 @@
   	<antcall target="-initialize" />
 
   	<!-- compile and create jars -->
-	<antcall target="generate-all"/>
-  	<antcall target="compile" />
-  	<antcall target="-createjars" />
 	<antcall target="generate-debug"/>
 	<antcall target="compile" />
   	<antcall target="-createdebugjars" />
-	<antcall target="jars" />
+		<!-- Generator will skip all templates if we don't clean -->
+		<delete dir="${lwjgl.bin}" quiet="true" failonerror="false" taskname="cleaning bin folder" />
+		<mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" />
+	<antcall target="generate-all"/>
+  	<antcall target="compile" />
+  	<antcall target="-createjars" />
+	<antcall target="-jars_NoDEP" />
  	<antcall target="javadoc" />
 	<antcall target="applet-release" />
   	
@@ -90,8 +95,10 @@
 
 	<!-- Create ONLY the jar archives -->
 	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
-		<!--		<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
-		<!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
+		<antcall target="-jars_NoDEP" />
+	</target>
+
+	<target name="-jars_NoDEP">
 		<move todir="libs/">
 			<fileset dir="${lwjgl.temp}/jar">
 				<include name="*.jar"/>
@@ -395,7 +402,7 @@
 	
 	<!-- Creates the Javadoc -->
 	<target name="javadoc" description="Creates javadoc from java source code">
-		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
+		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API" useexternalfile="true">
 			<fileset refid="lwjgl.javadoc.fileset" />
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
 			<bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
diff --git a/platform_build/build-generator.xml b/platform_build/build-generator.xml
index e4933e32..b499a2b2 100644
--- a/platform_build/build-generator.xml
+++ b/platform_build/build-generator.xml
@@ -22,10 +22,27 @@
 	<!-- Proxy target to generate it all -->
 	<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
-	<target name="generate-debug" depends="generate-openal, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+	<target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
 	<!-- Generate OpenAL -->
 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
+		<apply executable="apt" parallel="true">
+			<arg value="-nocompile"/>
+			<arg value="-factory"/>
+			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
+			<arg value="-cp"/>
+			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+			<arg value="-s"/>
+			<arg path="${lwjgl.src}/generated"/>
+			<arg value="-d"/>
+			<arg path="${lwjgl.src.native}/generated"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
+			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
+		</apply>
+	</target>
+	
+	<!-- Generate OpenAL [DEBUG] -->
+	<target name="generate-openal-debug" depends="generators" description="Generates java and native source for AL">
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
@@ -54,14 +71,13 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
-			<!-- <arg value="-Ageneratechecks"/> -->
 			<arg value="-Acontextspecific"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
-	<!-- Generate OpenGL -->
+	<!-- Generate OpenGL [DEBUG] -->
 	<target name="generate-opengl-debug" depends="generators" description="Generates java and native source for GL">
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>