java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 15)

Brought to you by: kappa1, matzon, spasi

java-game-lib-cvs — Commits to the repository will be send to this list.

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 13 14 15 16 17 .. 238 > >> (Page 15 of 238)

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3491] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-02-17 19:10:05

Revision: 3491
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3491&view=rev
Author:   kappa1
Date:     2011-02-17 19:09:59 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
AppletLoader Fix: set correct context classloader for the applet loaded by the AppletLoader. Credit to arielsan for finding the issue and supplying a fix/patch.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-14 20:42:15 UTC (rev 3490)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-17 19:09:59 UTC (rev 3491)
@@ -774,7 +774,7 @@
 			// set lwjgl properties
 			setLWJGLProperties();
 
-			// make applet switch on EDT as an AWT/Swing permission dialog could be called
+			// make applet switch on the EDT as an AWT/Swing permission dialog could be called
 			EventQueue.invokeAndWait(new Runnable() {
 	            public void run() {
 					try {
@@ -1023,7 +1023,10 @@
 		percentage = 100;
 
 		debug_sleep(2000);
-
+		
+		// set correct context classloader for lwjgl applet
+		Thread.currentThread().setContextClassLoader(classLoader);
+		
 		Class appletClass = classLoader.loadClass(getParameter("al_main"));
 		lwjglApplet = (Applet) appletClass.newInstance();
 


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

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

From: <ma...@us...> - 2011-02-14 20:42:22

Revision: 3490
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3490&view=rev
Author:   matzon
Date:     2011-02-14 20:42:15 +0000 (Mon, 14 Feb 2011)

Log Message:
-----------
arielsans maven jinput patch 

Modified Paths:
--------------
    trunk/LWJGL/maven/build.xml
    trunk/LWJGL/maven/lwjgl-parent.pom
    trunk/LWJGL/maven/lwjgl.pom
    trunk/LWJGL/platform_build/build-maven.xml

Added Paths:
-----------
    trunk/LWJGL/maven/jinput-platform.pom
    trunk/LWJGL/maven/jinput.pom

Modified: trunk/LWJGL/maven/build.xml
===================================================================
--- trunk/LWJGL/maven/build.xml	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/build.xml	2011-02-14 20:42:15 UTC (rev 3490)
@@ -1,15 +1,26 @@
 <project name="maven" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 	
-	<property name="mavenrepo"			value="mvnrepo" />
-	<property name="mavenrepoId"		value="tmprepo" />
+	<property name="mavenrepo"			value="file://m2repo" />
+	<property name="mavenrepoId"		value="tmprepoid" />
 	
+	<target name="install">
+		<antcall target="execute">
+			<param name="mvncommand" value="org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file"/>
+		</antcall>
+	</target>
 	
 	<target name="deploy">
+		<antcall target="execute">
+			<param name="mvncommand" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+		</antcall>
+	</target>
+	
+	<target name="execute">
 		
-		<!-- deploying parent.pom -->
+		<!-- parent.pom -->
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-parent.pom" />
@@ -17,10 +28,10 @@
             <arg value="-Plwjglgpg" />
         </artifact:mvn>  
             
-        <!-- deploying lwjgl.jar -->    
+        <!-- lwjgl.jar -->    
         
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl.pom" />
@@ -29,7 +40,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl.pom" />
@@ -39,7 +50,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl.pom" />
@@ -48,10 +59,10 @@
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
 		
-		<!-- deploying natives -->    
+		<!-- lwjgl natives -->    
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -61,7 +72,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -71,7 +82,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -80,10 +91,10 @@
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
 		
-		<!-- deploying lwjgl_util.jar -->    
+		<!-- lwjgl_util.jar -->    
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -92,7 +103,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -102,7 +113,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -111,10 +122,10 @@
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
 		
-		<!-- deploying lwjgl_util_applet.jar -->    
+		<!-- lwjgl_util_applet.jar -->    
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util_applet.pom" />
@@ -123,7 +134,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -133,7 +144,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -141,7 +152,50 @@
 			<arg value="-Dclassifier=javadoc" />
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
+		
+		<!-- jinput.jar -->    
+		
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput.pom" />
+			<arg value="-Dfile=jinput.jar" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<!-- jinput natives -->    
+				
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput-platform.pom" />
+			<arg value="-Dfile=jinput-platform-natives-win.jar" />
+			<arg value="-Dclassifier=natives-win" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput-platform.pom" />
+			<arg value="-Dfile=jinput-platform-natives-linux.jar" />
+			<arg value="-Dclassifier=natives-linux" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput-platform.pom" />
+			<arg value="-Dfile=jinput-platform-natives-mac.jar" />
+			<arg value="-Dclassifier=natives-mac" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
 	</target>
-
-
+	
 </project>
\ No newline at end of file

Added: trunk/LWJGL/maven/jinput-platform.pom
===================================================================
--- trunk/LWJGL/maven/jinput-platform.pom	                        (rev 0)
+++ trunk/LWJGL/maven/jinput-platform.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -0,0 +1,32 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.lwjgl.lwjgl</groupId>
+		<artifactId>parent</artifactId>
+		<version>@VERSION@</version>
+	</parent>
+	<groupId>org.lwjgl.lwjgl</groupId>
+	<artifactId>jinput-platform</artifactId>
+	<packaging>jar</packaging>
+	<name>JInput - Java Game Controller API</name>
+	<version>@VERSION@</version>
+	<description>JInput - Java Game Controller API</description>
+	<url>http://java.net/projects/jinput</url>
+	<licenses>
+		<license>
+			<name>BSD</name>
+			<url>http://www.opensource.org/licenses/bsd-license.php</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>Members</id>
+			<url>http://java.net/projects/jinput/members</url>
+		</developer>
+	</developers>
+	<scm>
+		<url>http://java.net/projects/jinput/sources/svn/show</url>
+		<connection>https://svn.java.net/svn/jinput~svn </connection>
+	</scm>
+</project>

Added: trunk/LWJGL/maven/jinput.pom
===================================================================
--- trunk/LWJGL/maven/jinput.pom	                        (rev 0)
+++ trunk/LWJGL/maven/jinput.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -0,0 +1,52 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.lwjgl.lwjgl</groupId>
+		<artifactId>parent</artifactId>
+		<version>@VERSION@</version>
+	</parent>
+	<groupId>org.lwjgl.lwjgl</groupId>
+	<artifactId>jinput</artifactId>
+	<packaging>jar</packaging>
+	<name>JInput - Java Game Controller API</name>
+	<version>@VERSION@</version>
+	<description>JInput - Java Game Controller API</description>
+	<url>http://java.net/projects/jinput</url>
+	<licenses>
+		<license>
+			<name>BSD</name>
+			<url>http://www.opensource.org/licenses/bsd-license.php</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>Members</id>
+			<url>http://java.net/projects/jinput/members</url>
+		</developer>
+	</developers>
+	<scm>
+		<url>http://java.net/projects/jinput/sources/svn/show</url>
+		<connection>https://svn.java.net/svn/jinput~svn </connection>
+	</scm>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-win</classifier>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-linux</classifier>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-mac</classifier>
+		</dependency>
+	</dependencies>
+</project>

Modified: trunk/LWJGL/maven/lwjgl-parent.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl-parent.pom	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/lwjgl-parent.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -20,8 +20,8 @@
   </scm>
   <developers>
     <developer>
-      <id>Matzon</id>
-      <name>Brian Matzon</name>
+      <id>Developers</id>
+      <url>http://lwjgl.org/credits.php</url>
     </developer>
   </developers>
 </project>

Modified: trunk/LWJGL/maven/lwjgl.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl.pom	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/lwjgl.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -36,5 +36,10 @@
 			<version>${project.version}</version>
 			<classifier>natives-mac</classifier>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 </project>

Modified: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/platform_build/build-maven.xml	2011-02-14 20:42:15 UTC (rev 3490)
@@ -43,6 +43,7 @@
 		<antcall target="-createmavennativejars" />
 		<antcall target="-copymavenpoms"/>
 		<antcall target="-copymavendeploybuild"/>
+		<antcall target="-addjinput"/>
 		<antcall target="-copymaventdist"/>
 	</target>
 
@@ -148,6 +149,43 @@
 			</fileset>
 		</copy>
 	</target>
+	
+	<!-- JINPUT -->
+	<target name="-addjinput">
+		<antcall target="-copyjinputjar" />
+		<antcall target="-createmavennativejinputjars" />
+	</target>
+	
+	<target name="-copyjinputjar">
+		<copy todir="${lwjgl.dstMaven}">
+			<fileset dir="${lwjgl.lib}">
+				<patternset>
+					<include name="jinput.jar" />
+				</patternset>
+			</fileset>
+		</copy>
+	</target>
+	
+	
+	<target name="-createmavennativejinputjars">
+		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-win.jar" taskname="jinput-platform-natives-win.jar">
+			<fileset dir="${lwjgl.lib}/windows">
+				<patternset refid="lwjgl-windows-jinput.fileset"/>
+			</fileset>
+		</jar>
+		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-linux.jar" taskname="jinput-platform-natives-linux.jar">
+			<fileset dir="${lwjgl.lib}/linux">
+				<patternset refid="lwjgl-linux-jinput.fileset"/>
+			</fileset>
+		</jar>
+		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-mac.jar" taskname="jinput-platform-natives-mac.jar">
+			<fileset dir="${lwjgl.lib}/macosx">
+				<patternset refid="lwjgl-macosx-jinput.fileset"/>
+			</fileset>
+		</jar>
+	</target>
+	
+	<!-- END JINPUT -->
 
 	<target name="-copymaventdist">
 		<zip destfile="${lwjgl.dist}/lwjgl-maven-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="maven/**" />


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3489] tags/lwjgl2.7.1/

From: <ma...@us...> - 2011-02-09 21:12:07

Revision: 3489
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3489&view=rev
Author:   matzon
Date:     2011-02-09 21:12:01 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
tagging 2.7.1

Added Paths:
-----------
    tags/lwjgl2.7.1/


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

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

From: <ma...@us...> - 2011-02-09 21:09:40

Revision: 3488
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3488&view=rev
Author:   matzon
Date:     2011-02-09 21:09:33 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
Upgrading OpenAL-Soft to latest version .. cbe288aa93de6 and moving to 2.7.1

Modified Paths:
--------------
    trunk/LWJGL/libs/linux/libopenal.so
    trunk/LWJGL/libs/linux/libopenal64.so
    trunk/LWJGL/libs/solaris/libopenal.so
    trunk/LWJGL/libs/solaris/libopenal64.so
    trunk/LWJGL/libs/windows/OpenAL32.dll
    trunk/LWJGL/libs/windows/OpenAL64.dll
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/libs/linux/libopenal.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/linux/libopenal64.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/solaris/libopenal.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/solaris/libopenal64.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/windows/OpenAL32.dll
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/windows/OpenAL64.dll
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2011-02-06 21:07:30 UTC (rev 3487)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2011-02-09 21:09:33 UTC (rev 3488)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 				location="doc" />
 	<property name="lwjgl.temp" 				location="temp" />
 	<property name="lwjgl.res" 					location="res" />
-	<property name="lwjgl.version" 				value="2.7" />
+	<property name="lwjgl.version" 				value="2.7.1" />
 	<property name="lwjgl.web" 						location="www" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-02-06 21:07:30 UTC (rev 3487)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-02-09 21:09:33 UTC (rev 3488)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.7";
+	private static final String VERSION = "2.7.1";
 
 	private static final String POSTFIX64BIT = "64";
 


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

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

From: <ma...@us...> - 2011-02-06 21:07:36

Revision: 3487
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3487&view=rev
Author:   matzon
Date:     2011-02-06 21:07:30 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
Added endolf to credits

Modified Paths:
--------------
    trunk/LWJGL/doc/CREDITS

Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS	2011-02-06 16:42:42 UTC (rev 3486)
+++ trunk/LWJGL/doc/CREDITS	2011-02-06 21:07:30 UTC (rev 3487)
@@ -22,6 +22,7 @@
 additional credits goes to:
  - Joseph I. Valenzuela [OpenAL stuff]
  - Lev Povalahev [OpenGL Extensions]
+ - Endolf [Nightly builds and JInput]
 
 The LWJGL project includes files from or depends on the following projects:
  - OpenGL, SGI - http://opengl.org/


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3486] tags/lwjgl2.7/

From: <ma...@us...> - 2011-02-06 16:42:48

Revision: 3486
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3486&view=rev
Author:   matzon
Date:     2011-02-06 16:42:42 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
Tagging 2.7

Added Paths:
-----------
    tags/lwjgl2.7/


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3485] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-02-03 22:12:47

Revision: 3485
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3485&view=rev
Author:   kappa1
Date:     2011-02-03 22:12:41 +0000 (Thu, 03 Feb 2011)

Log Message:
-----------
AppletLoader - another attempt to fix the logo. Thx again to arielsan for spotting issues.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-03 09:35:00 UTC (rev 3484)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-03 22:12:41 UTC (rev 3485)
@@ -1555,14 +1555,38 @@
 	 * @return the Image file
 	 */
 	protected Image getImage(String s) {
+		
+		Image image = null;
+		
 		try {
-			URL url = url = new URL(getCodeBase(), s);
-				
-			// if image failed to load, try another method
-			if (url == null) {
-				url = Thread.currentThread().getContextClassLoader().getResource(s);
-			}
+			image = getImage(new URL(getCodeBase(), s));
+		} catch (Exception e) {
+			/* */
+		}
+		
+		// if image failed to load, try another method
+		if (image == null) {
+			image = getImage(Thread.currentThread().getContextClassLoader().getResource(s));
+		}
+		
+		// if image loaded sucessfully return it
+		if (image != null) {
+			return image;
+		}
 
+		// show error as image could not be loaded
+		fatalErrorOccured("Unable to load logo and progressbar images", null);
+		return null;
+	}
+	
+	/**
+	 * Get Image from path provided
+	 *
+	 * @param url location of the image
+	 * @return the Image file
+	 */
+	public Image getImage(URL url) {
+		try {
 			Image image = super.getImage(url);
 
 			// wait for image to load
@@ -1577,13 +1601,10 @@
 		} catch (Exception e) {
 			/* */
 		}
-
-		// show error as image could not be loaded
-		fatalErrorOccured("Unable to load logo and progressbar images", null);
+		
 		return null;
 	}
 
-
 	/**
 	 * Get jar name from URL.
 	 *


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3484] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-02-03 09:35:07

Revision: 3484
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3484&view=rev
Author:   kappa1
Date:     2011-02-03 09:35:00 +0000 (Thu, 03 Feb 2011)

Log Message:
-----------
AppletLoader - added small bit of missing code (doh), thx to arielsan for spotting it

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-02 22:29:18 UTC (rev 3483)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-03 09:35:00 UTC (rev 3484)
@@ -1560,7 +1560,7 @@
 				
 			// if image failed to load, try another method
 			if (url == null) {
-				Thread.currentThread().getContextClassLoader().getResource(s);
+				url = Thread.currentThread().getContextClassLoader().getResource(s);
 			}
 
 			Image image = super.getImage(url);


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3483] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-02-02 22:29:24

Revision: 3483
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3483&view=rev
Author:   kappa1
Date:     2011-02-02 22:29:18 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
AppletLoader - tweak image loading to fix cases where it doesn't work

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-28 23:06:06 UTC (rev 3482)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-02 22:29:18 UTC (rev 3483)
@@ -774,7 +774,7 @@
 			// set lwjgl properties
 			setLWJGLProperties();
 
-			// switch to LWJGL Applet
+			// make applet switch on EDT as an AWT/Swing permission dialog could be called
 			EventQueue.invokeAndWait(new Runnable() {
 	            public void run() {
 					try {
@@ -1556,11 +1556,11 @@
 	 */
 	protected Image getImage(String s) {
 		try {
-			URL url = Thread.currentThread().getContextClassLoader().getResource("/"+s);
-
-			// if image not found in jar, look outside it
+			URL url = url = new URL(getCodeBase(), s);
+				
+			// if image failed to load, try another method
 			if (url == null) {
-				url = new URL(getCodeBase(), s);
+				Thread.currentThread().getContextClassLoader().getResource(s);
 			}
 
 			Image image = super.getImage(url);


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3482] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-28 23:06:16

Revision: 3482
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3482&view=rev
Author:   kappa1
Date:     2011-01-28 23:06:06 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
AppletLoader - added support for gzip files

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-28 21:55:16 UTC (rev 3481)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-28 23:06:06 UTC (rev 3482)
@@ -79,6 +79,7 @@
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200;
+import java.util.zip.GZIPInputStream;
 
 import sun.security.util.SecurityConstants;
 
@@ -1295,7 +1296,41 @@
 		// delete LZMA file, as it is no longer needed
 		f.delete();
 	}
+	
+	/**
+	 *  Extract GZip File
+	 *  @param in Input path to pack file
+	 *  @param out output path to resulting file
+	 *  @throws Exception if any errors occur
+	 */
+	protected void extractGZip(String in, String out) throws Exception {
 
+		File f = new File(in);
+		FileInputStream fileInputHandle = new FileInputStream(f);
+
+		InputStream inputHandle = new GZIPInputStream(fileInputHandle);
+
+		OutputStream outputHandle;
+		outputHandle = new FileOutputStream(out);
+
+		byte [] buffer = new byte [1<<14];
+
+		int ret = inputHandle.read(buffer);
+		while (ret >= 1) {
+			outputHandle.write(buffer,0,ret);
+			ret = inputHandle.read(buffer);
+		}
+
+		inputHandle.close();
+		outputHandle.close();
+
+		outputHandle = null;
+		inputHandle = null;
+
+		// delete GZip file, as it is no longer needed
+		f.delete();
+	}
+	
 	/**
 	 *  Extract Pack File
 	 *  @param in Input path to pack file
@@ -1316,7 +1351,7 @@
 	}
 
 	/**
-	 *  Extract all jars from any lzma/pack files
+	 *  Extract all jars from any lzma/gz/pack files
 	 *
 	 *  @param path output path
 	 *  @throws Exception if any errors occur
@@ -1325,7 +1360,7 @@
 		setState(STATE_EXTRACTING_PACKAGES);
 
 		float increment = (float) 10.0 / urlList.length;
-		// extract all lzma and pack.lzma files
+		// extract all gz, lzma, pack.gz and pack.lzma files
 		for (int i = 0; i < urlList.length; i++) {
 
 			// if file has not changed, skip it
@@ -1333,7 +1368,7 @@
 
 			percentage = 55 + (int) (increment * (i+1));
 			String filename = getFileName(urlList[i]);
-
+			
 			if (filename.endsWith(".pack.lzma")) {
 				subtaskMessage = "Extracting: " + filename + " to " + filename.replaceAll(".lzma", "");
 				debug_sleep(1000);
@@ -1343,6 +1378,15 @@
 				debug_sleep(1000);
 				extractPack(path + filename.replaceAll(".lzma", ""), path + filename.replaceAll(".pack.lzma", ""));
 			}
+			else if (filename.endsWith(".pack.gz")) {
+				subtaskMessage = "Extracting: " + filename + " to " + filename.replaceAll(".gz", "");
+				debug_sleep(1000);
+				extractGZip(path + filename, path + filename.replaceAll(".gz", ""));
+
+				subtaskMessage = "Extracting: " + filename.replaceAll(".gz", "") + " to " + filename.replaceAll(".pack.gz", "");
+				debug_sleep(1000);
+				extractPack(path + filename.replaceAll(".gz", ""), path + filename.replaceAll(".pack.gz", ""));
+			}
 			else if (filename.endsWith(".pack")) {
 				subtaskMessage = "Extracting: " + filename + " to " + filename.replace(".pack", "");
 				debug_sleep(1000);
@@ -1353,6 +1397,11 @@
 				debug_sleep(1000);
 				extractLZMA(path + filename, path + filename.replace(".lzma", ""));
 			}
+			else if (filename.endsWith(".gz")) {
+				subtaskMessage = "Extracting: " + filename + " to " + filename.replace(".gz", "");
+				debug_sleep(1000);
+				extractGZip(path + filename, path + filename.replace(".gz", ""));
+			}
 		}
 	}
 
@@ -1546,10 +1595,14 @@
 
 		if (fileName.endsWith(".pack.lzma")) {
 			fileName = fileName.replaceAll(".pack.lzma", "");
+		} else if (fileName.endsWith(".pack.gz")) {
+			fileName = fileName.replaceAll(".pack.gz", "");
 		} else if (fileName.endsWith(".pack")) {
 			fileName = fileName.replaceAll(".pack", "");
 		} else if (fileName.endsWith(".lzma")) {
 			fileName = fileName.replaceAll(".lzma", "");
+		} else if (fileName.endsWith(".gz")) {
+			fileName = fileName.replaceAll(".gz", "");
 		}
 
 		return fileName.substring(fileName.lastIndexOf('/') + 1);


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

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

From: <ma...@us...> - 2011-01-28 21:55:22

Revision: 3481
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3481&view=rev
Author:   matzon
Date:     2011-01-28 21:55:16 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
applying patch to update lwjgl_util_applet.jar with resources directly

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

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2011-01-28 21:51:29 UTC (rev 3480)
+++ trunk/LWJGL/build.xml	2011-01-28 21:55:16 UTC (rev 3481)
@@ -142,6 +142,7 @@
 
 		<!-- Create lwjgl_util_applet.jar -->
 		<jar destfile="${lwjgl.temp}/jar/lwjgl_util_applet.jar" taskname="lwjgl_util_applet.jar">
+			<fileset dir="${lwjgl.res}" includes="applet*"/>
 			<fileset refid="lwjgl_util_applet.fileset" />
 			<manifest>
 				<attribute name="Sealed" value="true"/>

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2011-01-28 21:51:29 UTC (rev 3480)
+++ trunk/LWJGL/platform_build/build-applet.xml	2011-01-28 21:55:16 UTC (rev 3481)
@@ -63,10 +63,6 @@
 			</fileset>
 		</jar>
 		<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/basic" overwrite="true"/>
 		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet/basic" overwrite="true"/>


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

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

From: <ma...@us...> - 2011-01-28 21:51:35

Revision: 3480
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3480&view=rev
Author:   matzon
Date:     2011-01-28 21:51:29 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
adding initial maven support by Ruben Garat, updating Credits file in the process

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/doc/CREDITS

Added Paths:
-----------
    trunk/LWJGL/maven/
    trunk/LWJGL/maven/build.xml
    trunk/LWJGL/maven/lwjgl-parent.pom
    trunk/LWJGL/maven/lwjgl-platform.pom
    trunk/LWJGL/maven/lwjgl.pom
    trunk/LWJGL/maven/lwjgl_util.pom
    trunk/LWJGL/maven/lwjgl_util_applet.pom
    trunk/LWJGL/platform_build/build-maven.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2011-01-28 21:11:35 UTC (rev 3479)
+++ trunk/LWJGL/build.xml	2011-01-28 21:51:29 UTC (rev 3480)
@@ -6,6 +6,7 @@
 	<import file="platform_build/build-generator.xml"/>
 	<import file="platform_build/build-applet.xml"/>
 	<import file="platform_build/build-webstart.xml"/>
+	<import file="platform_build/build-maven.xml"/>
 
 	<!-- ================================================================== -->
 	<!-- Everything below this line is targets.															-->

Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS	2011-01-28 21:11:35 UTC (rev 3479)
+++ trunk/LWJGL/doc/CREDITS	2011-01-28 21:51:29 UTC (rev 3480)
@@ -16,6 +16,8 @@
  - Simon Felix
  - Ryan McNally 
  - Ciardhubh <ciardhubh[at]ciardhubh.de>
+ - Jens von Pilgrim
+ - Ruben Garat
  
 additional credits goes to:
  - Joseph I. Valenzuela [OpenAL stuff]

Added: trunk/LWJGL/maven/build.xml
===================================================================
--- trunk/LWJGL/maven/build.xml	                        (rev 0)
+++ trunk/LWJGL/maven/build.xml	2011-01-28 21:51:29 UTC (rev 3480)
@@ -0,0 +1,147 @@
+<project name="maven" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+	
+	<property name="mavenrepo"			value="mvnrepo" />
+	<property name="mavenrepoId"		value="tmprepo" />
+	
+	
+	<target name="deploy">
+		
+		<!-- deploying parent.pom -->
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl-parent.pom" />
+			<arg value="-Dfile=lwjgl-parent.pom" />
+            <arg value="-Plwjglgpg" />
+        </artifact:mvn>  
+            
+        <!-- deploying lwjgl.jar -->    
+        
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl.pom" />
+			<arg value="-Dfile=lwjgl.jar" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl.pom" />
+			<arg value="-Dfile=lwjgl-sources.jar" />
+			<arg value="-Dclassifier=sources" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl.pom" />
+			<arg value="-Dfile=lwjgl-javadoc.jar" />
+			<arg value="-Dclassifier=javadoc" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<!-- deploying natives -->    
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl-platform.pom" />
+			<arg value="-Dfile=lwjgl-platform-natives-win.jar" />
+			<arg value="-Dclassifier=natives-win" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl-platform.pom" />
+			<arg value="-Dfile=lwjgl-platform-natives-linux.jar" />
+			<arg value="-Dclassifier=natives-linux" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl-platform.pom" />
+			<arg value="-Dfile=lwjgl-platform-natives-mac.jar" />
+			<arg value="-Dclassifier=natives-mac" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<!-- deploying lwjgl_util.jar -->    
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl_util.pom" />
+			<arg value="-Dfile=lwjgl_util.jar" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl_util.pom" />
+			<arg value="-Dfile=lwjgl_util-sources.jar" />
+			<arg value="-Dclassifier=sources" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl_util.pom" />
+			<arg value="-Dfile=lwjgl_util-javadoc.jar" />
+			<arg value="-Dclassifier=javadoc" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<!-- deploying lwjgl_util_applet.jar -->    
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl_util_applet.pom" />
+			<arg value="-Dfile=lwjgl_util_applet.jar" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl_util.pom" />
+			<arg value="-Dfile=lwjgl_util_applet-sources.jar" />
+			<arg value="-Dclassifier=sources" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=lwjgl_util.pom" />
+			<arg value="-Dfile=lwjgl_util_applet-javadoc.jar" />
+			<arg value="-Dclassifier=javadoc" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+	</target>
+
+
+</project>
\ No newline at end of file

Added: trunk/LWJGL/maven/lwjgl-parent.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl-parent.pom	                        (rev 0)
+++ trunk/LWJGL/maven/lwjgl-parent.pom	2011-01-28 21:51:29 UTC (rev 3480)
@@ -0,0 +1,27 @@
+ <project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.lwjgl.lwjgl</groupId>
+  <artifactId>parent</artifactId>
+  <packaging>pom</packaging>
+  <name>Lighweight Java Game Library</name>
+ <version>@VERSION@</version>
+  <description>Lighweight Java Game Library</description>
+  <url>http://lwjgl.org/</url>
+  <licenses>
+    <license>
+      <name>BSD</name>
+      <url>http://lwjgl.org/license.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/trunk/</url>
+    <connection>https://java-game-lib.svn.sourceforge.net/svnroot/java-game-lib </connection>
+  </scm>
+  <developers>
+    <developer>
+      <id>Matzon</id>
+      <name>Brian Matzon</name>
+    </developer>
+  </developers>
+</project>

Added: trunk/LWJGL/maven/lwjgl-platform.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl-platform.pom	                        (rev 0)
+++ trunk/LWJGL/maven/lwjgl-platform.pom	2011-01-28 21:51:29 UTC (rev 3480)
@@ -0,0 +1,19 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.lwjgl.lwjgl</groupId>
+		<artifactId>parent</artifactId>
+		<version>@VERSION@</version>
+	</parent>
+	<groupId>org.lwjgl.lwjgl</groupId>
+	<artifactId>lwjgl-platform</artifactId>
+	<packaging>jar</packaging>
+	<name>Lighweight Java Game Library - Platform</name>
+	<version>@VERSION@</version>
+	<description>Lighweight Java Game Library - Platform</description>
+	<url>http://lwjgl.org/</url>
+	<scm>
+		<url>http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/trunk/</url>
+		<connection>https://java-game-lib.svn.sourceforge.net/svnroot/java-game-lib </connection>
+	</scm>
+</project>

Added: trunk/LWJGL/maven/lwjgl.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl.pom	                        (rev 0)
+++ trunk/LWJGL/maven/lwjgl.pom	2011-01-28 21:51:29 UTC (rev 3480)
@@ -0,0 +1,40 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.lwjgl.lwjgl</groupId>
+		<artifactId>parent</artifactId>
+		<version>@VERSION@</version>
+	</parent>
+	<groupId>org.lwjgl.lwjgl</groupId>
+	<artifactId>lwjgl</artifactId>
+	<packaging>jar</packaging>
+	<name>Lighweight Java Game Library</name>
+	<version>@VERSION@</version>
+	<description>Lighweight Java Game Library</description>
+	<url>http://lwjgl.org/</url>
+	<scm>
+		<url>http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/trunk/</url>
+		<connection>https://java-game-lib.svn.sourceforge.net/svnroot/java-game-lib </connection>
+	</scm>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>lwjgl-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-win</classifier>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>lwjgl-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-linux</classifier>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>lwjgl-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-mac</classifier>
+		</dependency>
+	</dependencies>
+</project>

Added: trunk/LWJGL/maven/lwjgl_util.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl_util.pom	                        (rev 0)
+++ trunk/LWJGL/maven/lwjgl_util.pom	2011-01-28 21:51:29 UTC (rev 3480)
@@ -0,0 +1,26 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.lwjgl.lwjgl</groupId>
+		<artifactId>parent</artifactId>
+		<version>@VERSION@</version>
+	</parent>
+	<groupId>org.lwjgl.lwjgl</groupId>
+	<artifactId>lwjgl_util</artifactId>
+	<packaging>jar</packaging>
+	<name>Lighweight Java Game Library</name>
+	<version>@VERSION@</version>
+	<description>Lighweight Java Game Library</description>
+	<url>http://lwjgl.org/</url>
+	<scm>
+		<url>http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/trunk/</url>
+		<connection>https://java-game-lib.svn.sourceforge.net/svnroot/java-game-lib </connection>
+	</scm>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>lwjgl</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+</project>

Added: trunk/LWJGL/maven/lwjgl_util_applet.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl_util_applet.pom	                        (rev 0)
+++ trunk/LWJGL/maven/lwjgl_util_applet.pom	2011-01-28 21:51:29 UTC (rev 3480)
@@ -0,0 +1,19 @@
+ <project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.lwjgl.lwjgl</groupId>
+    <artifactId>parent</artifactId>
+    <version>@VERSION@</version>
+  </parent>
+  <groupId>org.lwjgl.lwjgl</groupId>
+  <artifactId>lwjgl_util_applet</artifactId>
+  <packaging>jar</packaging>
+  <name>Lighweight Java Game Library</name>
+  <version>@VERSION@</version>
+  <description>Lighweight Java Game Library</description>
+  <url>http://lwjgl.org/</url>
+  <scm>
+    <url>http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/trunk/</url>
+    <connection>https://java-game-lib.svn.sourceforge.net/svnroot/java-game-lib </connection>
+  </scm>
+</project>

Added: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/build-maven.xml	2011-01-28 21:51:29 UTC (rev 3480)
@@ -0,0 +1,155 @@
+<project name="maven">
+	<property name="lwjgl.src.java" 		location="${lwjgl.src}/java" />
+	<property name="lwjgl.src.generated" 	location="${lwjgl.src}/generated" />
+	<property name="lwjgl.maven"			location="maven" />
+	<property name="lwjgl.dstMaven"			location="${lwjgl.temp}/maven" />
+	
+	<property name="lwjgl.src.java" 		location="${lwjgl.src}/java" />
+
+	<property name="lwjgl-maven-version" value="2.7.0"/>
+
+	<fileset id="lwjgl-sources.manual.fileset" dir="${lwjgl.src.java}">
+		<patternset refid="lwjgl.package.pattern" />
+	</fileset>
+
+	<fileset id="lwjgl-sources.generated.fileset" dir="${lwjgl.src.generated}">
+		<include name="**/*" />
+	</fileset>
+	<fileset id="lwjgl_util_applet-sources.fileset" dir="${lwjgl.src.java}">
+		<patternset refid="lwjgl_util_applet.package.pattern" />
+	</fileset>
+
+	<fileset id="lwjgl_util-sources.fileset" dir="${lwjgl.src.java}">
+		<patternset refid="lwjgl_util.package.pattern" />
+	</fileset>
+
+
+	<target name="maven-full">
+		<antcall target="clean-java" />
+		<antcall target="-initialize" />
+		
+		<antcall target="generate-all" />
+		<antcall target="compile" />
+        <antcall target="-createjars" />
+        <antcall target="maven"/>
+	</target>
+	
+	<target name="maven">
+		<delete dir="${lwjgl.dstMaven}" quiet="true" failonerror="false" taskname="cleaning maven dist" />
+		<mkdir dir="${lwjgl.dstMaven}"   taskname="initialiazing temp maven folder" />
+		<antcall target="-copylwjgljars" />
+		<antcall target="-createmavensourcejars" />
+		<antcall target="-createmavenjavadocs" />
+		<antcall target="-createmavennativejars" />
+		<antcall target="-copymavenpoms"/>
+		<antcall target="-copymavendeploybuild"/>
+		<antcall target="-copymaventdist"/>
+	</target>
+
+
+	<target name="-copylwjgljars">
+		<copy todir="${lwjgl.dstMaven}">
+			<fileset dir="${lwjgl.temp}/jar/">
+				<patternset>
+					<include name="lwjgl.jar" />
+					<include name="lwjgl_util.jar" />
+					<include name="lwjgl_util_applet.jar" />
+				</patternset>
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- Packages the java files -->
+	<target name="-createmavensourcejars">
+
+		<jar destfile="${lwjgl.dstMaven}/lwjgl-sources.jar" taskname="lwjgl-sources.jar">
+			<fileset refid="lwjgl-sources.manual.fileset" />
+			<fileset refid="lwjgl-sources.generated.fileset" />
+		</jar>
+		
+		<jar destfile="${lwjgl.dstMaven}/lwjgl_util_applet-sources.jar"	taskname="lwjgl_util_applet-sources.jar">
+			<fileset refid="lwjgl_util_applet-sources.fileset" />
+		</jar>
+		
+		<jar destfile="${lwjgl.dstMaven}/lwjgl_util-sources.jar" taskname="lwjgl_util-sources.jar">
+			<fileset refid="lwjgl_util-sources.fileset" />
+		</jar>
+	</target>
+	
+	<target name="-createmavenjavadocs">
+	<!-- Creates the Javadoc -->
+	
+		<javadoc destdir="${lwjgl.dstMaven}/lwjgl-javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API" useexternalfile="true">
+			<fileset refid="lwjgl-sources.manual.fileset"/>
+			<fileset refid="lwjgl-sources.generated.fileset"/>
+			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
+			<bottom><![CDATA[<i>Copyright &#169; 2002-2010 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+		</javadoc>
+		<jar destfile="${lwjgl.dstMaven}/lwjgl-javadoc.jar" taskname="lwjgl-javadoc.jar">
+			<fileset dir="${lwjgl.dstMaven}/lwjgl-javadoc" />
+		</jar>
+		
+		<javadoc destdir="${lwjgl.dstMaven}/lwjgl_util-javadoc" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/lwjgl.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL UTIL API" useexternalfile="true">
+			<fileset refid="lwjgl_util-sources.fileset"/>
+			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
+			<bottom><![CDATA[<i>Copyright &#169; 2002-2010 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+		</javadoc>
+		<jar destfile="${lwjgl.dstMaven}/lwjgl_util-javadoc.jar" taskname="lwjgl_util-javadoc.jar">
+			<fileset dir="${lwjgl.dstMaven}/lwjgl_util-javadoc" />
+		</jar>
+		
+		<javadoc destdir="${lwjgl.dstMaven}/lwjgl_util_applet-javadoc" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/lwjgl.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL UTIL API" useexternalfile="true">
+			<fileset refid="lwjgl_util_applet-sources.fileset"/>
+			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
+			<bottom><![CDATA[<i>Copyright &#169; 2002-2010 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+		</javadoc>
+		<jar destfile="${lwjgl.dstMaven}/lwjgl_util_applet-javadoc.jar" taskname="lwjgl_util_applet-javadoc.jar">
+			<fileset dir="${lwjgl.dstMaven}/lwjgl_util_applet-javadoc" />
+		</jar>
+		
+		<delete dir="${lwjgl.dstMaven}/lwjgl-javadoc" quiet="true" failonerror="false" taskname="cleaning maven javadoc temps lwjgl" />
+		<delete dir="${lwjgl.dstMaven}/lwjgl_util-javadoc" quiet="true" failonerror="false" taskname="cleaning maven javadoc temps lwjgl_util" />
+		<delete dir="${lwjgl.dstMaven}/lwjgl_util_applet-javadoc" quiet="true" failonerror="false" taskname="cleaning maven javadoc temps lwjgl_util_applet" />
+	</target>
+	
+	<target name="-createmavennativejars">
+		<jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-win.jar" taskname="lwjgl-platform-natives-win.jar">
+			<fileset dir="${lwjgl.lib}/windows">
+				<patternset refid="lwjgl-windows-lwjgl.fileset"/>
+			</fileset>
+		</jar>
+		<jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-linux.jar" taskname="lwjgl-platform-natives-linux.jar">
+			<fileset dir="${lwjgl.lib}/linux">
+				<patternset refid="lwjgl-linux-lwjgl.fileset"/>
+			</fileset>
+		</jar>
+		<jar destfile="${lwjgl.dstMaven}/lwjgl-platform-natives-mac.jar" taskname="lwjgl-platform-natives-mac.jar">
+			<fileset dir="${lwjgl.lib}/macosx">
+				<patternset refid="lwjgl-macosx-lwjgl.fileset"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<target name="-copymavenpoms">
+		<copy todir="${lwjgl.dstMaven}">
+			<fileset dir="${lwjgl.maven}">
+				<include name="*.pom" />
+			</fileset>
+			<filterset>
+      			<filter token="VERSION" value="${lwjgl-maven-version}"/>
+    		</filterset>	
+		</copy>
+	</target>
+	
+	<target name="-copymavendeploybuild">
+		<copy todir="${lwjgl.dstMaven}">
+			<fileset dir="${lwjgl.maven}">
+				<include name="build.xml" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="-copymaventdist">
+		<zip destfile="${lwjgl.dist}/lwjgl-maven-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="maven/**" />
+	</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.

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

From: <ma...@us...> - 2011-01-28 21:11:42

Revision: 3479
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3479&view=rev
Author:   matzon
Date:     2011-01-28 21:11:35 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
updating version to 2.7

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2011-01-25 06:43:28 UTC (rev 3478)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2011-01-28 21:11:35 UTC (rev 3479)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 				location="doc" />
 	<property name="lwjgl.temp" 				location="temp" />
 	<property name="lwjgl.res" 					location="res" />
-	<property name="lwjgl.version" 				value="2.6" />
+	<property name="lwjgl.version" 				value="2.7" />
 	<property name="lwjgl.web" 						location="www" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-01-25 06:43:28 UTC (rev 3478)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-01-28 21:11:35 UTC (rev 3479)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.6";
+	private static final String VERSION = "2.7";
 
 	private static final String POSTFIX64BIT = "64";
 


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3478] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ma...@us...> - 2011-01-25 06:43:35

Revision: 3478
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3478&view=rev
Author:   matzon
Date:     2011-01-25 06:43:28 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
propagate darwin check to applet loader too

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-25 01:29:22 UTC (rev 3477)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-25 06:43:28 UTC (rev 3478)
@@ -631,7 +631,7 @@
 				nativeJarList = getParameter("al_linux");
 			}
 
-		} else if (osName.startsWith("Mac")) {
+		} else if (osName.startsWith("Mac") || osName.startsWith("Darwin")) {
 			nativeJarList = getParameter("al_mac");
 		} else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
 			nativeJarList = getParameter("al_solaris");


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3477] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-25 01:29:29

Revision: 3477
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3477&view=rev
Author:   kappa1
Date:     2011-01-25 01:29:22 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
AppletLoader - fix progress bar when extracting from multiple native jars

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-24 22:35:11 UTC (rev 3476)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-25 01:29:22 UTC (rev 3477)
@@ -1367,7 +1367,9 @@
 	protected void extractNatives(String path) throws Exception {
 		
 		setState(STATE_EXTRACTING_PACKAGES);
-
+		
+		float percentageParts = 20f/nativeJarCount; // parts for each native jar from 20%
+		
 		// create native folder
 		File nativeFolder = new File(path + "natives");
 		if (!nativeFolder.exists()) {
@@ -1387,9 +1389,7 @@
 			certificate = jurl.getCertificates();
 		}
 		
-		for (int i = fileSizes.length - nativeJarCount; i < fileSizes.length; i++) {
-		
-			int initialPercentage = percentage;
+		for (int i = urlList.length - nativeJarCount; i < urlList.length; i++) {
 			
 			// if a new native jar was not downloaded, no extracting needed
 			if (fileSizes[i] == -2) {
@@ -1406,7 +1406,8 @@
 			Enumeration entities = jarFile.entries();
 	
 			totalSizeExtract = 0;
-	
+			int jarNum = i - (urlList.length - nativeJarCount); // used for progressbar
+		
 			// calculate the size of the files to extract for progress bar
 			while (entities.hasMoreElements()) {
 				JarEntry entry = (JarEntry) entities.nextElement();
@@ -1457,7 +1458,7 @@
 					currentSizeExtract += bufferSize;
 	
 					// update progress bar
-					percentage = initialPercentage + ((currentSizeExtract * 20) / totalSizeExtract);
+					percentage = 65 + (int)(percentageParts * (jarNum + currentSizeExtract/(float)totalSizeExtract));
 					subtaskMessage = "Extracting: " + entry.getName() + " " + ((currentSizeExtract * 100) / totalSizeExtract) + "%";
 				}
 	


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3476] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-24 22:35:18

Revision: 3476
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3476&view=rev
Author:   kappa1
Date:     2011-01-24 22:35:11 +0000 (Mon, 24 Jan 2011)

Log Message:
-----------
AppletLoader: add support for using multiple native jars

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-23 07:48:50 UTC (rev 3475)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-24 22:35:11 UTC (rev 3476)
@@ -223,6 +223,9 @@
 
 	/** Sizes of files to download */
 	protected int[] 	fileSizes;
+	
+	/** Number of native jars */
+	protected int		nativeJarCount;
 
 	/** whether to use caching system, only download files that have changed */
 	protected boolean 	cacheEnabled;
@@ -598,68 +601,73 @@
 
 		// jars to load
 		String jarList = getParameter("al_jars");
-
-		jarList = trimExtensionByCapabilities(jarList);
-
-		StringTokenizer jar = new StringTokenizer(jarList, ", ");
-
-		int jarCount = jar.countTokens() + 1;
-
-		urlList = new URL[jarCount];
-
-		URL path = getCodeBase();
-
-		// set jars urls
-		for (int i = 0; i < jarCount - 1; i++) {
-			urlList[i] = new URL(path, jar.nextToken());
-		}
-
-		// native jar url
-		String osName 		= System.getProperty("os.name");
-		String nativeJar 	= null;
-
+		String nativeJarList = null;
+		
+		String osName = System.getProperty("os.name");
+		
 		if (osName.startsWith("Win")) {
 
 			// check if arch specific natives have been specified
 			if (System.getProperty("os.arch").endsWith("64")) {
-				nativeJar = getParameter("al_windows64");
+				nativeJarList = getParameter("al_windows64");
 			} else {
-				nativeJar = getParameter("al_windows32");
+				nativeJarList = getParameter("al_windows32");
 			}
 
-			if (nativeJar == null) {
-				nativeJar = getParameter("al_windows");
+			if (nativeJarList == null) {
+				nativeJarList = getParameter("al_windows");
 			}
 
 		} else if (osName.startsWith("Linux")) {
 
 			// check if arch specific natives have been specified
 			if (System.getProperty("os.arch").endsWith("64")) {
-				nativeJar = getParameter("al_linux64");
+				nativeJarList = getParameter("al_linux64");
 			} else {
-				nativeJar = getParameter("al_linux32");
+				nativeJarList = getParameter("al_linux32");
 			}
 
-			if (nativeJar == null) {
-				nativeJar = getParameter("al_linux");
+			if (nativeJarList == null) {
+				nativeJarList = getParameter("al_linux");
 			}
 
 		} else if (osName.startsWith("Mac")) {
-			nativeJar = getParameter("al_mac");
+			nativeJarList = getParameter("al_mac");
 		} else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
-			nativeJar = getParameter("al_solaris");
+			nativeJarList = getParameter("al_solaris");
 		} else if (osName.startsWith("FreeBSD")) {
-			nativeJar = getParameter("al_freebsd");
+			nativeJarList = getParameter("al_freebsd");
 		} else {
 			fatalErrorOccured("OS (" + osName + ") not supported", null);
+			return;
 		}
+		
+		if (nativeJarList == null) {
+			fatalErrorOccured("no lwjgl natives files found", null);
+			return;
+		} 
+		
+		jarList = trimExtensionByCapabilities(jarList);
+		StringTokenizer jars = new StringTokenizer(jarList, ", ");
 
-		if (nativeJar == null) {
-			fatalErrorOccured("no lwjgl natives files found", null);
-		} else {
-			nativeJar = trimExtensionByCapabilities(nativeJar);
-			urlList[jarCount - 1] = new URL(path, nativeJar);
+		nativeJarList = trimExtensionByCapabilities(nativeJarList);
+		StringTokenizer nativeJars = new StringTokenizer(nativeJarList, ", ");
+		
+		int jarCount = jars.countTokens();
+		nativeJarCount = nativeJars.countTokens();
+		
+		urlList = new URL[jarCount+nativeJarCount];
+
+		URL path = getCodeBase();
+
+		// set jars urls
+		for (int i = 0; i < jarCount; i++) {
+			urlList[i] = new URL(path, jars.nextToken());
 		}
+
+		for (int i = jarCount; i < jarCount+nativeJarCount; i++) {
+			urlList[i] = new URL(path, nativeJars.nextToken());
+		}
 	}
 
 	/**
@@ -1357,19 +1365,15 @@
 	 * @throws Exception if it fails to extract files
 	 */
 	protected void extractNatives(String path) throws Exception {
+		
+		setState(STATE_EXTRACTING_PACKAGES);
 
-		// if no new native jar was downloaded, no extracting needed
-		if (fileSizes[fileSizes.length-1] == -2) {
-			return;
+		// create native folder
+		File nativeFolder = new File(path + "natives");
+		if (!nativeFolder.exists()) {
+			nativeFolder.mkdir();
 		}
-
-		setState(STATE_EXTRACTING_PACKAGES);
-
-		int initialPercentage = percentage;
-
-		// get name of jar file with natives from urlList, it will be the last url
-		String nativeJar = getJarName(urlList[urlList.length - 1]);
-
+		
 		// get the current certificate to compare against native files
 		Certificate[] certificate = AppletLoader.class.getProtectionDomain().getCodeSource().getCertificates();
 
@@ -1382,88 +1386,96 @@
 			jurl.setDefaultUseCaches(true);
 			certificate = jurl.getCertificates();
 		}
-
-		// create native folder
-		File nativeFolder = new File(path + "natives");
-		if (!nativeFolder.exists()) {
-			nativeFolder.mkdir();
-		}
-
-		// open jar file
-		JarFile jarFile = new JarFile(path + nativeJar, true);
-
-		// get list of files in jar
-		Enumeration entities = jarFile.entries();
-
-		totalSizeExtract = 0;
-
-		// calculate the size of the files to extract for progress bar
-		while (entities.hasMoreElements()) {
-			JarEntry entry = (JarEntry) entities.nextElement();
-
-			// skip directories and anything in directories
-			// conveniently ignores the manifest
-			if (entry.isDirectory() || entry.getName().indexOf('/') != -1) {
+		
+		for (int i = fileSizes.length - nativeJarCount; i < fileSizes.length; i++) {
+		
+			int initialPercentage = percentage;
+			
+			// if a new native jar was not downloaded, no extracting needed
+			if (fileSizes[i] == -2) {
 				continue;
 			}
-			totalSizeExtract += entry.getSize();
-		}
-
-		currentSizeExtract = 0;
-
-		// reset point to begining by getting list of file again
-		entities = jarFile.entries();
-
-		// extract all files from the jar
-		while (entities.hasMoreElements()) {
-			JarEntry entry = (JarEntry) entities.nextElement();
-
-			// skip directories and anything in directories
-			// conveniently ignores the manifest
-			if (entry.isDirectory() || entry.getName().indexOf('/') != -1) {
-				continue;
+			
+			// get name of jar file with natives from urlList
+			String nativeJar = getJarName(urlList[i]);
+	
+			// open jar file
+			JarFile jarFile = new JarFile(path + nativeJar, true);
+	
+			// get list of files in jar
+			Enumeration entities = jarFile.entries();
+	
+			totalSizeExtract = 0;
+	
+			// calculate the size of the files to extract for progress bar
+			while (entities.hasMoreElements()) {
+				JarEntry entry = (JarEntry) entities.nextElement();
+	
+				// skip directories and anything in directories
+				// conveniently ignores the manifest
+				if (entry.isDirectory() || entry.getName().indexOf('/') != -1) {
+					continue;
+				}
+				totalSizeExtract += entry.getSize();
 			}
-
-			// check if native file already exists if so delete it to make room for new one
-			// useful when using the reload button on the browser
-			File f = new File(path + "natives" + File.separator + entry.getName());
-			if (f.exists()) {
-				if (!f.delete()) {
-					continue; // unable to delete file, it is in use, skip extracting it
+	
+			currentSizeExtract = 0;
+	
+			// reset point to begining by getting list of file again
+			entities = jarFile.entries();
+	
+			// extract all files from the jar
+			while (entities.hasMoreElements()) {
+				JarEntry entry = (JarEntry) entities.nextElement();
+	
+				// skip directories and anything in directories
+				// conveniently ignores the manifest
+				if (entry.isDirectory() || entry.getName().indexOf('/') != -1) {
+					continue;
 				}
+	
+				// check if native file already exists if so delete it to make room for new one
+				// useful when using the reload button on the browser
+				File f = new File(path + "natives" + File.separator + entry.getName());
+				if (f.exists()) {
+					if (!f.delete()) {
+						continue; // unable to delete file, it is in use, skip extracting it
+					}
+				}
+	
+				debug_sleep(1000);
+	
+				InputStream in = jarFile.getInputStream(jarFile.getEntry(entry.getName()));
+				OutputStream out = new FileOutputStream(path + "natives" + File.separator + entry.getName());
+	
+				int bufferSize;
+				byte buffer[] = new byte[65536];
+	
+				while ((bufferSize = in.read(buffer, 0, buffer.length)) != -1) {
+					debug_sleep(10);
+					out.write(buffer, 0, bufferSize);
+					currentSizeExtract += bufferSize;
+	
+					// update progress bar
+					percentage = initialPercentage + ((currentSizeExtract * 20) / totalSizeExtract);
+					subtaskMessage = "Extracting: " + entry.getName() + " " + ((currentSizeExtract * 100) / totalSizeExtract) + "%";
+				}
+	
+				// validate if the certificate for native file is correct
+				validateCertificateChain(certificate, entry.getCertificates());
+	
+				in.close();
+				out.close();
 			}
-
-			debug_sleep(1000);
-
-			InputStream in = jarFile.getInputStream(jarFile.getEntry(entry.getName()));
-			OutputStream out = new FileOutputStream(path + "natives" + File.separator + entry.getName());
-
-			int bufferSize;
-			byte buffer[] = new byte[65536];
-
-			while ((bufferSize = in.read(buffer, 0, buffer.length)) != -1) {
-				debug_sleep(10);
-				out.write(buffer, 0, bufferSize);
-				currentSizeExtract += bufferSize;
-
-				// update progress bar
-				percentage = initialPercentage + ((currentSizeExtract * 20) / totalSizeExtract);
-				subtaskMessage = "Extracting: " + entry.getName() + " " + ((currentSizeExtract * 100) / totalSizeExtract) + "%";
-			}
-
-			// validate if the certificate for native file is correct
-			validateCertificateChain(certificate, entry.getCertificates());
-
-			in.close();
-			out.close();
+			subtaskMessage = "";
+	
+			jarFile.close();
+	
+			// delete native jar as it is no longer needed
+			File f = new File(path + nativeJar);
+			f.delete();
+		
 		}
-		subtaskMessage = "";
-
-		jarFile.close();
-
-		// delete native jar as it is no longer needed
-		File f = new File(path + nativeJar);
-		f.delete();
 	}
 
 	/**


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3475] trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil. java

From: <ma...@us...> - 2011-01-23 07:48:57

Revision: 3475
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3475&view=rev
Author:   matzon
Date:     2011-01-23 07:48:50 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
init util as MACOSX if running under darwin

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java

Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2011-01-22 18:08:21 UTC (rev 3474)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2011-01-23 07:48:50 UTC (rev 3475)
@@ -279,7 +279,7 @@
 			PLATFORM = PLATFORM_WINDOWS;
 		else if ( osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("SunOS") )
 			PLATFORM = PLATFORM_LINUX;
-		else if ( osName.startsWith("Mac OS X") )
+		else if ( osName.startsWith("Mac OS X") || osName.startsWith("Darwin") )
 			PLATFORM = PLATFORM_MACOSX;
 		else
 			throw new LinkageError("Unknown platform: " + osName);


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3474] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-22 18:08:28

Revision: 3474
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3474&view=rev
Author:   kappa1
Date:     2011-01-22 18:08:21 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
AppletLoader - Fix for a crash on some platforms before the permissions dialog appears, this is because the relevant part of the code needed to be run on the EDT.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-22 13:26:07 UTC (rev 3473)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-22 18:08:21 UTC (rev 3474)
@@ -35,6 +35,7 @@
 import java.applet.AppletStub;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.EventQueue;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -765,10 +766,18 @@
 			setLWJGLProperties();
 
 			// switch to LWJGL Applet
-			switchApplet();
-
-			setState(STATE_DONE);
-			repaint();
+			EventQueue.invokeAndWait(new Runnable() {
+	            public void run() {
+					try {
+						switchApplet();
+					} catch (Exception e) {
+						fatalErrorOccured("This occurred while '" + getDescriptionForState() + "'", e);
+					}
+					setState(STATE_DONE);
+					repaint();
+	            }
+			});
+			
 		} catch (AccessControlException ace) {
 			fatalErrorOccured(ace.getMessage(), ace);
 			certificateRefused = true;


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3473] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-22 13:26:13

Revision: 3473
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3473&view=rev
Author:   kappa1
Date:     2011-01-22 13:26:07 +0000 (Sat, 22 Jan 2011)

Log Message:
-----------
AppletLoader: make debug mode a little more useful to debug issues with, it'll output the AppletLoader state to the java console.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-19 21:25:32 UTC (rev 3472)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-22 13:26:07 UTC (rev 3473)
@@ -258,7 +258,7 @@
 	 * @see java.applet.Applet#init()
 	 */
 	public void init() {
-		state = STATE_INIT;
+		setState(STATE_INIT);
 		
 		// sanity check
 		String[] requiredArgs = {"al_main", "al_logo", "al_progressbar", "al_jars"};
@@ -593,7 +593,7 @@
 	 * jar to the urlList
 	 */
 	protected void loadJarURLs() throws Exception {
-		state = STATE_DETERMINING_PACKAGES;
+		setState(STATE_DETERMINING_PACKAGES);
 
 		// jars to load
 		String jarList = getParameter("al_jars");
@@ -671,7 +671,7 @@
 	 * 5) switch applets
 	 */
 	public void run() {
-		state = STATE_CHECKING_CACHE;
+		setState(STATE_CHECKING_CACHE);
 
  		percentage = 5;
 
@@ -767,7 +767,7 @@
 			// switch to LWJGL Applet
 			switchApplet();
 
-			state = STATE_DONE;
+			setState(STATE_DONE);
 			repaint();
 		} catch (AccessControlException ace) {
 			fatalErrorOccured(ace.getMessage(), ace);
@@ -883,7 +883,7 @@
 	 */
 	protected void updateClassPath(final String path) throws Exception {
 
-		state = STATE_UPDATING_CLASSPATH;
+		setState(STATE_UPDATING_CLASSPATH);
 
 		percentage = 95;
 
@@ -1001,7 +1001,7 @@
 	 */
 	protected void switchApplet() throws Exception {
 
-		state = STATE_SWITCHING_APPLET;
+		setState(STATE_SWITCHING_APPLET);
 		percentage = 100;
 
 		debug_sleep(2000);
@@ -1016,10 +1016,10 @@
 		add(lwjglApplet);
 		validate();
 
-		state = STATE_INITIALIZE_REAL_APPLET;
+		setState(STATE_INITIALIZE_REAL_APPLET);
 		lwjglApplet.init();
 
-		state = STATE_START_REAL_APPLET;
+		setState(STATE_START_REAL_APPLET);
 		lwjglApplet.start();
 	}
 
@@ -1094,7 +1094,7 @@
 	 */
 	protected void downloadJars(String path) throws Exception {
 
-		state = STATE_DOWNLOADING;
+		setState(STATE_DOWNLOADING);
 
 		URLConnection urlconnection;
 
@@ -1305,7 +1305,7 @@
 	 *  @throws Exception if any errors occur
 	 */
 	protected void extractJars(String path) throws Exception {
-		state = STATE_EXTRACTING_PACKAGES;
+		setState(STATE_EXTRACTING_PACKAGES);
 
 		float increment = (float) 10.0 / urlList.length;
 		// extract all lzma and pack.lzma files
@@ -1354,7 +1354,7 @@
 			return;
 		}
 
-		state = STATE_EXTRACTING_PACKAGES;
+		setState(STATE_EXTRACTING_PACKAGES);
 
 		int initialPercentage = percentage;
 
@@ -1616,6 +1616,17 @@
 		repaint();
 	}
 
+	/** 
+	 * set the state of applet loader 
+	 * @param new state of applet loader
+	 * */
+	protected void setState(int state) {
+		this.state = state;
+		if(debugMode) {
+			System.out.println(getDescriptionForState());
+		}
+	}
+	
 	/**
 	 * Utility method for sleeping
 	 * Will only really sleep if debug has been enabled


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3472] trunk/LWJGL/platform_build/ build-definitions.xml

From: <ma...@us...> - 2011-01-19 21:25:38

Revision: 3472
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3472&view=rev
Author:   matzon
Date:     2011-01-19 21:25:32 +0000 (Wed, 19 Jan 2011)

Log Message:
-----------
applied patch by ruben01 to add finer granularity

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

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2011-01-19 21:15:21 UTC (rev 3471)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2011-01-19 21:25:32 UTC (rev 3472)
@@ -25,16 +25,21 @@
 
 	<!-- Files to include in the lwjgl.jar file -->
 	<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
-		<include name="org/**/*" />
-		<exclude name="org/lwjgl/d3d/**" />
-		<exclude name="org/lwjgl/test/**" />
-		<exclude name="org/lwjgl/util/**" />
-		<exclude name="org/lwjgl/examples/**" />
+		<patternset id="lwjgl.package.pattern">
+			<include name="org/**/*" />
+			<exclude name="org/lwjgl/d3d/**" />
+			<exclude name="org/lwjgl/test/**" />
+			<exclude name="org/lwjgl/util/**" />
+			<exclude name="org/lwjgl/examples/**" />
+		</patternset>
 	</fileset>
-
+	
+	<!-- Files to include in the lwjgl_util_applet.jar file -->
 	<fileset id="lwjgl_util_applet.fileset" dir="${lwjgl.bin}">
-		<exclude name="**.*"/>
-		<include name="org/lwjgl/util/applet/**"/>
+		<patternset id="lwjgl_util_applet.package.pattern">
+			<exclude name="**.*"/>
+			<include name="org/lwjgl/util/applet/**"/>
+		</patternset>
 	</fileset>
 
 	<!-- Files to include in the lwjgl_test.jar file -->
@@ -56,11 +61,14 @@
 
 	<!-- Files to include in the lwjgl_util.jar file -->
 	<fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}">
-		<exclude name="**.*" />
-		<exclude name="org/lwjgl/util/generator/**" />
-		<exclude name="org/lwjgl/util/applet/**" />
-		<include name="org/lwjgl/util/**" />
+		<patternset id="lwjgl_util.package.pattern">
+			<exclude name="**.*" />
+			<exclude name="org/lwjgl/util/generator/**" />
+			<exclude name="org/lwjgl/util/applet/**" />
+			<include name="org/lwjgl/util/**" />
+		</patternset>
 	</fileset>
+		
 
 	<!-- Files to include in the lwjgl_applet.jar file -->
 	<fileset id="lwjgl_applet.fileset" dir="${lwjgl.bin}">
@@ -90,28 +98,40 @@
 
 	<!-- Files to include in windows package -->
 	<patternset id="lwjgl-windows.fileset">
-		<include name="lwjgl.dll" />
-		<include name="lwjgl64.dll" />
-		<include name="OpenAL32.dll" />
-		<include name="OpenAL64.dll" />
-    	<include name="jinput-dx8*.dll" />
-    	<include name="jinput-raw*.dll" />
+		<patternset id="lwjgl-windows-lwjgl.fileset">
+			<include name="lwjgl.dll" />
+			<include name="lwjgl64.dll" />
+			<include name="OpenAL32.dll" />
+			<include name="OpenAL64.dll" />
+		</patternset>
+		<patternset id="lwjgl-windows-jinput.fileset">
+	    	<include name="jinput-dx8*.dll" />
+	    	<include name="jinput-raw*.dll" />
+		</patternset>
 	</patternset>
 
 	<!-- Files to include in linux, glibc2.3 package -->
 	<patternset id="lwjgl-linux.fileset">
-		<include name="liblwjgl*.so" />
-		<include name="libopenal*.so" />
-		<include name="libjinput-linux.so" />
-		<include name="libjinput-linux64.so" />
+		<patternset id="lwjgl-linux-lwjgl.fileset">
+			<include name="liblwjgl*.so" />
+			<include name="libopenal*.so" />
+		</patternset>
+		<patternset id="lwjgl-linux-jinput.fileset">	
+			<include name="libjinput-linux.so" />
+			<include name="libjinput-linux64.so" />
+		</patternset>
 	</patternset>
 
 	<!-- Files to include in mac os x package -->
 	<patternset id="lwjgl-macosx.fileset">
-		<include name="liblwjgl.jnilib" />
-		<include name="openal.dylib" />
-	    <include name="libjinput-osx.jnilib" />
-	    <include name="libjinput-osx-legacy.jnilib" />
+		<patternset id="lwjgl-macosx-lwjgl.fileset">
+			<include name="liblwjgl.jnilib" />
+			<include name="openal.dylib" />
+		</patternset>
+		<patternset id="lwjgl-macosx-jinput.fileset">
+		    <include name="libjinput-osx.jnilib" />
+		    <include name="libjinput-osx-legacy.jnilib" />
+		</patternset>
 	</patternset>
 
 	<!-- Files to include in solaris package -->
@@ -158,4 +178,4 @@
 	    <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/>
 	    <srcfiles dir= "${lwjgl.src.native}/windows" includes="*.c"/>
 	</uptodate>
-</project>
\ No newline at end of file
+</project>


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3471] trunk/LWJGL/platform_build/build-applet. xml

From: <ma...@us...> - 2011-01-19 21:15:30

Revision: 3471
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3471&view=rev
Author:   matzon
Date:     2011-01-19 21:15:21 +0000 (Wed, 19 Jan 2011)

Log Message:
-----------
dont depend on all for the applet target

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

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2011-01-19 21:14:57 UTC (rev 3470)
+++ trunk/LWJGL/platform_build/build-applet.xml	2011-01-19 21:15:21 UTC (rev 3471)
@@ -3,7 +3,7 @@
 	<!-- Create our packer task -->
 	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
 
-	<target name="applet" depends="all">
+	<target name="applet">
 		<antcall target="-applet">
 		    <param name="keystore" value="applet/lwjglkeystore"/>
 			<param name="alias" value="lwjgl"/>			


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3470] trunk/LWJGL/platform_build/build-webstart. xml

From: <ma...@us...> - 2011-01-19 21:15:03

Revision: 3470
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3470&view=rev
Author:   matzon
Date:     2011-01-19 21:14:57 +0000 (Wed, 19 Jan 2011)

Log Message:
-----------
keystore changes

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

Modified: trunk/LWJGL/platform_build/build-webstart.xml
===================================================================
--- trunk/LWJGL/platform_build/build-webstart.xml	2011-01-13 10:54:04 UTC (rev 3469)
+++ trunk/LWJGL/platform_build/build-webstart.xml	2011-01-19 21:14:57 UTC (rev 3470)
@@ -11,8 +11,8 @@
 		<input 	message="Please type the password for the keystore" addproperty="sign.pwd"/>
 
 		<antcall target="-webstart_demo">
-		    <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
-			<param name="alias" value="oddlabs_java_code_signing"/>
+		    <param name="keystore" value="signing/lwjgl.jks"/>
+			<param name="alias" value="lwjgl"/>
 			<param name="password" value="${sign.pwd}"/>
 		  </antcall>
 	</target>	


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3469] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-13 10:54:10

Revision: 3469
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3469&view=rev
Author:   kappa1
Date:     2011-01-13 10:54:04 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
AppletLoader - Fix a threading issue where the cleanUp() method could fail to be called.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-12 20:29:06 UTC (rev 3468)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-13 10:54:04 UTC (rev 3469)
@@ -768,6 +768,7 @@
 			switchApplet();
 
 			state = STATE_DONE;
+			repaint();
 		} catch (AccessControlException ace) {
 			fatalErrorOccured(ace.getMessage(), ace);
 			certificateRefused = true;


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3468] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-12 20:29:13

Revision: 3468
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3468&view=rev
Author:   kappa1
Date:     2011-01-12 20:29:06 +0000 (Wed, 12 Jan 2011)

Log Message:
-----------
add missing final

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-12 20:18:38 UTC (rev 3467)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-12 20:29:06 UTC (rev 3468)
@@ -880,7 +880,7 @@
 	 * @param path location where applet is stored
 	 * @throws Exception if it fails to add classpath
 	 */
-	protected void updateClassPath(String path) throws Exception {
+	protected void updateClassPath(final String path) throws Exception {
 
 		state = STATE_UPDATING_CLASSPATH;
 


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3467] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

From: <ka...@us...> - 2011-01-12 20:18:44

Revision: 3467
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3467&view=rev
Author:   kappa1
Date:     2011-01-12 20:18:38 +0000 (Wed, 12 Jan 2011)

Log Message:
-----------
AppletLoader fix, allow non lwjgl natives to be found in the cache directory. Again thx to NateS for finding and providing a fix.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-12 20:01:12 UTC (rev 3466)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-12 20:18:38 UTC (rev 3467)
@@ -921,6 +921,11 @@
 
 		        return perms;
 		    }
+			
+			// allow non lwjgl native to be found from cache directory
+			protected String findLibrary (String libname) {
+				return path + "natives" + File.separator + System.mapLibraryName(libname);
+			}
 		};
 
 		debug_sleep(2000);


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

1095 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 13 14 15 16 17 .. 238 > >> (Page 15 of 238)