java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 2495
Author:   elias_naur
Date:     2006-07-11 16:03:11 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2495&view=rev

Log Message:
-----------
Added runtest ant target for easy execution of tests

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-11 21:55:24 UTC (rev 2494)
+++ trunk/LWJGL/build.xml	2006-07-11 23:03:11 UTC (rev 2495)
@@ -354,6 +354,14 @@
 		</jar>
 	</target>
 
+	<target name="runtest" depends="all">
+		<fail message="test.mainclass is not set. Use 'ant -Dtest.mainclass=&lt;main-class&gt; runtest'" unless="test.mainclass"/>
+		<java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar" fork="true">
+			<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
+			<jvmarg value="-Djava.library.path=libs/linux:libs/win32:libs/macosx"/>
+		</java>
+	</target>
+
 	<target name="applet" depends="jars">
 		<!-- Create lwjgl_applet.jar -->
 		<jar destfile="applet/lwjgl_applet.jar" taskname="lwjgl_applet.jar">


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

Revision: 2494
Author:   matzon
Date:     2006-07-11 14:55:24 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2494&view=rev

Log Message:
-----------
obsolete stuff - all hail svn remove!

Removed Paths:
-------------
    trunk/LWJGL/doc/changelogs/
    trunk/LWJGL/doc/templates/

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

Revision: 2493
Author:   matzon
Date:     2006-07-11 14:53:19 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2493&view=rev

Log Message:
-----------
removing old build file stuff

Removed Paths:
-------------
    trunk/LWJGL/platform_build/mac_xcode/
    trunk/LWJGL/platform_build/win32_ms_cmdline/

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

Revision: 2492
Author:   matzon
Date:     2006-07-11 14:50:42 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2492&view=rev

Log Message:
-----------
removing old build file stuff

Removed Paths:
-------------
    trunk/LWJGL/platform_build/win32_vs_net/

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

Revision: 2491
Author:   matzon
Date:     2006-07-11 14:48:58 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2491&view=rev

Log Message:
-----------
removing old build file stuff

Removed Paths:
-------------
    trunk/LWJGL/platform_build/sharp_develop/

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

Revision: 2490
Author:   matzon
Date:     2006-07-11 14:47:04 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2490&view=rev

Log Message:
-----------
build natives into bin/<name>

Modified Paths:
--------------
    trunk/LWJGL/platform_build/macosx_ant/build.xml
Modified: trunk/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-07-11 21:46:44 UTC (rev 2489)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-07-11 21:47:04 UTC (rev 2490)
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<project name="OS X Native code" basedir="../../bin" default="nativelibrary">
-	<property name="native" location="../src/native"/>
+<project name="OS X Native code" basedir="../../bin/lwjgl" default="nativelibrary">
+	<property name="native" location="../../src/native"/>
 
 	<target name="init">
 		<mkdir dir="ppc"/>


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

Revision: 2489
Author:   matzon
Date:     2006-07-11 14:46:44 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2489&view=rev

Log Message:
-----------
build natives into bin/<name>

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-11 21:45:33 UTC (rev 2488)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-11 21:46:44 UTC (rev 2489)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="lwjgl native code, linux" basedir="../../bin" default="compile">
-	<property name="native" location="../src/native"/>
+<project name="lwjgl native code, linux" basedir="../../bin/lwjgl" default="compile">
+	<property name="native" location="../../src/native"/>
 	<property name="libname32" value="liblwjgl.so"/>
 	<property name="libname64" value="liblwjgl64.so"/>
 	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>


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

Revision: 2488
Author:   matzon
Date:     2006-07-11 14:45:33 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2488&view=rev

Log Message:
-----------
build natives into bin/<name>

Modified Paths:
--------------
    trunk/LWJGL/platform_build/windows_ant/build_devil.xml
    trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml
Modified: trunk/LWJGL/platform_build/windows_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_devil.xml	2006-07-11 21:44:40 UTC (rev 2487)
+++ trunk/LWJGL/platform_build/windows_ant/build_devil.xml	2006-07-11 21:45:33 UTC (rev 2488)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="devil" basedir="../../bin" default="compile">
-	<property name="native" location="../src/native"/>
+<project name="devil" basedir="../../bin/devil" default="compile">
+	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="sdkhome" location="${env.MSSDK}"/>
 	<property name="fmodhome" location="${env.FMODHOME}"/>

Modified: trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml	2006-07-11 21:44:40 UTC (rev 2487)
+++ trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml	2006-07-11 21:45:33 UTC (rev 2488)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="fmod3" basedir="../../bin" default="compile">
-	<property name="native" location="../src/native"/>
+<project name="fmod3" basedir="../../bin/fmod3" default="compile">
+	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="sdkhome" location="${env.MSSDK}"/>
 	<property name="fmodhome" location="${env.FMODHOME}"/>


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

