From 69e516f53fb068689a8a362b9584ec9b483c6efc Mon Sep 17 00:00:00 2001
From: Caspian Rychlik-Prince <cprince@puppygames.net>
Date: Sun, 20 Feb 2005 19:57:06 +0000
Subject: [PATCH] Moved generator to util packages

---
 build.xml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index ed7f7c81..02080ee7 100644
--- a/build.xml
+++ b/build.xml
@@ -201,7 +201,7 @@
 
 	<!-- Compiles the Java source code -->
 	<target name="generators" description="Compiles the native method generators">
-		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/generator/**.java" source="1.5" target="1.5" taskname="generator">
+		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/generator/**.java" source="1.5" target="1.5" taskname="generator">
 			<compilerarg value="-Xlint:all"/>
 		</javac>
 	</target>
@@ -213,14 +213,14 @@
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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}/java"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}"/>
-			<arg value="-Atypemap=org.lwjgl.generator.ALTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
 			<arg value="-Ageneratechecks"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java"/>
 		</apply>
@@ -232,7 +232,7 @@
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -240,14 +240,14 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/GL*.java"/>
 		</apply>
 		<!-- Generate ARB -->
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -255,14 +255,14 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}/arb"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/ARB*.java"/>
 		</apply>
 		<!-- Generate ATI -->
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -270,14 +270,14 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}/ati"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/ATI*.java"/>
 		</apply>
 		<!-- Generate EXT -->
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -285,14 +285,14 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}/ext"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/EXT*.java"/>
 		</apply>
 		<!-- Generate NV -->
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -300,14 +300,14 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}/nv"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/NV*.java"/>
 		</apply>
 		<!-- Generate HP -->
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -315,14 +315,14 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}/hp"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/HP*.java"/>
 		</apply>
 		<!-- Generate IBM -->
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -330,14 +330,14 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}/ibm"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/IBM*.java"/>
 		</apply>
 		<!-- Generate SUN -->
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.GeneratorProcessorFactory"/>
+			<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"/>
@@ -345,7 +345,7 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.headers}/sun"/>
 			<arg value="-Acontextspecific"/>
-			<arg value="-Atypemap=org.lwjgl.generator.GLTypeMap"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/opengl/SUN*.java"/>
 		</apply>
 	</target>
@@ -355,7 +355,7 @@
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>
 			<arg value="-factory"/>
-			<arg value="org.lwjgl.generator.ContextGeneratorProcessorFactory"/>
+			<arg value="org.lwjgl.util.generator.ContextGeneratorProcessorFactory"/>
 			<arg value="-cp"/>
 			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
 			<arg value="-s"/>