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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3406
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3406&view=rev
Author:   kappa1
Date:     2010-08-28 16:39:16 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
Applet Package: clean up and split the applet download package, it should be much easier for noobs to pick it up now and less confusing.

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

Added Paths:
-----------
    trunk/LWJGL/applet/advance/
    trunk/LWJGL/applet/advance/appletloader.html
    trunk/LWJGL/applet/basic/
    trunk/LWJGL/applet/basic/basicapplet.html

Removed Paths:
-------------
    trunk/LWJGL/applet/appletloader.html

Added: trunk/LWJGL/applet/advance/appletloader.html
===================================================================

--- trunk/LWJGL/applet/advance/appletloader.html	                        (rev 0)
+++ trunk/LWJGL/applet/advance/appletloader.html	2010-08-28 16:39:16 UTC (rev 3406)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <title>AppletLoader</title>
+  </head>
+  <body>
+
+  <applet code="org.lwjgl.util.applet.AppletLoader" archive="lwjgl_util_applet.jar, lzma.jar" codebase="." width="640" height="480">
+  
+    <!-- The following tags are mandatory -->
+    
+    <!-- Name of Applet, will be used as name of directory it is saved in, and will uniquely identify it in cache -->
+    <param name="al_title" value="appletloadertest">
+    
+    <!-- Main Applet Class -->
+    <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
+    
+    <!-- logo to paint while loading, will be centered -->
+    <param name="al_logo" value="appletlogo.png">
+    
+    <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
+    <param name="al_progressbar" value="appletprogress.gif">
+    
+    <!-- List of Jars to add to classpath -->
+    <param name="al_jars" value="lwjgl_applet.jar.pack.lzma, lwjgl.jar.pack.lzma, jinput.jar.pack.lzma, lwjgl_util.jar.pack.lzma">
+    
+    <!-- signed windows natives jar in a jar --> 
+    <param name="al_windows" value="windows_natives.jar.lzma">
+    
+    <!-- signed linux natives jar in a jar --> 
+    <param name="al_linux" value="linux_natives.jar.lzma">
+    
+    <!-- signed mac osx natives jar in a jar --> 
+    <param name="al_mac" value="macosx_natives.jar.lzma">
+
+    <!-- signed solaris natives jar in a jar --> 
+    <param name="al_solaris" value="solaris_natives.jar.lzma">
+    
+    <!-- Tags under here are optional -->
+    
+    <!-- Version of Applet, important otherwise applet won't be cached, version change will update applet, must be int or float -->
+    <!-- <param name="al_version" value="0.1"> -->
+    
+    <!-- whether to use cache - defaults to true -->
+    <!-- <param name="al_cache" value="true"> -->
+    
+    <!-- background color to paint with, defaults to white -->
+    <!-- <param name="boxbgcolor" value="#000000"> -->
+    
+    <!-- foreground color to paint with, defaults to black -->
+    <!-- <param name="boxfgcolor" value="#ffffff"> -->
+    
+    <!-- whether to run in debug mode -->
+    <!-- <param name="al_debug" value="true"> -->
+    
+    <!-- whether to prepend host to cache path - defaults to true -->
+    <!-- <param name="al_prepend_host" value="true"> -->
+  	
+    <param name="separate_jvm" value="true">
+  </applet>
+
+  <p>
+    if <code>al_debug</code> is true the applet will load and extract resources with a delay, to be able to see the loader process.
+  </p>
+
+  </body>
+</html>