Revision: 2487
Author:   matzon
Date:     2006-07-11 14:44:40 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2487&view=rev

Log Message:
-----------
build natives into bin/<name>

Modified Paths:
--------------
    trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-11 21:43:43 UTC (rev 2486)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-11 21:44:40 UTC (rev 2487)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="lwjgl native code, native code" basedir="../../bin" default="compile">
-	<property name="native" location="../src/native"/>
+<project name="lwjgl native code, native code" basedir="../../bin/lwjgl" default="compile">
+	<property name="native" location="../../src/native"/>
 	<property environment="env"/>
 	<property name="dxhome" location="${env.DXSDK_DIR}"/>
 	<property name="sdkhome" location="${env.MSSDK}"/>
@@ -47,9 +47,11 @@
 		<delete>
 			<fileset dir="." includes="*.obj"/>
 			<fileset dir="." includes="*.dll"/>
+			<fileset dir="." includes="*.exp"/>
+			<fileset dir="." includes="*.lib"/>
 		</delete>
 	</target>
-
+	
 	<target name="compile">
 		<property name="libs" value="Kernel32.lib ole32.lib dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib winmm.lib"/>
 		<antcall target="compile_dir"/>


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

Revision: 2486
Author:   matzon
Date:     2006-07-11 14:43:43 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2486&view=rev

Log Message:
-----------
removed (some) obsolete targets
build natives into bin/<name>
support for windows optional ant build files

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-11 21:23:08 UTC (rev 2485)
+++ trunk/LWJGL/build.xml	2006-07-11 21:43:43 UTC (rev 2486)
@@ -224,6 +224,9 @@
 	<!-- ================================================================== -->
 	<target name="-initialize">
 		<mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" />
+		<mkdir dir="${lwjgl.bin}/lwjgl" taskname="initialiazing bin folder" />
+		<mkdir dir="${lwjgl.bin}/devil" taskname="initialiazing bin folder" />
+		<mkdir dir="${lwjgl.bin}/fmod3" taskname="initialiazing bin folder" />
 		<mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder" />
 		<mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder" />
 		<mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" />
@@ -669,64 +672,30 @@
 		<antcall target="-compile_native_macosx_optional" />
 	</target>	
 	
-	
 	<!-- Compiles LWJGL on Win32 platforms  -->
 	<target name="-compile_native_win32" if="lwjgl.platform.windows">
-		<echo>Compiling Win32 LWJGL version</echo>
-		
-		<!-- check for required properties -->
-		<!--		<property environment="env"/>
-		<fail message="Missing PLTSDKHOME path environment property" unless="env.PLTSDKHOME"/>
-		<fail message="Missing ALHOME path environment property" unless="env.ALHOME"/>
-		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>
-		<fail message="Missing CHOME path environment property" unless="env.CHOME"/>
-		<fail message="Missing DXHOME path environment property" unless="env.DXHOME"/>
-		
-		<antcall target="-compile_native_win32_main" />-->
 		<ant antfile="platform_build/windows_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/lwjgl.dll" todir="${lwjgl.lib}/win32"/>
+		<copy file="${lwjgl.bin}/lwjgl/lwjgl.dll" todir="${lwjgl.lib}/win32"/>
 	</target>
 
 	<target name="-compile_native_win32_optional" if="lwjgl.platform.windows">
-		<fail message="Missing FMODHOME path environment property" unless="env.FMODHOME"/>
-		<antcall target="-compile_native_win32_fmod" />
-		<antcall target="-compile_native_win32_devil" />
+		<ant antfile="platform_build/windows_ant/build_fmod3.xml" inheritAll="false"/>
+		<copy file="${lwjgl.bin}/fmod3/lwjgl-fmod3.dll" todir="${lwjgl.lib}/win32"/>
+
+		<ant antfile="platform_build/windows_ant/build_devil.xml" inheritAll="false"/>
+		<copy file="${lwjgl.bin}/devil/lwjgl-devil.dll" todir="${lwjgl.lib}/win32"/>
 	</target>	
 
-	<target name="-compile_native_win32_main" unless="lwjgl.main.built">
-		<!-- build main -->
-		<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
-			<arg line="/c build.bat" />
-		</exec>
-		<move file="platform_build/win32_ms_cmdline/lwjgl.dll" tofile="${lwjgl.lib}/win32/lwjgl.dll"/>
-	</target>
-
-	<target name="-compile_native_win32_fmod" unless="lwjgl.fmod.built">
-		<!-- build fmod -->
-		<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
-			<arg line="/c build-fmod.bat" />
-		</exec>
-		<move file="platform_build/win32_ms_cmdline/lwjgl-fmod3.dll" tofile="${lwjgl.lib}/win32/lwjgl-fmod3.dll"/>
-	</target>
-
-	<target name="-compile_native_win32_devil" unless="lwjgl.devil.built">
-		<!-- build devil -->
-		<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
-			<arg line="/c build-devil.bat"/>
-		</exec>
-		<move file="platform_build/win32_ms_cmdline/lwjgl-devil.dll" tofile="${lwjgl.lib}/win32/lwjgl-devil.dll"/>
-	</target>
-
 	<!-- Compiles LWJGL on Linux platforms -->
 	<target name="-compile_native_linux" if="lwjgl.platform.linux">
 		<ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
 		<copy todir="${lwjgl.lib}/linux">
