From 7f1c388919349852299d6aec74fc594d851b776f Mon Sep 17 00:00:00 2001
From: Ian Farmer <ian.farmer@luaj.org>
Date: Thu, 24 Jul 2008 06:35:17 +0000
Subject: [PATCH] Fix build-coverage to include WTK libraries (needed for J2ME
 math tests.)

---
 build-coverage.xml |  9 ++++++---
 build.xml          | 26 ++------------------------
 wtk.xml            | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 wtk.xml

diff --git a/build-coverage.xml b/build-coverage.xml
index 22d20a0d..34fdc681 100644
--- a/build-coverage.xml
+++ b/build-coverage.xml
@@ -20,7 +20,9 @@
 	</path>
 	
 	<taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
-
+	
+	<import file="wtk.xml"/>
+	
 	<target name="clean" description="Remove all files created by the build/test process.">
 		<delete dir="build" failonerror="no"/>
 		<delete file="cobertura.log" />
@@ -36,9 +38,10 @@
 		<mkdir dir="${coverage.html.dir}" />
 	</target>
 
-	<target name="compile" depends="init">
+	<target name="compile" depends="init,wtk-or-fail">
 		<javac destdir="${classes.dir}" debug="yes" target="1.5">
 			<classpath refid="cobertura.classpath" />
+		    <classpath refid="wtk-libs" />
 		    <src path="src/core"/>
 		    <src path="src/debug"/>
 		    <src path="src/j2me"/>
@@ -96,4 +99,4 @@
 
 	<target name="all" depends="clean,init,compile,instrument,test,coverage" />
 	
-</project>
\ No newline at end of file
+</project>
diff --git a/build.xml b/build.xml
index 1352bc86..ffdf228a 100644
--- a/build.xml
+++ b/build.xml
@@ -4,6 +4,8 @@
 	<property name="jar.name.j2me" value="luaj-j2me-${version}.jar"/>
 	<property name="jar.name.j2se" value="luaj-j2se-${version}.jar"/>
 	
+	<import file="wtk.xml"/>
+	
 	<target name="clean">
 		<delete dir="build"/>
 		<delete>
@@ -57,30 +59,6 @@
 		</jar>
 	</target>
 	
-	<target name="load-env">
-		<property environment="env"/>
-		<echo>WTK_HOME from env ${env.WTK_HOME}</echo>
-	</target>
-	
-	<target name="try-default-wtk-path" depends="load-env" unless="env.WTK_HOME">
-		<available property="env.WTK_HOME" value="c:\WTK-2.2" file="c:\WTK-2.2\lib\cldcapi11.jar"/>
-		<available property="env.WTK_HOME" value="/opt/WTK2.2" file="/opt/WTK2.2/lib/cldcapi11.jar"/>
-	</target>
-	
-	<target name="find-wtk" depends="try-default-wtk-path" unless="wtk.home" if="env.WTK_HOME">
-		<property name="wtk.home" value="${env.WTK_HOME}"/>
-	</target>
-	
-	<target name="wtk-or-fail" depends="find-wtk">
-		<fail unless="wtk.home" message="Sun Wireless Toolkit required to build component jars."/>
-		<echo>Using WTK found in ${wtk.home}</echo>
-		<path id="wtk-libs">
-			<pathelement path="${wtk.home}/lib/cldcapi11.jar"/>
-			<pathelement path="${wtk.home}/lib/midpapi20.jar"/>
-			<pathelement path="${wtk.home}/lib/mmapi.jar"/>
-		</path>
-	</target>
-
 	<target name="dist">
 		<delete dir="build/luaj-${version}"/>
 		<mkdir dir="build/luaj-${version}/src"/>
diff --git a/wtk.xml b/wtk.xml
new file mode 100644
index 00000000..afeaef79
--- /dev/null
+++ b/wtk.xml
@@ -0,0 +1,25 @@
+<project>
+	<target name="load-env">
+		<property environment="env"/>
+		<echo>WTK_HOME from env ${env.WTK_HOME}</echo>
+	</target>
+	
+	<target name="try-default-wtk-path" depends="load-env" unless="env.WTK_HOME">
+		<available property="env.WTK_HOME" value="c:\WTK-2.2" file="c:\WTK-2.2\lib\cldcapi11.jar"/>
+		<available property="env.WTK_HOME" value="/opt/WTK2.2" file="/opt/WTK2.2/lib/cldcapi11.jar"/>
+	</target>
+	
+	<target name="find-wtk" depends="try-default-wtk-path" unless="wtk.home" if="env.WTK_HOME">
+		<property name="wtk.home" value="${env.WTK_HOME}"/>
+	</target>
+	
+	<target name="wtk-or-fail" depends="find-wtk">
+		<fail unless="wtk.home" message="Sun Wireless Toolkit required to build component jars."/>
+		<echo>Using WTK found in ${wtk.home}</echo>
+		<path id="wtk-libs">
+			<pathelement path="${wtk.home}/lib/cldcapi11.jar"/>
+			<pathelement path="${wtk.home}/lib/midpapi20.jar"/>
+			<pathelement path="${wtk.home}/lib/mmapi.jar"/>
+		</path>
+	</target>
+</project>