Deleted: trunk/LWJGL/applet/appletloader.html
===================================================================
--- trunk/LWJGL/applet/appletloader.html	2010-08-28 13:47:18 UTC (rev 3405)
+++ trunk/LWJGL/applet/appletloader.html	2010-08-28 16:39:16 UTC (rev 3406)
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <title>AppletLoader</title>
-  </head>
-  <body>
-
-  <applet code="org.lwjgl.util.applet.AppletLoader" archive="lwjgl_util_applet.jar, lzma.jar" codebase="." width="640" height="480">
-  
-    <!-- The following tags are mandatory -->
-    
-    <!-- Name of Applet, will be used as name of directory it is saved in, and will uniquely identify it in cache -->
-    <param name="al_title" value="appletloadertest">
-    
-    <!-- Main Applet Class -->
-    <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
-    
-    <!-- logo to paint while loading, will be centered -->
-    <param name="al_logo" value="appletlogo.png">
-    
-    <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
-    <param name="al_progressbar" value="appletprogress.gif">
-    
-    <!-- List of Jars to add to classpath -->
-    <param name="al_jars" value="lwjgl_applet.jar.pack.lzma, lwjgl.jar.pack.lzma, jinput.jar.pack.lzma, lwjgl_util.jar.pack.lzma, res.jar.lzma">
-    
-    <!-- signed windows natives jar in a jar --> 
-    <param name="al_windows" value="windows_natives.jar.lzma">
-    
-    <!-- signed linux natives jar in a jar --> 
-    <param name="al_linux" value="linux_natives.jar.lzma">
-    
-    <!-- signed mac osx natives jar in a jar --> 
-    <param name="al_mac" value="macosx_natives.jar.lzma">
-
-    <!-- signed solaris natives jar in a jar --> 
-    <param name="al_solaris" value="solaris_natives.jar.lzma">
-    
-    <!-- Tags under here are optional -->
-    
-    <!-- Version of Applet, important otherwise applet won't be cached, version change will update applet, must be int or float -->
-    <!-- <param name="al_version" value="0.1"> -->
-    
-    <!-- whether to use cache - defaults to true -->
-    <!-- <param name="al_cache" value="true"> -->
-    
-    <!-- background color to paint with, defaults to white -->
-    <!-- <param name="boxbgcolor" value="#000000"> -->
-    
-    <!-- foreground color to paint with, defaults to black -->
-    <!-- <param name="boxfgcolor" value="#ffffff"> -->
-    
-    <!-- whether to run in debug mode -->
-    <!-- <param name="al_debug" value="true"> -->
-    
-    <!-- whether to prepend host to cache path - defaults to true -->
-    <!-- <param name="al_prepend_host" value="true"> -->
-    
-    <!-- main applet specific params -->
-    <param name="test" value="org.lwjgl.test.opengl.awt.AWTGearsCanvas">
-  	
-  	<param name="separate_jvm" value="true">
-  </applet>
-
-  <p>
-    if <code>al_debug</code> is true the applet will load and extract resources with a delay, to be able to see the loader process.
-  </p>
-
-  </body>
-</html>

Added: trunk/LWJGL/applet/basic/basicapplet.html
===================================================================
--- trunk/LWJGL/applet/basic/basicapplet.html	                        (rev 0)
+++ trunk/LWJGL/applet/basic/basicapplet.html	2010-08-28 16:39:16 UTC (rev 3406)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <title>AppletLoader</title>
+  </head>
+  <body>
+
+  <applet code="org.lwjgl.util.applet.AppletLoader" archive="lwjgl_util_applet.jar" codebase="." width="640" height="480">
+  
+    <!-- The following tags are mandatory -->
+    
+    <!-- Name of Applet, will be used as name of directory it is saved in, and will uniquely identify it in cache -->
+    <param name="al_title" value="appletloadertest">
+    
+    <!-- Main Applet Class -->
+    <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
+    
+    <!-- logo to paint while loading, will be centered -->
+    <param name="al_logo" value="appletlogo.png">
+    
+    <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
+    <param name="al_progressbar" value="appletprogress.gif">
+    
+    <!-- List of Jars to add to classpath -->
+    <param name="al_jars" value="lwjgl_applet.jar, lwjgl.jar, jinput.jar, lwjgl_util.jar">
+    
+    <!-- signed windows natives jar in a jar --> 
+    <param name="al_windows" value="windows_natives.jar">
+    
+    <!-- signed linux natives jar in a jar --> 
+    <param name="al_linux" value="linux_natives.jar">
+    
+    <!-- signed mac osx natives jar in a jar --> 
+    <param name="al_mac" value="macosx_natives.jar">
+
+    <!-- signed solaris natives jar in a jar --> 
+    <param name="al_solaris" value="solaris_natives.jar">
+    
+    <!-- Tags under here are optional -->
+    
+    <!-- Version of Applet, important otherwise applet won't be cached, version change will update applet, must be int or float -->
+    <!-- <param name="al_version" value="0.1"> -->
+    
+    <!-- whether to use cache - defaults to true -->
+    <!-- <param name="al_cache" value="true"> -->
+    
+    <!-- background color to paint with, defaults to white -->
+    <!-- <param name="boxbgcolor" value="#000000"> -->
+    
+    <!-- foreground color to paint with, defaults to black -->
+    <!-- <param name="boxfgcolor" value="#ffffff"> -->
+    
+    <!-- whether to run in debug mode -->
+    <!-- <param name="al_debug" value="true"> -->
+    
+    <!-- whether to prepend host to cache path - defaults to true -->
+    <!-- <param name="al_prepend_host" value="true"> -->
+  	
+    <param name="separate_jvm" value="true">
+  </applet>
+
+  <p>
+    if <code>al_debug</code> is true the applet will load and extract resources with a delay, to be able to see the loader process.
+  </p>
+
+  </body>
+</html>

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-08-28 13:47:18 UTC (rev 3405)
+++ trunk/LWJGL/build.xml	2010-08-28 16:39:16 UTC (rev 3406)
@@ -443,11 +443,12 @@
 		</antcall>
 		<antcall target="lzma">
 			<param name="input" value="${dir}${jarfile}.jar.pack"/>