-			<fileset dir="${lwjgl.bin}" includes="liblwjgl*.so"/>
+			<fileset dir="${lwjgl.bin}/lwjgl" includes="liblwjgl*.so"/>
 		</copy>
 	</target>
 
 	<target name="-compile_native_linux_optional" if="lwjgl.platform.linux">
-				<!-- check for required properties -->
+	<!-- check for required properties -->
 		<property environment="env"/>
 		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>		
 		<fail message="Missing FMOD path environment property" unless="env.FMOD"/>		
@@ -762,22 +731,7 @@
                 </exec>
 		<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-devil.jnilib" />
 		<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-fmod3.jnilib" />
-  </target> 	
-	 
-	<!-- Creates a build of LWJGL directly from CVS -->
-	<!--	<target name="cvsbuild" description="Builds lwjgl from cvs">-->
-		<!-- Check that files do not exist BEFORE doing the CVS build -->
-		<!--		<available file="LWJGL/build.xml" property="lwjgl.preexistingfiles" />
-		<available file="${lwjgl.src}/java/org/lwjgl/Sys.java" property="lwjgl.preexistingfiles" />
-		<fail if="lwjgl.preexistingfiles" message="Cannot perform webbuild from nonempty folder" />-->
-
-		<!-- checkout files and build using checked out buildfiles 'all' target -->
-		<!--		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/build.xml" dest="." />
-		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/src" dest="." />
-		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/doc" dest="." />
-		<ant dir="LWJGL" target="compile_native_all" />
-		<ant dir="LWJGL" target="release" />
-	</target>	 -->
+  </target>
 	
 	<!-- -->
 	<target name="sign" description="Using released files, creates the necessary files used for jnlp demos">


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

Revision: 2485
Author:   matzon
Date:     2006-07-11 14:23:08 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2485&view=rev

Log Message:
-----------
optional build files

Added Paths:
-----------
    trunk/LWJGL/platform_build/windows_ant/build_devil.xml
    trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml
Added: trunk/LWJGL/platform_build/windows_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_devil.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/windows_ant/build_devil.xml	2006-07-11 21:23:08 UTC (rev 2485)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<project name="devil" basedir="../../bin" default="compile">
+	<property name="native" location="../src/native"/>
+	<property environment="env"/>
+	<property name="sdkhome" location="${env.MSSDK}"/>
+	<property name="fmodhome" location="${env.FMODHOME}"/>
+	<property name="dllname" value="lwjgl-devil.dll"/>
+
+	<target name="compile_dir">
+		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
+			<arg value="/I${sdkhome}\include"/>
+			<arg value="/I${java.home}\..\include"/>
+			<arg value="/I${java.home}\..\include\win32"/>
+			<arg value="/I${native}\common"/>
+			<srcfile/>
+			<fileset dir="${native}/common/devil" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*common*.c"/>
+			<mapper type="glob" from="*.c" to="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="link">
+		<apply dir="." parallel="true" executable="cl" failonerror="true">
+			<arg line="/LD /nologo"/>
+			<srcfile/>
+			<arg line="/Fe${dllname} /link"/>
+			<arg value="/LIBPATH:${java.home}\..\lib"/>
+			<arg value="/LIBPATH:${sdkhome}\lib"/>
+			<arg value="/OPT:REF"/>
+			<arg value="/OPT:ICF"/>
+			<fileset dir="." includes="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.obj"/>
+			<fileset dir="." includes="*.dll"/>
+			<fileset dir="." includes="*.exp"/>
+			<fileset dir="." includes="*.lib"/>			
+		</delete>
+	</target>
+
+	<target name="compile" depends="clean">
+		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
+		<antcall target="compile_dir"/>
+		<antcall target="link"/>
+    </target>
+</project>
+

