Menu
▾
▴
java-game-lib-cvs
|
From: <ma...@us...> - 2006-04-30 21:15:36
|
Revision: 2314 Author: matzon Date: 2006-04-30 14:15:30 -0700 (Sun, 30 Apr 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2314&view=rev Log Message: ----------- 1.0 base and optional Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-04-30 21:15:14 UTC (rev 2313) +++ trunk/LWJGL/build.xml 2006-04-30 21:15:30 UTC (rev 2314) @@ -3,17 +3,17 @@ <!-- ================================================================== --> <!-- Global properties for build --> <!-- ================================================================== --> - <property name="lwjgl.src" value="./src" /> - <property name="lwjgl.src.native" value="${lwjgl.src}/native" /> - <property name="lwjgl.src.headers" value="${lwjgl.src.native}/common" /> + <property name="lwjgl.src" value="./src" /> + <property name="lwjgl.src.native" value="${lwjgl.src}/native" /> + <property name="lwjgl.src.headers" value="${lwjgl.src.native}/common" /> <property name="lwjgl.src.templates" value="${lwjgl.src}/templates" /> - <property name="lwjgl.bin" value="./bin" /> - <property name="lwjgl.lib" value="./libs" /> - <property name="lwjgl.dist" value="./dist" /> - <property name="lwjgl.docs" value="./doc" /> - <property name="lwjgl.temp" value="./temp" /> - <property name="lwjgl.res" value="./res" /> - <property name="lwjgl.version" value="0.99" /> + <property name="lwjgl.bin" value="./bin" /> + <property name="lwjgl.lib" value="./libs" /> + <property name="lwjgl.dist" value="./dist" /> + <property name="lwjgl.docs" value="./doc" /> + <property name="lwjgl.temp" value="./temp" /> + <property name="lwjgl.res" value="./res" /> + <property name="lwjgl.version" value="1.0" /> <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java"/> <!-- ================================================================== --> @@ -47,15 +47,21 @@ <include name="org/lwjgl/test/opengl/shaders/shaderFSH.vsh" /> <include name="org/lwjgl/test/opengl/shaders/shaderVP.vp" /> <include name="org/lwjgl/test/opengl/shaders/shaderVSH.vsh" /> - </fileset> - + </fileset> <!-- Files to include in the lwjgl_util.jar file --> <fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}"> <exclude name="**.*" /> + <exclude name="org/lwjgl/util/model/**" /> <include name="org/lwjgl/util/**" /> </fileset> + <!-- Files to include in the lwjgl_model.jar file --> + <fileset id="lwjgl_model.fileset" dir="${lwjgl.bin}"> + <exclude name="**.*" /> + <include name="org/lwjgl/util/model/**" /> + </fileset> + <!-- Files to include in the lwjgl_fmod3.jar file --> <fileset id="lwjgl_fmod3.fileset" dir="${lwjgl.bin}"> <exclude name="**.*" /> @@ -90,43 +96,51 @@ <!-- Files to include in win32 package --> <patternset id="lwjgl-win32.fileset"> <include name="lwjgl.dll" /> - <include name="lwjgl-fmod3.dll" /> - <include name="lwjgl-devil.dll" /> - <include name="OpenAL32.dll" /> + <include name="jinput-dx8.dll" /> + <include name="jinput-raw.dll" /> + </patternset> + + <!-- Files to include in win32 optional package --> + <patternset id="lwjgl-win32_optional.fileset"> + <include name="lwjgl_fmod3.dll" /> + <include name="lwjgl_devil.dll" /> <include name="DevIL.dll" /> <include name="ILU.dll" /> <include name="ILUT.dll" /> - - <include name="jinput-dxplugin.dll" /> - </patternset> + </patternset> <!-- Files to include in linux, glibc2.3 package --> <patternset id="lwjgl-linux.fileset"> <include name="liblwjgl.so" /> - <include name="liblwjgl-fmod3.so" /> - <include name="liblwjgl-devil.so" /> - - <include name="libopenal.so" /> + <include name="libopenal.so" /> + <include name="libjinput-linux.so" /> + </patternset> + + <!-- Files to include in linux optional, glibc2.3 package --> + <patternset id="lwjgl-linux_optional.fileset"> + <include name="liblwjgl_fmod3.so" /> + <include name="liblwjgl_devil.so" /> <include name="libIL.so" /> <include name="libILU.so" /> <include name="libILUT.so" /> - - <include name="libjinput-linux.so" /> - </patternset> + </patternset> <!-- Files to include in mac os x package --> <patternset id="lwjgl-macosx.fileset"> <include name="liblwjgl.jnilib" /> - <include name="liblwjgl-fmod3.jnilib" /> - <include name="liblwjgl-devil.jnilib" /> - <include name="openal.dylib" /> + <include name="libjinput-osx.jnilib" /> + <include name="libjinput-osx-legacy.jnilib" /> + </patternset> + + <!-- Files to include in mac os x optional package --> + <patternset id="lwjgl-macosx_optional.fileset"> + <include name="liblwjgl_fmod3.jnilib" /> + <include name="liblwjgl_devil.jnilib" /> <include name="libIL.dylib" /> <include name="libILU.dylib" /> <include name="libILUT.dylib" /> - - <include name="libjinput.jnilib" /> </patternset> <!-- Files to include in source distribution --> @@ -136,6 +150,45 @@ <include name="platform_build/win32_ms_cmdline/*.bat" /> </fileset> + <!-- files in the base package --> + <patternset id="lwjgl_base"> + <include name="**" /> + <exclude name="jar/lwjgl_fmod3.jar" /> + <exclude name="jar/lwjgl_devil.jar" /> + <exclude name="jar/lwjgl_model.jar" /> + <exclude name="native/win32/DevIL.dll" /> + <exclude name="native/win32/ILU.dll" /> + <exclude name="native/win32/ILUT.dll" /> + <exclude name="native/linux/libIL*.so" /> + <exclude name="native/macosx/libIL*.dylib" /> + <exclude name="res/model/**" /> + <exclude name="res/ILtest.*" /> + <exclude name="res/Missing_you.mod" /> + <exclude name="res/phero*.*" /> + <exclude name="doc/3rdparty/openil_license.txt" /> + </patternset> + + <!-- files in the optional package --> + <patternset id="lwjgl_optional"> + <include name="jar/lwjgl_fmod3.jar" /> + <include name="jar/lwjgl_devil.jar" /> + <include name="jar/lwjgl_model.jar" /> + <include name="native/win32/DevIL.dll" /> + <include name="native/win32/ILU.dll" /> + <include name="native/win32/ILUT.dll" /> + <include name="native/linux/libIL*.so" /> + <include name="native/macosx/libIL*.dylib" /> + <include name="res/**" /> + <exclude name="res/logo/**" /> + <exclude name="res/spaceinvaders/**" /> + <exclude name="res/*.wav" /> + <exclude name="res/*.xpm" /> + <include name="doc/3rdparty/openil_license.txt" /> + <include name="doc/CREDITS" /> + <include name="doc/LICENSE" /> + <include name="doc/README" /> + </patternset> + <uptodate property="lwjgl.main.built" targetfile="${lwjgl.lib}/win32/lwjgl.dll" > <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c*"/> <srcfiles dir= "${lwjgl.src.native}/generated" includes="*.c"/> @@ -212,7 +265,7 @@ <!-- compile and create jars --> <antcall target="compile" /> - <antcall target="javadoc" /> + <antcall target="javadoc" /> <antcall target="-createjars" /> <!-- copy resources to res folder --> @@ -259,6 +312,11 @@ <jar destfile="${lwjgl.temp}/jar/lwjgl_util.jar" taskname="lwjgl_util.jar"> <fileset refid="lwjgl_util.fileset" /> </jar> + + <!-- Create lwjgl_model.jar --> + <jar destfile="${lwjgl.temp}/jar/lwjgl_model.jar" taskname="lwjgl_model.jar"> + <fileset refid="lwjgl_model.fileset" /> + </jar> <!-- Create lwjgl_fmod.jar --> <jar destfile="${lwjgl.temp}/jar/lwjgl_fmod3.jar" taskname="lwjgl_fmod3.jar"> @@ -280,22 +338,35 @@ <copy todir="${lwjgl.temp}/native/win32"> <fileset dir="${lwjgl.lib}/win32"> <patternset refid="lwjgl-win32.fileset" /> + <patternset refid="lwjgl-win32_optional.fileset" /> </fileset> </copy> <copy todir="${lwjgl.temp}/native/linux"> <fileset dir="${lwjgl.lib}/linux"> <patternset refid="lwjgl-linux.fileset" /> + <patternset refid="lwjgl-linux_optional.fileset" /> </fileset> </copy> <copy todir="${lwjgl.temp}/native/macosx"> <fileset dir="${lwjgl.lib}/macosx"> <patternset refid="lwjgl-macosx.fileset" /> + <patternset refid="lwjgl-macosx_optional.fileset" /> </fileset> </copy> + <!-- create base package --> <zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip"> - <zipfileset dir="${lwjgl.temp}" prefix="lwjgl-${lwjgl.version}/"/> + <zipfileset dir="${lwjgl.temp}" prefix="lwjgl-${lwjgl.version}/"> + <patternset refid="lwjgl_base"/> + </zipfileset> </zip> + + <!-- create optional package --> + <zip destfile="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip"> + <zipfileset dir="${lwjgl.temp}" prefix="lwjgl_optional-${lwjgl.version}/"> + <patternset refid="lwjgl_optional"/> + </zipfileset> + </zip> </target> <!-- Creates a versioned distribution of javadocs --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-05-05 09:32:54
|
Revision: 2322 Author: elias_naur Date: 2006-05-05 01:14:28 -0700 (Fri, 05 May 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2322&view=rev Log Message: ----------- Removed the generator from lwjgl_util.jar Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-05-03 20:53:16 UTC (rev 2321) +++ trunk/LWJGL/build.xml 2006-05-05 08:14:28 UTC (rev 2322) @@ -52,6 +52,7 @@ <!-- 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/model/**" /> <include name="org/lwjgl/util/**" /> </fileset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-05-14 21:56:05
|
Revision: 2328 Author: matzon Date: 2006-05-14 14:55:57 -0700 (Sun, 14 May 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2328&view=rev Log Message: ----------- 1.0beta version string fixes to optional Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-05-14 21:54:48 UTC (rev 2327) +++ trunk/LWJGL/build.xml 2006-05-14 21:55:57 UTC (rev 2328) @@ -13,7 +13,7 @@ <property name="lwjgl.docs" value="./doc" /> <property name="lwjgl.temp" value="./temp" /> <property name="lwjgl.res" value="./res" /> - <property name="lwjgl.version" value="1.0" /> + <property name="lwjgl.version" value="1.0beta" /> <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java"/> <!-- ================================================================== --> @@ -98,14 +98,14 @@ <patternset id="lwjgl-win32.fileset"> <include name="lwjgl.dll" /> <include name="OpenAL32.dll" /> - <include name="jinput-dx8.dll" /> - <include name="jinput-raw.dll" /> + <include name="jinput-dx8.dll" /> + <include name="jinput-raw.dll" /> </patternset> <!-- Files to include in win32 optional package --> <patternset id="lwjgl-win32_optional.fileset"> - <include name="lwjgl_fmod3.dll" /> - <include name="lwjgl_devil.dll" /> + <include name="lwjgl-fmod3.dll" /> + <include name="lwjgl-devil.dll" /> <include name="DevIL.dll" /> <include name="ILU.dll" /> <include name="ILUT.dll" /> @@ -115,13 +115,13 @@ <patternset id="lwjgl-linux.fileset"> <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 --> <patternset id="lwjgl-linux_optional.fileset"> - <include name="liblwjgl_fmod3.so" /> - <include name="liblwjgl_devil.so" /> + <include name="liblwjgl-fmod3.so" /> + <include name="liblwjgl-devil.so" /> <include name="libIL.so" /> <include name="libILU.so" /> <include name="libILUT.so" /> @@ -131,14 +131,14 @@ <patternset id="lwjgl-macosx.fileset"> <include name="liblwjgl.jnilib" /> <include name="openal.dylib" /> - <include name="libjinput-osx.jnilib" /> - <include name="libjinput-osx-legacy.jnilib" /> + <include name="libjinput-osx.jnilib" /> + <include name="libjinput-osx-legacy.jnilib" /> </patternset> <!-- Files to include in mac os x optional package --> <patternset id="lwjgl-macosx_optional.fileset"> - <include name="liblwjgl_fmod3.jnilib" /> - <include name="liblwjgl_devil.jnilib" /> + <include name="liblwjgl-fmod3.jnilib" /> + <include name="liblwjgl-devil.jnilib" /> <include name="libIL.dylib" /> <include name="libILU.dylib" /> <include name="libILUT.dylib" /> @@ -157,11 +157,14 @@ <exclude name="jar/lwjgl_fmod3.jar" /> <exclude name="jar/lwjgl_devil.jar" /> <exclude name="jar/lwjgl_model.jar" /> + <exclude name="native/win32/lwjgl-*.dll" /> <exclude name="native/win32/DevIL.dll" /> <exclude name="native/win32/ILU.dll" /> <exclude name="native/win32/ILUT.dll" /> <exclude name="native/linux/libIL*.so" /> + <exclude name="native/linux/liblwjgl-*.so" /> <exclude name="native/macosx/libIL*.dylib" /> + <exclude name="native/macosx/liblwjgl-*.jnilib" /> <exclude name="res/model/**" /> <exclude name="res/ILtest.*" /> <exclude name="res/Missing_you.mod" /> @@ -174,11 +177,14 @@ <include name="jar/lwjgl_fmod3.jar" /> <include name="jar/lwjgl_devil.jar" /> <include name="jar/lwjgl_model.jar" /> + <include name="native/win32/lwjgl-*.dll" /> <include name="native/win32/DevIL.dll" /> <include name="native/win32/ILU.dll" /> <include name="native/win32/ILUT.dll" /> <include name="native/linux/libIL*.so" /> + <include name="native/linux/liblwjgl-*.so" /> <include name="native/macosx/libIL*.dylib" /> + <include name="native/macosx/liblwjgl-*.jnilib" /> <include name="res/**" /> <exclude name="res/logo/**" /> <exclude name="res/spaceinvaders/**" /> @@ -412,6 +418,7 @@ <class name="org.lwjgl.opengl.LinuxContextImplementation" /> <class name="org.lwjgl.opengl.LinuxCanvasImplementation" /> </javah> + <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/win32" force="yes"> <class name="org.lwjgl.opengl.Win32PbufferPeerInfo" /> <class name="org.lwjgl.opengl.Win32Display" /> @@ -422,6 +429,7 @@ <class name="org.lwjgl.opengl.Win32DisplayPeerInfo" /> <class name="org.lwjgl.opengl.Win32ContextImplementation" /> </javah> + <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" /> <class name="org.lwjgl.opengl.MacOSXPeerInfo" /> @@ -429,6 +437,7 @@ <class name="org.lwjgl.opengl.MacOSXDisplay" /> <class name="org.lwjgl.opengl.MacOSXContextImplementation" /> </javah> + <!-- lwjgl --> <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> <class name="org.lwjgl.opengl.AWTSurfaceLock" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-07-07 10:39:24
|
Revision: 2450 Author: elias_naur Date: 2006-07-07 03:38:54 -0700 (Fri, 07 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2450&view=rev Log Message: ----------- Made build.xml use location in properties where appropriate Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-07 10:36:26 UTC (rev 2449) +++ trunk/LWJGL/build.xml 2006-07-07 10:38:54 UTC (rev 2450) @@ -3,16 +3,16 @@ <!-- ================================================================== --> <!-- Global properties for build --> <!-- ================================================================== --> - <property name="lwjgl.src" value="./src" /> - <property name="lwjgl.src.native" value="${lwjgl.src}/native" /> - <property name="lwjgl.src.headers" value="${lwjgl.src.native}/common" /> - <property name="lwjgl.src.templates" value="${lwjgl.src}/templates" /> - <property name="lwjgl.bin" value="./bin" /> - <property name="lwjgl.lib" value="./libs" /> - <property name="lwjgl.dist" value="./dist" /> - <property name="lwjgl.docs" value="./doc" /> - <property name="lwjgl.temp" value="./temp" /> - <property name="lwjgl.res" value="./res" /> + <property name="lwjgl.src" location="src" /> + <property name="lwjgl.src.native" location="${lwjgl.src}/native" /> + <property name="lwjgl.src.headers" location="${lwjgl.src.native}/common" /> + <property name="lwjgl.src.templates" location="${lwjgl.src}/templates" /> + <property name="lwjgl.bin" location="bin" /> + <property name="lwjgl.lib" location="libs" /> + <property name="lwjgl.dist" location="dist" /> + <property name="lwjgl.docs" location="doc" /> + <property name="lwjgl.temp" location="temp" /> + <property name="lwjgl.res" location="res" /> <property name="lwjgl.version" value="1.0beta2" /> <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-07-12 19:36:36
|
Revision: 2503 Author: matzon Date: 2006-07-12 12:36:29 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2503&view=rev Log Message: ----------- using ant build files for linux Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-12 19:35:54 UTC (rev 2502) +++ trunk/LWJGL/build.xml 2006-07-12 19:36:29 UTC (rev 2503) @@ -714,19 +714,11 @@ </target> <target name="-compile_native_linux_optional" if="lwjgl.platform.linux"> - <!-- 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"/> - - <exec executable="make" dir="${lwjgl.src.native}/common/devil"> - <arg line="-f Makefile.linux"/> - </exec> - <exec executable="make" dir="${lwjgl.src.native}/common/fmod3"> - <arg line="-f Makefile.linux"/> - </exec> - <move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.so" tofile="${lwjgl.lib}/linux/liblwjgl-devil.so" /> - <move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.so" tofile="${lwjgl.lib}/linux/liblwjgl-fmod3.so" /> + <ant antfile="platform_build/linux_ant/build_fmod3.xml" inheritAll="false"/> + <copy file="${lwjgl.bin}/fmod3/liblwjgl-fmod3.so" todir="${lwjgl.lib}/linux"/> + + <ant antfile="platform_build/linux_ant/build_devil.xml" inheritAll="false"/> + <copy file="${lwjgl.bin}/devil/liblwjgl-devil.so" todir="${lwjgl.lib}/linux"/> </target> <target name="-compile_native_macosx" if="lwjgl.platform.macosx"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-07-12 21:29:46
|
Revision: 2507 Author: matzon Date: 2006-07-12 14:29:31 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2507&view=rev Log Message: ----------- no more source dist - get from svn date fixes fixed signing and path issue when doing jnlp Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-12 19:57:22 UTC (rev 2506) +++ trunk/LWJGL/build.xml 2006-07-12 21:29:31 UTC (rev 2507) @@ -149,13 +149,6 @@ <include name="libILUT.dylib" /> </patternset> - <!-- Files to include in source distribution --> - <fileset id="lwjgl.source.fileset" dir="."> - <include name="build.xml" /> - <include name="src/**" /> - <include name="platform_build/**/*" /> - </fileset> - <!-- files in the base package --> <patternset id="lwjgl_base"> <include name="**" /> @@ -293,7 +286,6 @@ <!-- create distribution from files in libs/ and temp/ --> <antcall target="-distribution_javadoc" /> - <antcall target="-distribution_source" /> <antcall target="-distribute" /> </target> @@ -478,13 +470,6 @@ <zip destfile="${lwjgl.dist}/lwjgl-docs-${lwjgl.version}.zip" basedir="${lwjgl.docs}" includes="javadoc/**" /> </target> - <!-- Creates a versioned distribution of the source code --> - <target name="-distribution_source"> - <zip destfile="${lwjgl.dist}/lwjgl-source-${lwjgl.version}.zip"> - <fileset refid="lwjgl.source.fileset" /> - </zip> - </target> - <!-- Compiles the Java source code --> <target name="compile" description="Compiles the java source code" depends="-initialize"> <javac debug="yes" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar" taskname="core"> @@ -575,7 +560,7 @@ <javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API"> <fileset refid="lwjgl.javadoc.fileset" /> <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle> - <bottom><![CDATA[<i>Copyright © 2002-2005 lwjgl.org. All Rights Reserved.</i>]]></bottom> + <bottom><![CDATA[<i>Copyright © 2002-2006 lwjgl.org. All Rights Reserved.</i>]]></bottom> </javadoc> </target> @@ -753,33 +738,42 @@ <unzip src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> <unzip src="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> + <!-- move files to unified structure --> + <move todir="${lwjgl.temp}/jnlp/temp"> + <fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/"> + <include name="**"/> + </fileset> + <fileset dir="${lwjgl.temp}/jnlp/temp/lwjgl_optional-${lwjgl.version}/"> + <include name="**"/> + </fileset> + </move> + <!-- move relevant files to root --> - <move todir="${lwjgl.temp}/jnlp" flatten="true"> + <move todir="${lwjgl.temp}/jnlp/" flatten="true"> <fileset dir="${lwjgl.temp}/jnlp/temp"> <include name="**/**.jar"/> </fileset> </move> <!-- create native jars --> - <jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/win32"/> - <jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/linux"/> - <jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/macosx"/> + <jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/native/win32"/> + <jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/native/linux"/> + <jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/native/macosx"/> <!-- create media jar --> <jar destfile="${lwjgl.temp}/jnlp/media.jar" basedir="${lwjgl.res}"/> <!-- sign 'em --> - <input message="Please enter store password:" addproperty="store.pwd" /> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/media.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/jinput.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/media.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="${lwjgl.temp}/jnlp/jinput.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> </target> <!-- --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2007-04-19 22:53:34
|
Revision: 2790
http://svn.sourceforge.net/java-game-lib/?rev=2790&view=rev
Author: matzon
Date: 2007-04-19 15:53:32 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
removed ALC from javah
added AL11 to generate-openal
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2007-04-19 22:49:49 UTC (rev 2789)
+++ trunk/LWJGL/build.xml 2007-04-19 22:53:32 UTC (rev 2790)
@@ -596,7 +596,6 @@
<class name="org.lwjgl.input.Keyboard" />
<class name="org.lwjgl.input.Mouse" />
- <class name="org.lwjgl.openal.ALC" />
<class name="org.lwjgl.openal.AL" />
<class name="org.lwjgl.opengl.GLContext" />
@@ -648,7 +647,7 @@
<arg path="${lwjgl.src.native}/generated"/>
<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
<arg value="-Ageneratechecks"/>
- <fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java"/>
+ <fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
</apply>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2007-04-26 07:13:05
|
Revision: 2807
http://svn.sourceforge.net/java-game-lib/?rev=2807&view=rev
Author: elias_naur
Date: 2007-04-26 00:13:02 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
Reverted accidental build.xml change
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2007-04-26 06:55:55 UTC (rev 2806)
+++ trunk/LWJGL/build.xml 2007-04-26 07:13:02 UTC (rev 2807)
@@ -306,7 +306,7 @@
<target name="all" description="Creates the Java archives and the natives for the current platform" depends="jars, compile_native"/>
<!-- Create ONLY the jar archives -->
- <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">
+ <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
<move todir="libs/">
<fileset dir="${lwjgl.temp}/jar">
<include name="*.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2007-06-20 08:58:29
|
Revision: 2855
http://svn.sourceforge.net/java-game-lib/?rev=2855&view=rev
Author: elias_naur
Date: 2007-06-20 01:58:26 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Reverted accidental build.xml change
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2007-06-20 08:57:45 UTC (rev 2854)
+++ trunk/LWJGL/build.xml 2007-06-20 08:58:26 UTC (rev 2855)
@@ -307,8 +307,7 @@
<target name="all" description="Creates the Java archives and the natives for the current platform" depends="jars, compile_native"/>
<!-- Create ONLY the jar archives -->
- <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">
- <!-- <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">-->
+ <target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
<move todir="libs/">
<fileset dir="${lwjgl.temp}/jar">
<include name="*.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2007-08-27 15:42:30
|
Revision: 2887
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2887&view=rev
Author: elias_naur
Date: 2007-08-26 13:47:29 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
build.xml target 'applet' depends on 'all', not just 'jars'
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2007-08-25 14:47:24 UTC (rev 2886)
+++ trunk/LWJGL/build.xml 2007-08-26 20:47:29 UTC (rev 2887)
@@ -389,7 +389,7 @@
</java>
</target>
- <target name="applet" depends="jars">
+ <target name="applet" depends="all">
<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.
|
|
From: <eli...@us...> - 2007-08-28 07:43:22
|
Revision: 2892
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2892&view=rev
Author: elias_naur
Date: 2007-08-28 00:43:20 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Don't include d3d stuff in lwjgl.jar
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2007-08-28 07:38:20 UTC (rev 2891)
+++ trunk/LWJGL/build.xml 2007-08-28 07:43:20 UTC (rev 2892)
@@ -23,6 +23,7 @@
<!-- 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/fmod3/**" />
<exclude name="org/lwjgl/test/**" />
<exclude name="org/lwjgl/util/**" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2007-11-14 11:54:23
|
Revision: 2923
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2923&view=rev
Author: elias_naur
Date: 2007-11-14 03:54:06 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Improved native path handling in 'runtest' ant target
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2007-11-14 11:10:52 UTC (rev 2922)
+++ trunk/LWJGL/build.xml 2007-11-14 11:54:06 UTC (rev 2923)
@@ -384,9 +384,10 @@
<condition property="native_path" value="libs/macosx">
<os name="Mac OS X" />
</condition>
+ <property name="native_path_expanded" location="${native_path}"/>
<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
- <jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
- <jvmarg value="-Djava.library.path=${native_path}"/>
+ <sysproperty key="org.lwjgl.util.Debug" value="true"/>
+ <sysproperty key="java.library.path" value="${native_path_expanded}"/>
</java>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-07-02 21:45:05
|
Revision: 2405 Author: matzon Date: 2006-07-02 14:44:58 -0700 (Sun, 02 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2405&view=rev Log Message: ----------- beta2 tag updated applet tag to build all libs needed Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-02 21:24:50 UTC (rev 2404) +++ trunk/LWJGL/build.xml 2006-07-02 21:44:58 UTC (rev 2405) @@ -13,7 +13,7 @@ <property name="lwjgl.docs" value="./doc" /> <property name="lwjgl.temp" value="./temp" /> <property name="lwjgl.res" value="./res" /> - <property name="lwjgl.version" value="1.0beta" /> + <property name="lwjgl.version" value="1.0beta2" /> <property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java"/> <!-- ================================================================== --> @@ -340,7 +340,6 @@ <jar destfile="${lwjgl.temp}/jar/lwjgl_devil.jar" taskname="lwjgl_devil.jar"> <fileset refid="lwjgl_devil.fileset" /> </jar> - </target> <target name="applet" depends="jars"> @@ -349,7 +348,20 @@ <fileset refid="lwjgl_applet.fileset" /> </jar> <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/> + <copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/> + <copy file="${lwjgl.lib}/lwjgl_fmod3.jar" todir="applet"/> + <copy file="${lwjgl.lib}/lwjgl_devil.jar" todir="applet"/> + <zip destfile="applet/res.jar"> + <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/> + </zip> + <zip destfile="applet/lwjgl.jar" update="true"> + <zipfileset dir="${lwjgl.lib}" prefix="native" includes="win32/**"/> +<!-- <zipfileset dir="${lwjgl.lib}" prefix="native" includes="linux/**"/> --> +<!-- <zipfileset dir="${lwjgl.lib}" prefix="native" includes="macosx/**"/> --> + </zip> <signjar jar="applet/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="applet/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + <signjar jar="applet/lwjgl_devil.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> </target> <!-- Distributes files --> @@ -440,7 +452,7 @@ <class name="org.lwjgl.opengl.WindowsDirectInput8" /> <class name="org.lwjgl.opengl.WindowsDirectInputDevice8" /> <class name="org.lwjgl.opengl.WindowsDirectInput3" /> - <class name="org.lwjgl.opengl.WindowsDirectInputDevice3" /> + <class name="org.lwjgl.opengl.WindowsDirectInputDevice3" /> <class name="org.lwjgl.opengl.Win32PbufferPeerInfo" /> <class name="org.lwjgl.opengl.Win32Display" /> <class name="org.lwjgl.opengl.Win32Registry" /> @@ -693,9 +705,8 @@ <delete dir="${lwjgl.temp}"/> <!-- unzip common files --> - <unzip src="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> - <unzip src="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> - <unzip src="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> + <unzip src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> + <unzip src="${lwjgl.dist}/lwjgl_optional-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/> <!-- move relevant files to root --> <move todir="${lwjgl.temp}/jnlp" flatten="true"> @@ -705,27 +716,33 @@ </move> <!-- create native jars --> - <jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-win32-${lwjgl.version}/native/"/> - <jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-linux-${lwjgl.version}/native/"/> - <jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-macosx-${lwjgl.version}/native/"/> + <jar destfile="${lwjgl.temp}/jnlp/native_win32.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/win32"/> + <jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/linux"/> + <jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/lwjgl-${lwjgl.version}/native/macosx"/> <!-- create media jar --> <jar destfile="${lwjgl.temp}/jnlp/media.jar" basedir="${lwjgl.res}"/> <!-- sign 'em --> <input message="Please enter store password:" addproperty="store.pwd" /> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/media.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" alias="matzon" storepass="${store.pwd}"/> - <signjar jar="${lwjgl.temp}/jnlp/jinput.jar" alias="matzon" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/media.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + <signjar jar="${lwjgl.temp}/jnlp/jinput.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> </target> + <!-- --> + <target name="signapplet"> + <input message="Please enter store password:" addproperty="store.pwd" /> + <signjar jar="applet_loader.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/> + </target> + <target name="changelog"> <cvschangelog destfile="changelog.xml"/> <style in="changelog.xml" out="changelog.html" style="${ant.home}/etc/changelog.xsl"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-07-02 22:01:34
|
Revision: 2415 Author: matzon Date: 2006-07-02 15:01:27 -0700 (Sun, 02 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2415&view=rev Log Message: ----------- add linux and mac natives to lwjgl applet jar Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-02 21:59:10 UTC (rev 2414) +++ trunk/LWJGL/build.xml 2006-07-02 22:01:27 UTC (rev 2415) @@ -356,8 +356,8 @@ </zip> <zip destfile="applet/lwjgl.jar" update="true"> <zipfileset dir="${lwjgl.lib}" prefix="native" includes="win32/**"/> -<!-- <zipfileset dir="${lwjgl.lib}" prefix="native" includes="linux/**"/> --> -<!-- <zipfileset dir="${lwjgl.lib}" prefix="native" includes="macosx/**"/> --> + <zipfileset dir="${lwjgl.lib}" prefix="native" includes="linux/**"/> + <zipfileset dir="${lwjgl.lib}" prefix="native" includes="macosx/**"/> </zip> <signjar jar="applet/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> <signjar jar="applet/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-07-03 11:44:41
|
Revision: 2423 Author: elias_naur Date: 2006-07-03 04:44:34 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2423&view=rev Log Message: ----------- Added seal to security sensitive jars Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-03 11:37:38 UTC (rev 2422) +++ trunk/LWJGL/build.xml 2006-07-03 11:44:34 UTC (rev 2423) @@ -315,12 +315,18 @@ <!-- Create lwjgl.jar --> <jar destfile="${lwjgl.temp}/jar/lwjgl.jar" taskname="lwjgl.jar"> <fileset refid="lwjgl.fileset" /> + <manifest> + <attribute name="Sealed" value="true"/> + </manifest> </jar> <!-- Create lwjgl_util_applet.jar --> <jar destfile="${lwjgl.temp}/jar/lwjgl_util_applet.jar" taskname="lwjgl_util_applet.jar"> <fileset refid="lwjgl_util_applet.fileset" /> <fileset refid="lwjgl_util_applet_natives.fileset"/> + <manifest> + <attribute name="Sealed" value="true"/> + </manifest> </jar> <!-- Create lwjgl_test.jar --> @@ -337,11 +343,17 @@ <!-- Create lwjgl_fmod.jar --> <jar destfile="${lwjgl.temp}/jar/lwjgl_fmod3.jar" taskname="lwjgl_fmod3.jar"> <fileset refid="lwjgl_fmod3.fileset" /> + <manifest> + <attribute name="Sealed" value="true"/> + </manifest> </jar> <!-- Create lwjgl_devil.jar --> <jar destfile="${lwjgl.temp}/jar/lwjgl_devil.jar" taskname="lwjgl_devil.jar"> <fileset refid="lwjgl_devil.fileset" /> + <manifest> + <attribute name="Sealed" value="false"/> + </manifest> </jar> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-07-03 20:10:15
|
Revision: 2431 Author: elias_naur Date: 2006-07-03 13:10:10 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2431&view=rev Log Message: ----------- Don't delete the generated directories themselves on ant clean-generated, only the source files Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-03 19:22:20 UTC (rev 2430) +++ trunk/LWJGL/build.xml 2006-07-03 20:10:10 UTC (rev 2431) @@ -245,8 +245,10 @@ </target> <target name="clean-generated" description="Deletes the generated java and native source"> - <delete dir="${lwjgl.src}/generated" quiet="true" failonerror="false" taskname="cleaning java source"/> - <delete dir="${lwjgl.src.native}/generated" quiet="true" failonerror="false" taskname="cleaning native source"/> + <delete quiet="true" failonerror="false"> + <fileset dir="${lwjgl.src}/generated" includes="**"/> + <fileset dir="${lwjgl.src.native}/generated" includes="**"/> + </delete> </target> <!-- Cleans up any files created during the execution of this script --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-07-03 23:26:59
|
Revision: 2437 Author: matzon Date: 2006-07-03 16:26:54 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2437&view=rev Log Message: ----------- reworked installer to expect a jar with the platform natives inside a jar Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-03 23:23:49 UTC (rev 2436) +++ trunk/LWJGL/build.xml 2006-07-03 23:26:54 UTC (rev 2437) @@ -36,12 +36,6 @@ <include name="org/lwjgl/util/applet/**"/> </fileset> - <fileset id="lwjgl_util_applet_natives.fileset" dir="${lwjgl.lib}"> - <include name="win32/**"/> - <include name="linux/**"/> - <include name="macosx/**"/> - </fileset> - <!-- Files to include in the lwjgl_test.jar file --> <fileset id="lwjgl_test.fileset" dir="${lwjgl.bin}"> <exclude name="**.*" /> @@ -109,8 +103,8 @@ <patternset id="lwjgl-win32.fileset"> <include name="lwjgl.dll" /> <include name="OpenAL32.dll" /> - <include name="jinput-dx8.dll" /> - <include name="jinput-raw.dll" /> + <include name="jinput-dx8.dll" /> + <include name="jinput-raw.dll" /> </patternset> <!-- Files to include in win32 optional package --> @@ -325,7 +319,6 @@ <!-- Create lwjgl_util_applet.jar --> <jar destfile="${lwjgl.temp}/jar/lwjgl_util_applet.jar" taskname="lwjgl_util_applet.jar"> <fileset refid="lwjgl_util_applet.fileset" /> - <fileset refid="lwjgl_util_applet_natives.fileset"/> <manifest> <attribute name="Sealed" value="true"/> </manifest> @@ -334,7 +327,7 @@ <!-- Create lwjgl_test.jar --> <jar destfile="${lwjgl.temp}/jar/lwjgl_test.jar" taskname="lwjgl_test.jar"> <fileset refid="lwjgl_test.fileset" /> - <fileset refid="lwjgl_test_extra.fileset" /> + <fileset refid="lwjgl_test_extra.fileset" /> </jar> <!-- Create lwjgl_util.jar --> @@ -364,6 +357,47 @@ <jar destfile="applet/lwjgl_applet.jar" taskname="lwjgl_applet.jar"> <fileset refid="lwjgl_applet.fileset" /> </jar> + + <!-- create each of the native jars --> + <jar destfile="applet/win32_natives.jar" taskname="win32_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"/> + + <jar destfile="applet/linux_natives.jar" taskname="linux_natives.jar"> + <fileset dir="${lwjgl.lib}/linux"> + <patternset refid="lwjgl-linux.fileset"/> + <patternset refid="lwjgl-linux_optional.fileset"/> + <include name="libfmod.so"/> + </fileset> + </jar> + <signjar jar="applet/linux_natives.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + + <jar destfile="applet/macosx_natives.jar" taskname="macosx_natives.jar"> + <fileset dir="${lwjgl.lib}/macosx"> + <patternset refid="lwjgl-macosx.fileset"/> + <patternset refid="lwjgl-macosx_optional.fileset"/> + <include name="libfmod.dylib"/> + </fileset> + </jar> + <signjar jar="applet/macosx_natives.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/> + + <!-- add it to a natives jar --> + <jar destfile="applet/natives.jar" taskname="natives.jar"> + <fileset dir="applet"> + <include name="win32_natives.jar"/> + <include name="linux_natives.jar"/> + <include name="macosx_natives.jar"/> + </fileset> + </jar> + <delete file="applet/win32_natives.jar"/> + <delete file="applet/linux_natives.jar"/> + <delete file="applet/macosx_natives.jar"/> + <copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/> <copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/> <copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-07-07 11:48:04
|
Revision: 2452 Author: elias_naur Date: 2006-07-07 04:47:56 -0700 (Fri, 07 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2452&view=rev Log Message: ----------- Commented out cvsbuild target - using it will propbably cause confusion Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-07 11:00:32 UTC (rev 2451) +++ trunk/LWJGL/build.xml 2006-07-07 11:47:56 UTC (rev 2452) @@ -747,19 +747,19 @@ </target> <!-- Creates a build of LWJGL directly from CVS --> - <target name="cvsbuild" description="Builds lwjgl 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/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" /> + <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/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. |
|
From: <ma...@us...> - 2006-07-11 21:43:49
|
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. |
|
From: <eli...@us...> - 2006-07-11 23:03:20
|
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=<main-class> 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. |
|
From: <eli...@us...> - 2006-07-14 11:54:59
|
Revision: 2511 Author: elias_naur Date: 2006-07-14 04:54:52 -0700 (Fri, 14 Jul 2006) ViewCVS: http://svn.sourceforge.net/java-game-lib/?rev=2511&view=rev Log Message: ----------- Added a commented out generatechecks option to the opengl stubs generator. It can can be activated to add Utils.checkGLError everywhere Modified Paths: -------------- trunk/LWJGL/build.xml Modified: trunk/LWJGL/build.xml =================================================================== --- trunk/LWJGL/build.xml 2006-07-14 10:38:31 UTC (rev 2510) +++ trunk/LWJGL/build.xml 2006-07-14 11:54:52 UTC (rev 2511) @@ -605,6 +605,7 @@ <arg path="${lwjgl.src}/generated"/> <arg value="-d"/> <arg path="${lwjgl.src.native}/generated"/> + <!--<arg value="-Ageneratechecks"/>--> <arg value="-Acontextspecific"/> <arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/> <fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eli...@us...> - 2006-09-20 11:50:04
|
Revision: 2576
http://svn.sourceforge.net/java-game-lib/?rev=2576&view=rev
Author: elias_naur
Date: 2006-09-20 04:49:14 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Added 'res' to runtest ant target classpath
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2006-09-19 14:17:13 UTC (rev 2575)
+++ trunk/LWJGL/build.xml 2006-09-20 11:49:14 UTC (rev 2576)
@@ -359,7 +359,7 @@
<condition property="native_path" value="libs/macosx">
<os name="Mac OS X" />
</condition>
- <java classname="${test.mainclass}" classpath="${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
+ <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
<jvmarg value="-Djava.library.path=${native_path}"/>
</java>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-10-31 09:52:44
|
Revision: 2620
http://svn.sourceforge.net/java-game-lib/?rev=2620&view=rev
Author: elias_naur
Date: 2006-10-31 01:52:38 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
Don't include binary native files from bin/ in lwjgl.jar (oops\!)
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2006-10-30 15:49:02 UTC (rev 2619)
+++ trunk/LWJGL/build.xml 2006-10-31 09:52:38 UTC (rev 2620)
@@ -22,8 +22,7 @@
<!-- Files to include in the lwjgl.jar file -->
<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
- <include name="**" />
- <exclude name="**.*" />
+ <include name="org/**/*" />
<exclude name="org/lwjgl/fmod3/**" />
<exclude name="org/lwjgl/test/**" />
<exclude name="org/lwjgl/util/**" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-11-09 21:42:12
|
Revision: 2635
http://svn.sourceforge.net/java-game-lib/?rev=2635&view=rev
Author: matzon
Date: 2006-11-09 13:41:58 -0800 (Thu, 09 Nov 2006)
Log Message:
-----------
fixed path issue
added certificate signing
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2006-11-09 20:57:58 UTC (rev 2634)
+++ trunk/LWJGL/build.xml 2006-11-09 21:41:58 UTC (rev 2635)
@@ -370,8 +370,27 @@
<jvmarg value="-Djava.library.path=${native_path}"/>
</java>
</target>
+
+ <target name="applet" depends="jars">
+ <antcall target="-applet">
+ <param name="keystore" value="applet/lwjglkeystore"/>
+ <param name="alias" value="lwjgl"/>
+ <param name="password" value="123456"/>
+ </antcall>
+ </target>
+
+ <target name="applet-release" depends="jars">
+ <input message="Please type the password for the keystore" addproperty="sign.pwd"/>
- <target name="applet" depends="jars">
+ <antcall target="-applet">
+ <param name="keystore" value="signing/matzon_java_code_signing.keystore"/>
+ <param name="alias" value="oddlabs_java_code_signing"/>
+ <param name="password" value="${sign.pwd}"/>
+ </antcall>
+ </target>
+
+ <target name="-applet">
+
<!-- Create lwjgl_applet.jar -->
<jar destfile="applet/lwjgl_applet.jar" taskname="lwjgl_applet.jar">
<fileset refid="lwjgl_applet.fileset" />
@@ -385,7 +404,7 @@
<include name="fmod.dll"/>
</fileset>
</jar>
- <signjar jar="applet/windows_natives.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ <signjar jar="applet/windows_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<jar destfile="applet/linux_natives.jar" taskname="linux_natives.jar">
<fileset dir="${lwjgl.lib}/linux">
@@ -394,7 +413,7 @@
<include name="libfmod.so"/>
</fileset>
</jar>
- <signjar jar="applet/linux_natives.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ <signjar jar="applet/linux_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<jar destfile="applet/macosx_natives.jar" taskname="macosx_natives.jar">
<fileset dir="${lwjgl.lib}/macosx">
@@ -403,7 +422,7 @@
<include name="libfmod.dylib"/>
</fileset>
</jar>
- <signjar jar="applet/macosx_natives.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ <signjar jar="applet/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
<!-- add it to a natives jar -->
<jar destfile="applet/natives.jar" taskname="natives.jar">
@@ -426,11 +445,11 @@
<zip destfile="applet/res.jar">
<zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
</zip>
- <signjar jar="applet/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="applet/jinput.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="applet/lwjgl_util_applet.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="applet/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="applet/lwjgl_devil.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ <signjar jar="applet/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/jinput.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/lwjgl_fmod3.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="applet/lwjgl_devil.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
</target>
<!-- Distributes files -->
@@ -742,8 +761,28 @@
<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-fmod3.jnilib" />
</target>
+
+ <target name="webstart_demo" depends="jars">
+ <antcall target="-webstart_demo">
+ <param name="keystore" value="applet/lwjglkeystore"/>
+ <param name="alias" value="lwjgl"/>
+ <param name="password" value="123456"/>
+ </antcall>
+ </target>
+
+ <target name="webstart_demo-release" depends="jars">
+ <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="password" value="${sign.pwd}"/>
+ </antcall>
+ </target>
+
<!-- -->
- <target name="sign" description="Using released files, creates the necessary files used for jnlp demos">
+ <target name="-webstart_demo" description="Using released files, creates the necessary files used for jnlp demos">
+
<!-- delete existing temp -->
<delete dir="${lwjgl.temp}"/>
@@ -761,6 +800,10 @@
</fileset>
</move>
+ <!-- copy fmod dependent files -->
+ <copy file="${lwjgl.lib}/win32/fmod.dll" tofile="${lwjgl.temp}/jnlp/temp/native/win32/fmod.dll"/>
+ <copy file="${lwjgl.lib}/linux/libfmod.so" tofile="${lwjgl.temp}/jnlp/temp/native/linux/libfmod.so"/>
+
<!-- move relevant files to root -->
<move todir="${lwjgl.temp}/jnlp/" flatten="true">
<fileset dir="${lwjgl.temp}/jnlp/temp">
@@ -777,24 +820,18 @@
<jar destfile="${lwjgl.temp}/jnlp/media.jar" basedir="${lwjgl.res}"/>
<!-- sign 'em -->
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/media.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
- <signjar jar="${lwjgl.temp}/jnlp/jinput.jar" alias="lwjgl" keystore="applet/lwjglkeystore" storepass="123456"/>
+ <signjar jar="${lwjgl.temp}/jnlp/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/lwjgl_devil.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/lwjgl_fmod3.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/lwjgl_test.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/lwjgl_util.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/media.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/native_linux.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/jnlp/jinput.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
</target>
- <!-- -->
- <target name="signapplet">
- <input message="Please enter store password:" addproperty="store.pwd" />
- <signjar jar="applet_loader.jar" storetype="pkcs12" keystore="matzon.p12" alias="Brian Matzon's TDC ID" storepass="${store.pwd}"/>
- </target>
-
<target name="changelog">
<cvschangelog destfile="changelog.xml"/>
<style in="changelog.xml" out="changelog.html" style="${ant.home}/etc/changelog.xsl">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-14 09:32:11
|
Revision: 2644
http://svn.sourceforge.net/java-game-lib/?rev=2644&view=rev
Author: elias_naur
Date: 2006-11-14 01:32:04 -0800 (Tue, 14 Nov 2006)
Log Message:
-----------
buid.xml: Remove env.AL requirement from optionals build
Modified Paths:
--------------
trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2006-11-14 09:20:24 UTC (rev 2643)
+++ trunk/LWJGL/build.xml 2006-11-14 09:32:04 UTC (rev 2644)
@@ -748,7 +748,6 @@
<!-- check for required properties -->
<property environment="env"/>
- <fail message="Missing AL path environment property" unless="env.AL"/>
<fail message="Missing FMOD path environment property" unless="env.FMOD"/>
<exec executable="make" dir="${lwjgl.src.native}/common/devil">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X