[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3198] trunk/LWJGL

[<en...@us...>]

Revision: 3198
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3198&view=rev
Author:   endolf
Date:     2009-04-09 20:22:45 +0000 (Thu, 09 Apr 2009)

Log Message:
-----------
Parameterise the signing of the applet, and don't fail if the debug jar is missing.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-applet.xml
    trunk/LWJGL/platform_build/build-definitions.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/build.xml	2009-04-09 20:22:45 UTC (rev 3198)
@@ -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" />

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/platform_build/build-applet.xml	2009-04-09 20:22:45 UTC (rev 3198)
@@ -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"/>

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2009-04-08 21:53:59 UTC (rev 3197)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2009-04-09 20:22:45 UTC (rev 3198)
@@ -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 -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.