From ce9e9b48d39ba5840ef5302e04a89f6a3df9da64 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Sun, 20 Nov 2011 03:48:43 +0000
Subject: [PATCH] Improve stability of download locations for third party libs.

---
 .classpath     |  5 +++--
 build-libs.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 build.xml      | 47 +++-------------------------------------------
 3 files changed, 57 insertions(+), 46 deletions(-)
 create mode 100644 build-libs.xml

diff --git a/.classpath b/.classpath
index 4430e29d..eded28b8 100644
--- a/.classpath
+++ b/.classpath
@@ -11,8 +11,9 @@
 	<classpathentry kind="src" path="examples/lua"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="var" path="WTK_HOME/lib/cldcapi11.jar"/>
-	<classpathentry kind="var" path="WTK_HOME/lib/midpapi20.jar"/>
+	<classpathentry kind="lib" path="lib/midpapi20.jar"/>
+	<classpathentry kind="lib" path="lib/cldcapi11.jar"/>
 	<classpathentry kind="lib" path="lib/bcel-5.2.jar"/>
+	<classpathentry kind="var" path="JRE_LIB"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build-libs.xml b/build-libs.xml
new file mode 100644
index 00000000..7a3d2963
--- /dev/null
+++ b/build-libs.xml
@@ -0,0 +1,51 @@
+<project default="all-libs">
+
+	<available file="lib/midpapi20.jar" property="midpapi.lib.exists"/>
+	<available file="lib/bcel-5.2.jar" property="bcel.lib.exists"/>			
+	<available file="lib/javacc.jar" property="javacc.lib.exists"/>			
+	<available file="lib/proguard.jar" property="proguard.lib.exists"/>			
+	<available file="lib/antenna-bin-1.2.0-beta.jar" property="antenna.lib.exists"/>			
+	<available file="lib/junit.jar" property="junit.lib.exists"/>
+	<available file="lib/cobertura.jar" property="cobertura.lib.exists"/>
+
+	<macrodef name="download">
+		<attribute name="zipname"/>
+		<attribute name="jars" default="**/*.jar"/>
+		<sequential>
+			<get src="http://luaj.sourceforge.net/lib/@{zipname}.tar.gz" 
+				dest="lib/@{zipname}.tar.gz"/>
+			<gunzip src="lib/@{zipname}.tar.gz" dest="lib/@{zipname}.tar"/>
+			<untar src="lib/@{zipname}.tar" dest="lib" overwrite="true">
+			    <patternset>
+			        <include name="@{jars}"/>
+			    </patternset>
+			    <mapper type="flatten"/>
+			</untar>
+	   </sequential>
+	</macrodef>
+
+	<target name="wtk-libs" unless="midpapi.lib.exists">
+		<download zipname="wtk-2.5.2-api"/>
+	</target>
+	<target name="bcel-lib" unless="bcel.lib.exists">
+		<download zipname="/bcel-5.2"/>
+	</target>
+	<target name="javacc-lib" unless="javacc.lib.exists">
+		<download zipname="javacc-5.0"/>
+	</target>
+	<target name="proguard-lib" unless="proguard.lib.exists">
+		<download zipname="proguard4.6"/>
+	</target>
+	<target name="antenna-lib" unless="antenna.lib.exists">
+		<download zipname="antenna-bin-1.2.0-beta"/>
+	</target>
+	<target name="junit-lib" unless="junit.lib.exists">
+		<download zipname="junit-3.8.2"/>
+	</target>
+	<target name="cobertura-lib" unless="cobertura.lib.exists">
+		<download zipname="cobertura-1.9.4.1-bin"/>
+	</target>
+
+	<target name="all-libs" depends="wtk-libs,bcel-lib,javacc-lib,proguard-lib,antenna-lib,junit-lib,cobertura-lib"/>
+	
+</project>
diff --git a/build.xml b/build.xml
index ac66e1ab..b2af82f7 100644
--- a/build.xml
+++ b/build.xml
@@ -1,8 +1,6 @@
 <project default="all">
 	<property file="version.properties"/>
-	
-	<property environment="env"/>
-	
+		
 	<property name="jar.name.jme" value="luaj-jme-${version}.jar"/>
 	<property name="jar.name.jse" value="luaj-jse-${version}.jar"/>
 	<property name="jar.name.sources" value="luaj-sources-${version}.jar"/>
@@ -14,47 +12,7 @@
 		</delete>
 	</target>
 
-	<available file="lib/midpapi20.jar" property="midpapi.lib.exists"/>
-	<available file="lib/bcel-5.2.jar" property="bcel.lib.exists"/>			
-	<available file="lib/javacc.jar" property="javacc.lib.exists"/>			
-
-	<target name="wtk-libs" unless="midpapi.lib.exists">
-		<mkdir dir="lib"/>
-		<get src="http://luaj.sourceforge.net/lib/wtk-2.5.2-api.tar.gz" 
-			dest="lib/wtk-2.5.2-api.tar.gz"/>
-		<gunzip src="lib/wtk-2.5.2-api.tar.gz" dest="lib/wtk-2.5.2-api.tar"/>
-		<untar src="lib/wtk-2.5.2-api.tar" dest="lib" overwrite="true">
-		    <patternset>
-		        <include name="**/*.jar"/>
-		    </patternset>
-		    <mapper type="flatten"/>
-		</untar>
-	</target>
-
-	<target name="bcel-lib" unless="bcel.lib.exists">
-		<mkdir dir="lib"/>
-		<get src="http://luaj.sourceforge.net/lib/bcel-5.2.tar.gz" 
-			dest="lib/bcel-5.2.tar.gz"/>
-		<gunzip src="lib/bcel-5.2.tar.gz" dest="lib/bcel-5.2.tar"/>
-		<untar src="lib/bcel-5.2.tar" dest="lib" overwrite="true">
-		    <patternset>
-		        <include name="**/*.jar"/>
-		    </patternset>
-		    <mapper type="flatten"/>
-		</untar>
-	</target>
-	
-	<target name="javacc-lib" unless="javacc.lib.exists">
-		<get src="http://luaj.sourceforge.net/lib/javacc-5.0.tar.gz"
-			dest="lib/javacc-5.0.tar.gz"/>
-		<gunzip src="lib/javacc-5.0.tar.gz" dest="lib/javacc-5.0.tar"/>
-		<untar src="lib/javacc-5.0.tar" dest="lib" overwrite="true">
-		    <patternset>
-		        <include name="**/javacc.jar"/>
-		    </patternset>
-		    <mapper type="flatten"/>
-		</untar>
-	</target>
+	<import file="build-libs.xml"/>
 
 	<target name="parser" depends="javacc-lib">
 		<java classname="javacc" classpath="lib/javacc.jar">
@@ -192,6 +150,7 @@
 		<copy todir="build/luaj-${version}">
 		    <fileset dir=".">
 				<include name="build.xml"/>
+				<include name="build-libs.xml"/>
 				<include name="build-coverage.xml"/>
 				<include name="version.properties"/>
 				<include name="wtk.xml"/>