-			<param name="output" value="${dir}${jarfile}.jar.pack.lzma"/>
+			<param name="output" value="${outputdir}${jarfile}.jar.pack.lzma"/>
 		</antcall>
-		<delete file="${dir}${jarfile}-repack.jar"/>
+		<!--delete file="${dir}${jarfile}-repack.jar"/-->
 		<delete file="${dir}${jarfile}.jar.pack"/>
-		<delete file="${dir}${jarfile}.jar"/>
+		<!--delete file="${dir}${jarfile}.jar"/-->
+		<rename src="${dir}${jarfile}-repack.jar" dest="${dir}${jarfile}.jar" replace="yes"/>
 	</target>
 	
 	<target name="compress-resource">

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2010-08-28 13:47:18 UTC (rev 3405)
+++ trunk/LWJGL/platform_build/build-applet.xml	2010-08-28 16:39:16 UTC (rev 3406)
@@ -31,121 +31,121 @@
 	<target name="-applet">
 	
 		<!-- Create lwjgl_applet.jar -->
-		<jar destfile="applet/lwjgl_applet.jar" taskname="lwjgl_applet.jar">
+		<jar destfile="applet/basic/lwjgl_applet.jar" taskname="lwjgl_applet.jar">
 			<fileset refid="lwjgl_applet.fileset" />
 		</jar>
 		
 		<!-- create each of the native jars -->
-		<jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar">
+		<jar destfile="applet/basic/windows_natives.jar" taskname="windows_natives.jar">
 			<fileset dir="${lwjgl.lib}/windows">
 				<patternset refid="lwjgl-windows.fileset"/>
 			</fileset>
 		</jar>
-		<signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="applet/basic/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		
-		<jar destfile="applet/linux_natives.jar" taskname="linux_natives.jar">
+		<jar destfile="applet/basic/linux_natives.jar" taskname="linux_natives.jar">
 			<fileset dir="${lwjgl.lib}/linux">
 				<patternset refid="lwjgl-linux.fileset"/>
 			</fileset>
 		</jar>
-		<signjar jar="applet/linux_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="applet/basic/linux_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 			
-		<jar destfile="applet/macosx_natives.jar" taskname="macosx_natives.jar">
+		<jar destfile="applet/basic/macosx_natives.jar" taskname="macosx_natives.jar">
 			<fileset dir="${lwjgl.lib}/macosx">
 				<patternset refid="lwjgl-macosx.fileset"/>
 			</fileset>
 		</jar>
-		<signjar jar="applet/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="applet/basic/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		
-		<jar destfile="applet/solaris_natives.jar" taskname="solaris_natives.jar">
+		<jar destfile="applet/basic/solaris_natives.jar" taskname="solaris_natives.jar">
 			<fileset dir="${lwjgl.lib}/solaris">
 				<patternset refid="lwjgl-solaris.fileset"/>
 			</fileset>
 		</jar>
-		<signjar jar="applet/solaris_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>		
+		<signjar jar="applet/basic/solaris_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>		
 			
   	<jar destfile="${lwjgl.lib}/lwjgl_util_applet.jar" update="true">
   		<fileset dir="${lwjgl.res}" includes="applet*"/>
   	</jar>
 
-	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet" overwrite="true"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" overwrite="true"/>
-		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet" overwrite="true"/>
-		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet" overwrite="true"/>
-		<copy file="${lwjgl.lib}/jinput.jar" todir="applet" overwrite="true"/>
-		<copy file="${lwjgl.lib}/lzma.jar" todir="applet" overwrite="true"/>
-		<zip destfile="applet/res.jar">
-		  <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
-		</zip>
-		<signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
-		<signjar jar="applet/lzma.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet/basic" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet/basic" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet/basic" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet/basic" overwrite="true"/>
+		<copy file="${lwjgl.lib}/jinput.jar" todir="applet/basic" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lzma.jar" todir="applet/advance" overwrite="true"/>
 		
