From 894828578efe5da5b1b6742f6ee7bc43678084f9 Mon Sep 17 00:00:00 2001
From: Jeremy Booth <endolf@computerbooth.com>
Date: Thu, 9 Apr 2009 20:22:45 +0000
Subject: [PATCH] Parameterise the signing of the applet, and don't fail if the
 debug jar is missing.

---
 build.xml                            |  2 +-
 platform_build/build-applet.xml      | 13 ++++++++++---
 platform_build/build-definitions.xml |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index f00ba1f4..24dd6309 100644
--- a/build.xml
+++ b/build.xml
@@ -132,7 +132,7 @@
 		</delete>	
 
 	    <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar" failonerror="false"/>
 		<copy todir="${lwjgl.temp}/native/windows">
 			<fileset dir="${lwjgl.lib}/windows">
 				<patternset refid="lwjgl-windows.fileset" />
diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml
index dec6185d..cf301cc9 100644
--- a/platform_build/build-applet.xml
+++ b/platform_build/build-applet.xml
@@ -12,12 +12,19 @@
 	</target>
 	
 	<target name="applet-release">
-		<input 	message="Please type the password for the keystore" addproperty="sign.pwd"/>
+		<input message="Please enter the keystore" addproperty="keystore.location" defaultvalue="applet/lwjglkeystore"/>
+		<input message="Please enter the keystore alias" addproperty="keystore.alias" defaultvalue="lwjgl"/>
+		<input message="Please type the password for the keystore" addproperty="sign.pwd" defaultvalue="123456"/>
 
 		<antcall target="-applet">
-		  <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
+			<!--
+		    <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
 			<param name="alias" value="oddlabs_java_code_signing"/>
 			<param name="password" value="${sign.pwd}"/>
+			-->
+		    <param name="keystore" value="${keystore.location}"/>
+			<param name="alias" value="${keystore.alias}"/>
+			<param name="password" value="${sign.pwd}"/>
 		</antcall>
 	</target>
 
@@ -62,7 +69,7 @@
   	</jar>
 
 	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" failonerror="false"/>
 		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
diff --git a/platform_build/build-definitions.xml b/platform_build/build-definitions.xml
index b1f38f5d..be1cc9d7 100644
--- a/platform_build/build-definitions.xml
+++ b/platform_build/build-definitions.xml
@@ -91,8 +91,8 @@
 		<include name="lwjgl64.dll" />
 		<include name="OpenAL32.dll" />
 		<include name="OpenAL64.dll" />
-    	<include name="jinput-dx8.dll" />
-    	<include name="jinput-raw.dll" />
+    	<include name="jinput-dx8*.dll" />
+    	<include name="jinput-raw*.dll" />
 	</patternset>
 	
 	<!-- Files to include in linux, glibc2.3 package -->