Added: trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/windows_ant/build_fmod3.xml	2006-07-11 21:23:08 UTC (rev 2485)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<project name="fmod3" basedir="../../bin" default="compile">
+	<property name="native" location="../src/native"/>
+	<property environment="env"/>
+	<property name="sdkhome" location="${env.MSSDK}"/>
+	<property name="fmodhome" location="${env.FMODHOME}"/>
+	<property name="dllname" value="lwjgl-fmod3.dll"/>
+
+	<target name="compile_dir">
+		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
+			<arg value="/I${sdkhome}\include"/>
+			<arg value="/I${java.home}\..\include"/>
+			<arg value="/I${java.home}\..\include\win32"/>
+			<arg value="/I${native}\common"/>
+			<arg value="/I${fmodhome}\api\inc"/>
+			<srcfile/>
+			<fileset dir="${native}/common/fmod3" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*common*.c"/>
+			<mapper type="glob" from="*.c" to="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="link">
+		<apply dir="." parallel="true" executable="cl" failonerror="true">
+			<arg line="/LD /nologo"/>
+			<srcfile/>
+			<arg line="/Fe${dllname} /link"/>
+			<arg value="/LIBPATH:${java.home}\..\lib"/>
+			<arg value="/LIBPATH:${sdkhome}\lib"/>
+			<arg value="/OPT:REF"/>
+			<arg value="/OPT:ICF"/>
+			<fileset dir="." includes="*.obj"/>
+		</apply>
+	</target>
+
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.obj"/>
+			<fileset dir="." includes="*.dll"/>
+			<fileset dir="." includes="*.exp"/>
+			<fileset dir="." includes="*.lib"/>			
+		</delete>
+	</target>
+
+	<target name="compile" depends="clean">
+		<property name="libs" value="user32.lib Gdi32.lib Advapi32.lib"/>
+		<antcall target="compile_dir"/>
+		<antcall target="link"/>
+    </target>
+</project>
+


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

Revision: 2484
Author:   elias_naur
Date:     2006-07-11 14:08:59 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2484&view=rev

Log Message:
-----------
Linux: Added libjinput-linux64.so 64 bit library

Added Paths:
-----------
    trunk/LWJGL/libs/linux/libjinput-linux64.so
Added: trunk/LWJGL/libs/linux/libjinput-linux64.so
===================================================================
(Binary files differ)


Property changes on: trunk/LWJGL/libs/linux/libjinput-linux64.so
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


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

Revision: 2483
Author:   elias_naur
Date:     2006-07-11 14:03:33 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2483&view=rev

Log Message:
-----------
Refreshed jinput.jar with 64 bit support

Modified Paths:
--------------
    trunk/LWJGL/libs/jinput.jar
Modified: trunk/LWJGL/libs/jinput.jar
===================================================================
(Binary files differ)


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

Revision: 2482
Author:   elias_naur
Date:     2006-07-11 14:00:39 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2482&view=rev

Log Message:
-----------
Linux: more 64 bit stuff

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 20:56:40 UTC (rev 2481)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 21:00:39 UTC (rev 2482)
@@ -83,10 +83,12 @@
 			if (implementation.has64Bit()) {
 				try {
 					doLoadLibrary(lib_name + POSTFIX64BIT);
+					return;
 				} catch (UnsatisfiedLinkError e2) {
 					LWJGLUtil.log("Failed to load 64 bit library:" + e2.getMessage());
 				}
 			}
+			// Throw original error
 			throw e;
 		}
 	}	


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

Revision: 2481
Author:   elias_naur
Date:     2006-07-11 13:56:40 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2481&view=rev

Log Message:
-----------
Linux: more 64 bit stuff

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-11 20:49:28 UTC (rev 2480)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-11 20:56:40 UTC (rev 2481)
@@ -11,7 +11,7 @@
 	<target name="clean">
 		<delete>
 			<fileset dir="." includes="*.o"/>
-			<fileset file="${libname}"/>
+			<fileset dir="." includes="*.so"/>
 		</delete>
 	</target>
 	


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

Revision: 2480
Author:   elias_naur
Date:     2006-07-11 13:49:28 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2480&view=rev

Log Message:
-----------
Linux: more 64 bit stuff

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-11 20:30:19 UTC (rev 2479)
+++ trunk/LWJGL/build.xml	2006-07-11 20:49:28 UTC (rev 2480)
@@ -118,9 +118,9 @@
 
 	<!-- Files to include in linux, glibc2.3 package -->
 	<patternset id="lwjgl-linux.fileset">
-		<include name="liblwjgl.so" />
+		<include name="liblwjgl*.so" />
 		<include name="libopenal.so" />    
-    		<include name="libjinput-linux.so" />
+		<include name="libjinput-linux.so" />
 	</patternset>
 	
 	<!-- Files to include in linux optional, glibc2.3 package -->
@@ -720,7 +720,9 @@
 	<!-- Compiles LWJGL on Linux platforms -->
 	<target name="-compile_native_linux" if="lwjgl.platform.linux">
 		<ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/liblwjgl.so" todir="${lwjgl.lib}/linux"/>