+		<signjar jar="applet/basic/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="applet/advance/lzma.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<copy file="applet/basic/lwjgl_util_applet.jar" todir="applet/advance" overwrite="true"/>
+
 		<!-- LZMA only, for 1.4 only clients -->
-		<antcall target="compress-resource">
-			<param name="input" value="applet/lwjgl.jar"/>
-			<param name="output" value="applet/lwjgl.jar.lzma"/>
+		<!--antcall target="compress-resource">
+			<param name="input" value="applet/basic/lwjgl.jar"/>
+			<param name="output" value="applet/advance/lwjgl.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/lwjgl-debug.jar"/>
-			<param name="output" value="applet/lwjgl-debug.jar.lzma"/>
+			<param name="input" value="applet/basic/lwjgl-debug.jar"/>
+			<param name="output" value="applet/advance/lwjgl-debug.jar.lzma"/>
 		</antcall>
 		
 		<antcall target="compress-resource">
-			<param name="input" value="applet/lwjgl_util.jar"/>
-			<param name="output" value="applet/lwjgl_util.jar.lzma"/>
+			<param name="input" value="applet/basic/lwjgl_util.jar"/>
+			<param name="output" value="applet/advance/lwjgl_util.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/jinput.jar"/>
-			<param name="output" value="applet/jinput.jar.lzma"/>
+			<param name="input" value="applet/basic/jinput.jar"/>
+			<param name="output" value="applet/advance/jinput.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/lwjgl_applet.jar"/>
-			<param name="output" value="applet/lwjgl_applet.jar.lzma"/>
+			<param name="input" value="applet/basic/lwjgl_applet.jar"/>
+			<param name="output" value="applet/advance/lwjgl_applet.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/windows_natives.jar"/>
-			<param name="output" value="applet/windows_natives.jar.lzma"/>
-		</antcall>		
+			<param name="input" value="applet/basic/windows_natives.jar"/>
+			<param name="output" value="applet/advance/windows_natives.jar.lzma"/>
+		</antcall -->
+		
 		<antcall target="compress-sign-class">
-			<param name="dir" value="applet/"/>
+			<param name="dir" value="applet/basic/"/>
+			<param name="outputdir" value="applet/advance/"/>
 			<param name="jarfile" value="lwjgl"/>
 		</antcall>
 		<antcall target="compress-sign-class">
-			<param name="dir" value="applet/"/>
+			<param name="dir" value="applet/basic/"/>
+			<param name="outputdir" value="applet/advance/"/>
 			<param name="jarfile" value="lwjgl-debug"/>
 		</antcall>
 		<antcall target="compress-sign-class">
-			<param name="dir" value="applet/"/>
+			<param name="dir" value="applet/basic/"/>
+			<param name="outputdir" value="applet/advance/"/>
 			<param name="jarfile" value="lwjgl_util"/>
 		</antcall>
 		<antcall target="compress-sign-class">
-			<param name="dir" value="applet/"/>
+			<param name="dir" value="applet/basic/"/>
+			<param name="outputdir" value="applet/advance/"/>
 			<param name="jarfile" value="jinput"/>
 		</antcall>
 		<antcall target="compress-sign-class">
-			<param name="dir" value="applet/"/>
+			<param name="dir" value="applet/basic/"/>
+			<param name="outputdir" value="applet/advance/"/>
 			<param name="jarfile" value="lwjgl_applet"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/windows_natives.jar"/>
-			<param name="output" value="applet/windows_natives.jar.lzma"/>
+			<param name="input" value="applet/basic/windows_natives.jar"/>
+			<param name="output" value="applet/advance/windows_natives.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/macosx_natives.jar"/>
-			<param name="output" value="applet/macosx_natives.jar.lzma"/>
+			<param name="input" value="applet/basic/macosx_natives.jar"/>
+			<param name="output" value="applet/advance/macosx_natives.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/linux_natives.jar"/>
-			<param name="output" value="applet/linux_natives.jar.lzma"/>
+			<param name="input" value="applet/basic/linux_natives.jar"/>
+			<param name="output" value="applet/advance/linux_natives.jar.lzma"/>
 		</antcall>
 		<antcall target="compress-resource">
-			<param name="input" value="applet/solaris_natives.jar"/>
-			<param name="output" value="applet/solaris_natives.jar.lzma"/>
-		</antcall>		
-		
-		<antcall target="compress-resource">
-			<param name="input" value="applet/res.jar"/>
-			<param name="output" value="applet/res.jar.lzma"/>
+			<param name="input" value="applet/basic/solaris_natives.jar"/>
+			<param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
 		</antcall>
 	</target>
 </project>
\ No newline at end of file


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