+		<copy todir="${lwjgl.lib}/linux">
+			<fileset dir="${lwjgl.bin}" includes="liblwjgl*.so"/>
+		</copy>
 	</target>
 
 	<target name="-compile_native_linux_optional" if="lwjgl.platform.linux">

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 20:30:19 UTC (rev 2479)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 20:49:28 UTC (rev 2480)
@@ -78,11 +78,11 @@
 
 	private static void loadLibrary(final String lib_name) {
 		try {
-			loadLibrary(lib_name);
+			doLoadLibrary(lib_name);
 		} catch (UnsatisfiedLinkError e) {
 			if (implementation.has64Bit()) {
 				try {
-					loadLibrary(lib_name + POSTFIX64BIT);
+					doLoadLibrary(lib_name + POSTFIX64BIT);
 				} catch (UnsatisfiedLinkError e2) {
 					LWJGLUtil.log("Failed to load 64 bit library:" + e2.getMessage());
 				}


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

Revision: 2479
Author:   elias_naur
Date:     2006-07-11 13:30:19 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2479&view=rev

Log Message:
-----------
Linux: added support for 64 bit JVMs

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/linux_ant/build.xml
    trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
    trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/build.xml	2006-07-11 20:30:19 UTC (rev 2479)
@@ -358,14 +358,14 @@
 		</jar>
 		
 		<!-- create each of the native jars -->
-		<jar destfile="applet/win32_natives.jar" taskname="win32_natives.jar">
+		<jar destfile="applet/windows_natives.jar" taskname="windows_natives.jar">
 			<fileset dir="${lwjgl.lib}/win32">
 				<patternset refid="lwjgl-win32.fileset"/>
 				<patternset refid="lwjgl-win32_optional.fileset"/>
 				<include name="fmod.dll"/>
 			</fileset>
 		</jar>
-		<signjar jar="applet/win32_natives.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+		<signjar jar="applet/windows_natives.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
 		
 		<jar destfile="applet/linux_natives.jar" taskname="linux_natives.jar">
 			<fileset dir="${lwjgl.lib}/linux">
@@ -388,12 +388,12 @@
 		<!-- add it to a natives jar -->
 		<jar destfile="applet/natives.jar" taskname="natives.jar">
 			<fileset dir="applet">
-				<include name="win32_natives.jar"/>
+				<include name="windows_natives.jar"/>
 				<include name="linux_natives.jar"/>
 				<include name="macosx_natives.jar"/>					
 			</fileset>
 		</jar>
-		<delete file="applet/win32_natives.jar"/>
+		<delete file="applet/windows_natives.jar"/>
 		<delete file="applet/linux_natives.jar"/>
 		<delete file="applet/macosx_natives.jar"/>
 		

Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-11 20:30:19 UTC (rev 2479)
@@ -2,7 +2,8 @@
 
 <project name="lwjgl native code, linux" basedir="../../bin" default="compile">
 	<property name="native" location="../src/native"/>
-	<property name="libname" value="liblwjgl.so"/>
+	<property name="libname32" value="liblwjgl.so"/>
+	<property name="libname64" value="liblwjgl64.so"/>
 	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
 	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lpthread -L${java.home}/lib/amd64 -ljawt -lXxf86vm -lXcursor -lXrender -lXrandr -lXfixes"/>
 	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
@@ -21,6 +22,9 @@
 		<condition property="libs" value="${libs64}" else="${libs32}">
 			<equals arg1="${hwplatform}" arg2="x86_64"/>
 		</condition>
+		<condition property="libname" value="${libname64}" else="${libname32}">
+			<equals arg1="${hwplatform}" arg2="x86_64"/>
+		</condition>
 		<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
 		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
 			<arg line="${cflags}"/>

Modified: trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/src/java/org/lwjgl/DefaultSysImplementation.java	2006-07-11 20:30:19 UTC (rev 2479)
@@ -46,6 +46,10 @@
 		return 1000;
 	}
 
+	public boolean has64Bit() {
+		return false;
+	}
+
 	public abstract long getTime();
 	public abstract void alert(String title, String message);
 	public abstract String getClipboard();

Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-07-11 20:30:19 UTC (rev 2479)
@@ -58,7 +58,7 @@
 	public static final int PLATFORM_WINDOWS 			= 3;
 	public static final String PLATFORM_LINUX_NAME 		= "linux";
 	public static final String PLATFORM_MACOSX_NAME 	= "macosx";
-	public static final String PLATFORM_WINDOWS_NAME	= "win32";
+	public static final String PLATFORM_WINDOWS_NAME	= "windows";
 	
 	/** LWJGL Logo - 16 by 16 pixels */
 	public static final ByteBuffer	LWJGLIcon16x16		= BufferUtils.createByteBuffer(16 * 16 * 4).put(new byte[] { 

Modified: trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/src/java/org/lwjgl/LinuxSysImplementation.java	2006-07-11 20:30:19 UTC (rev 2479)
@@ -71,4 +71,8 @@
 		// Seems to have failed
 		return false;
 	}
+
+	public boolean has64Bit() {
+		return true;
+	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2006-07-11 20:30:19 UTC (rev 2479)
@@ -58,8 +58,10 @@
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;
+
+	private final static String POSTFIX64BIT = "64";
   
-	private static void loadLibrary(final String lib_name) {
+	private static void doLoadLibrary(final String lib_name) {
 		AccessController.doPrivileged(new PrivilegedAction() {
 			public Object run() {
 				String library_path = System.getProperty("org.lwjgl.librarypath");
@@ -72,6 +74,21 @@
 				return null;
 			}
 		});
+	}
+
+	private static void loadLibrary(final String lib_name) {
+		try {
+			loadLibrary(lib_name);
+		} catch (UnsatisfiedLinkError e) {
+			if (implementation.has64Bit()) {
+				try {
+					loadLibrary(lib_name + POSTFIX64BIT);
+				} catch (UnsatisfiedLinkError e2) {
+					LWJGLUtil.log("Failed to load 64 bit library:" + e2.getMessage());
+				}
+			}
+			throw e;
+		}
 	}	
 
 	static {

Modified: trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/src/java/org/lwjgl/SysImplementation.java	2006-07-11 20:30:19 UTC (rev 2479)
@@ -44,22 +44,28 @@
 	/**
 	 * Return the version of the native library
 	 */
-	public String getNativeLibraryVersion();
+	String getNativeLibraryVersion();
 
-	public void setDebug(boolean debug);
+	void setDebug(boolean debug);
 
 	/**
 	 * Obtains the number of ticks that the hires timer does in a second.
 	 *
 	 * @return timer resolution in ticks per second or 0 if no timer is present.
 	 */
-	public long getTimerResolution();
+	long getTimerResolution();
 
-	public long getTime();
+	long getTime();
 
-	public void alert(String title, String message);
+	void alert(String title, String message);
 
 	boolean openURL(String url);
 
-	public String getClipboard();
+	String getClipboard();
+
+	/**
+	 * Returns true there exists a separate 64 bit library
+	 * on the platform
+	 */
+	boolean has64Bit();
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 20:00:27 UTC (rev 2478)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 20:30:19 UTC (rev 2479)
@@ -84,7 +84,7 @@
 	 * the user's temp directory, and instruct the LWJGL subsystem to load its
 	 * native files from there.
 	 * The file required by the installer, is gotten from the classloader via its
-	 * getResource command, and is expected to be named <win32 | linux | macosx>_natives.jar.
+	 * getResource command, and is expected to be named <windows | linux | macosx>_natives.jar.
 	 * Note: Due to the nature of native libraries, we cannot actually uninstall the currently
 	 * loaded files, but rather the "last" installed. This means that the most recent install of LWJGL
 	 * will always be present in the users temp dir. When invoking the tempInstall method, all old installations


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

Revision: 2478
Author:   elias_naur
Date:     2006-07-11 13:00:27 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2478&view=rev

Log Message:
-----------
Refreshed jinput.jar

Modified Paths:
--------------
    trunk/LWJGL/libs/jinput.jar
Modified: trunk/LWJGL/libs/jinput.jar
===================================================================
(Binary files differ)


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

Revision: 2477
Author:   matzon
Date:     2006-07-11 12:54:47 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2477&view=rev

Log Message:
-----------
flueknepperi

Modified Paths:
--------------
    trunk/LWJGL/platform_build/windows_ant/build.xml
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-11 19:33:05 UTC (rev 2476)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-11 19:54:47 UTC (rev 2477)
@@ -4,7 +4,7 @@
 	<property name="native" location="../src/native"/>
 	<property environment="env"/>
 	<property name="dxhome" location="${env.DXSDK_DIR}"/>
-	<property name="sdkhome" location="${env.MSSDk}"/>
+	<property name="sdkhome" location="${env.MSSDK}"/>
 	<property name="program_files" location="${env.ProgramFiles}"/>
 	<property name="alhome" location="${program_files}\OpenAL 1.1 with EFX SDK"/>
 	<property name="dllname" value="lwjgl.dll"/>


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

Revision: 2476
Author:   elias_naur
Date:     2006-07-11 12:33:05 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2476&view=rev

Log Message:
-----------
LWJGLInstaller: use constant instead of hardcoded filename

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 19:30:10 UTC (rev 2475)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 19:33:05 UTC (rev 2476)
@@ -268,7 +268,7 @@
 		return (String) AccessController.doPrivileged(new PrivilegedExceptionAction() {
 			public Object run() throws Exception {
 				// create the temp directory
-				File tempDir = new File(user_temp_dir + File.separator + ".lwjglinstall" + File.separator + System.currentTimeMillis());
+				File tempDir = new File(user_temp_dir + File.separator + MASTER_INSTALL_DIR + File.separator + System.currentTimeMillis());
 				if(!tempDir.mkdirs()) {
 					throw new IOException("Failed to create directory: " + tempDir);
 				}


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

Revision: 2475
Author:   matzon
Date:     2006-07-11 12:30:10 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2475&view=rev

Log Message:
-----------
update/fix comments

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 19:06:11 UTC (rev 2474)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 19:30:10 UTC (rev 2475)
@@ -52,11 +52,10 @@
 
 import org.lwjgl.LWJGLUtil;
 
-
-
 /**
  * <p>
- * 
+ * Installer class for installing LWJGL temporarily into a temp directory.
+ * This class is used for installing LWJGL for use with applets.
  * </p>
  * @author Brian Matzon <br...@ma...>
  * @version $Revision$
@@ -69,11 +68,11 @@
 	/** Directory all lwjgl installations go into */
 	private static final String MASTER_INSTALL_DIR = ".lwjglinstall";
 
-	/** Directory all lwjgl installations go into */
+	/** Name of file that we use to tag 'live' installations */
 	private static final String WATERMARK_FILE = ".lwjglinuse";
 	
 	/** Name of the native jar we're expected to load and install */
-	private static final String 	NATIVES_PLATFORM_JAR = "/" + LWJGLUtil.getPlatformName() + "_natives.jar";	
+	private static final String NATIVES_PLATFORM_JAR = "/" + LWJGLUtil.getPlatformName() + "_natives.jar";	
 	
 	private LWJGLInstaller() {
 		/* Unused */
@@ -84,12 +83,12 @@
 	 * This will extract the relevant native files (for the platform) into
 	 * the user's temp directory, and instruct the LWJGL subsystem to load its
 	 * native files from there.
-	 * The files required by the installer, are gotten from the classloader via its
-	 * getResource command, and are assumed to in the path: /native/<win32|linux|macosx>/
-	 * Any call to this method will also add a shutdown hook to the uninstall of the libraries
+	 * The file required by the installer, is gotten from the classloader via its
+	 * getResource command, and is expected to be named <win32 | linux | macosx>_natives.jar.
 	 * Note: Due to the nature of native libraries, we cannot actually uninstall the currently
 	 * loaded files, but rather the "last" installed. This means that the most recent install of LWJGL
-	 * will always be present in the users temp dir.
+	 * will always be present in the users temp dir. When invoking the tempInstall method, all old installations
+	 * will be uninstalled first.
 	 * 
 	 * @see java.lang.ClassLoader#getResource(String)
 	 */
@@ -260,9 +259,9 @@
 
 	/**
 	 * Creates the temporary dir to store lwjgl files in.
-	 * The temporary dir will be created in the users temp dir and
-	 * called 'lwjgl-' and appended System.currentTimeMillis(). A watermark file
-	 * called '.lwjglinuse' will also be created in the directory.
+	 * The temporary dir will be created in a subdirectory of '.lwjglinstall' in 
+	 * the users temp dir. The subdirectory will be named the current time in milliseconds. 
+	 * A watermark file called '.lwjglinuse' will also be created in the directory.
 	 * @return Name of temp directory or null if directory creation failed
 	 */
 	private static String createTemporaryDir(final String user_temp_dir) throws Exception {


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

Revision: 2474
Author:   elias_naur
Date:     2006-07-11 12:06:11 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2474&view=rev

Log Message:
-----------
LWJGInstaller: Run the uninstaller before installing instead of at VM exit

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 18:55:35 UTC (rev 2473)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 19:06:11 UTC (rev 2474)
@@ -110,11 +110,7 @@
 
 			AccessController.doPrivileged(new PrivilegedAction() {
 				public Object run() {
-					Runtime.getRuntime().addShutdownHook(new Thread() {
-						public void run() {
-							uninstall();
-						}
-					});
+					uninstall();
 					return null;
 				}
 			});


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

Revision: 2473
Author:   elias_naur
Date:     2006-07-11 11:55:35 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2473&view=rev

Log Message:
-----------
LWJGLInstaller: Rename watermark file to .lwjglinuse

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 18:52:13 UTC (rev 2472)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 18:55:35 UTC (rev 2473)
@@ -68,6 +68,9 @@
 	
 	/** Directory all lwjgl installations go into */
 	private static final String MASTER_INSTALL_DIR = ".lwjglinstall";
+
+	/** Directory all lwjgl installations go into */
+	private static final String WATERMARK_FILE = ".lwjglinuse";
 	
 	/** Name of the native jar we're expected to load and install */
 	private static final String 	NATIVES_PLATFORM_JAR = "/" + LWJGLUtil.getPlatformName() + "_natives.jar";	
@@ -263,7 +266,7 @@
 	 * Creates the temporary dir to store lwjgl files in.
 	 * The temporary dir will be created in the users temp dir and
 	 * called 'lwjgl-' and appended System.currentTimeMillis(). A watermark file
-	 * called '.lwjglinstaller' will also be created in the directory.
+	 * called '.lwjglinuse' will also be created in the directory.
 	 * @return Name of temp directory or null if directory creation failed
 	 */
 	private static String createTemporaryDir(final String user_temp_dir) throws Exception {
@@ -277,7 +280,7 @@
 
 				// add the watermark file
 				// TODO: Write some info to the file ?
-				File watermark = new File(tempDir.getAbsolutePath() + File.separator + ".lwjglinstaller");
+				File watermark = new File(tempDir.getAbsolutePath() + File.separator + WATERMARK_FILE);
 				watermark.createNewFile();
 				watermark.deleteOnExit();
 				return tempDir.getAbsolutePath();
@@ -326,7 +329,7 @@
 					 * @return true if the directory is an install directory
 					 */
 					private boolean isStale(File directory) {
-						File installFile = new File(directory.getAbsolutePath() + File.separator + ".lwjglinstaller");
+						File installFile = new File(directory.getAbsolutePath() + File.separator + WATERMARK_FILE);
 						return !installFile.exists();
 					}
 


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

Revision: 2472
Author:   elias_naur
Date:     2006-07-11 11:52:13 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2472&view=rev

Log Message:
-----------
LWJGLInstaller: Don't allow applets to decide whether to uninstall old lwjgl dirs

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 18:49:36 UTC (rev 2471)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 18:52:13 UTC (rev 2472)
@@ -63,9 +63,6 @@
  * $Id$
  */
 public class LWJGLInstaller {
-	/** Whether to hook uninstall rutine. Must be called prior to installation */
-	public static boolean disableUninstall = false;
-
 	/** Whether the installer has been called */
 	private static boolean installed;
 	
@@ -93,7 +90,7 @@
 	 * 
 	 * @see java.lang.ClassLoader#getResource(String)
 	 */
-	public static void tempInstall() throws Exception {
+	public synchronized static void tempInstall() throws Exception {
 		// only need to install once
 		if (installed) {
 			return;
@@ -108,19 +105,16 @@
 				}
 			});
 
-			// install shutdown installer hook
-			if(!disableUninstall) {
-				AccessController.doPrivileged(new PrivilegedAction() {
-					public Object run() {
-						Runtime.getRuntime().addShutdownHook(new Thread() {
-							public void run() {
-								uninstall();
-							}
-						});
-						return null;
-					}
-				});
-			}
+			AccessController.doPrivileged(new PrivilegedAction() {
+				public Object run() {
+					Runtime.getRuntime().addShutdownHook(new Thread() {
+						public void run() {
+							uninstall();
+						}
+					});
+					return null;
+				}
+			});
 
 			// create a temporary dir for the native files
 			String user_temp_dir = getPriviledgedString("java.io.tmpdir");


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

Revision: 2471
Author:   elias_naur
Date:     2006-07-11 11:49:36 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2471&view=rev

Log Message:
-----------
Tightened access modifiers in LWJGLInstaller

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 18:38:46 UTC (rev 2470)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/LWJGLInstaller.java	2006-07-11 18:49:36 UTC (rev 2471)
@@ -63,21 +63,17 @@
  * $Id$
  */
 public class LWJGLInstaller {
-
-	/** Whether the installer has been called */
-	public static boolean installed;
-	
 	/** Whether to hook uninstall rutine. Must be called prior to installation */
 	public static boolean disableUninstall = false;
-	
-	/** Buffer used when copying files */
-	private static final byte[] COPY_BUFFER = new byte[4096];
 
+	/** Whether the installer has been called */
+	private static boolean installed;
+	
 	/** Directory all lwjgl installations go into */
-	public static final String MASTER_INSTALL_DIR = ".lwjglinstall";
+	private static final String MASTER_INSTALL_DIR = ".lwjglinstall";
 	
 	/** Name of the native jar we're expected to load and install */
-	public static final String 	NATIVES_PLATFORM_JAR = "/" + LWJGLUtil.getPlatformName() + "_natives.jar";	
+	private static final String 	NATIVES_PLATFORM_JAR = "/" + LWJGLUtil.getPlatformName() + "_natives.jar";	
 	
 	private LWJGLInstaller() {
 		/* Unused */
@@ -259,9 +255,11 @@
 	 * @throws IOException if the copy process fail in any way
 	 */
 	private static void copyFile(InputStream is, OutputStream os) throws IOException {
+		byte[] copy_buffer = new byte[4096];
+
 		int len;
-		while ((len = is.read(COPY_BUFFER)) > 0) {
-			os.write(COPY_BUFFER, 0, len);
+		while ((len = is.read(copy_buffer)) > 0) {
+			os.write(copy_buffer, 0, len);
 		}
 		
 		os.close();


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