Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3440] trunk/LWJGL
|
From: <ma...@us...> - 2010-10-12 19:21:42
|
Revision: 3440
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3440&view=rev
Author: matzon
Date: 2010-10-12 19:21:35 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
updates to webstart to streamline process
Modified Paths:
--------------
trunk/LWJGL/platform_build/build-definitions.xml
trunk/LWJGL/platform_build/build-webstart.xml
Added Paths:
-----------
trunk/LWJGL/www/webstart/
trunk/LWJGL/www/webstart/demo.php
trunk/LWJGL/www/webstart/extension.jnlp
trunk/LWJGL/www/webstart/logo.png
trunk/LWJGL/www/webstart/source.php
Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml 2010-10-12 17:44:19 UTC (rev 3439)
+++ trunk/LWJGL/platform_build/build-definitions.xml 2010-10-12 19:21:35 UTC (rev 3440)
@@ -13,6 +13,7 @@
<property name="lwjgl.temp" location="temp" />
<property name="lwjgl.res" location="res" />
<property name="lwjgl.version" value="2.6" />
+ <property name="lwjgl.web" location="www" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>
<property name="opencl-template-pattern-extensions" value="org/lwjgl/opencl/KHR*.java,org/lwjgl/opencl/EXT*.java,org/lwjgl/opencl/APPLE*.java,org/lwjgl/opencl/AMD*.java,org/lwjgl/opencl/NV*.java"/>
Modified: trunk/LWJGL/platform_build/build-webstart.xml
===================================================================
--- trunk/LWJGL/platform_build/build-webstart.xml 2010-10-12 17:44:19 UTC (rev 3439)
+++ trunk/LWJGL/platform_build/build-webstart.xml 2010-10-12 19:21:35 UTC (rev 3440)
@@ -17,32 +17,39 @@
</antcall>
</target>
- <!-- -->
+ <!-- Create webstart demo and extension from release files -->
<target name="-webstart_demo" description="Using released files, creates the necessary files used for jnlp demos">
<!-- delete existing temp -->
<delete dir="${lwjgl.temp}"/>
- <!-- unzip common files -->
- <unzip src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" dest="${lwjgl.temp}/jnlp/temp" overwrite="true"/>
+ <!-- unzip release to temp dir -->
+ <unzip src="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" dest="${lwjgl.temp}/webstart/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>
- </move>
+ <!-- DEMO SECTION -->
+ <move file="${lwjgl.temp}/webstart/temp/lwjgl-${lwjgl.version}/jar/lwjgl_test.jar" tofile="${lwjgl.temp}/webstart/lwjgl_test.jar"/>
+ <jar destfile="${lwjgl.temp}/webstart/lwjgl_test.jar" update="true">
+ <manifest>
+ <attribute name="Sealed" value="true"/>
+ </manifest>
+ </jar>
+ <jar destfile="${lwjgl.temp}/webstart/media.jar" basedir="${lwjgl.res}">
+ <manifest>
+ <attribute name="Sealed" value="true"/>
+ </manifest>
+ </jar>
- <!-- move relevant files to root -->
- <move todir="${lwjgl.temp}/jnlp/" flatten="true">
- <fileset dir="${lwjgl.temp}/jnlp/temp">
+ <!-- EXTENSION SECTION -->
+ <move todir="${lwjgl.temp}/webstart/${lwjgl.version}/" flatten="true">
+ <fileset dir="${lwjgl.temp}/webstart/temp">
<include name="**/jinput.jar"/>
<include name="**/lwjgl*.jar"/>
+ <exclude name="**/lwjgl_util_applet.jar"/>
+ <exclude name="**/lwjgl-debug.jar"/>
</fileset>
</move>
- <!-- update Trusted-Library -->
- <jar destfile="${lwjgl.temp}/jnlp/lwjgl.jar" update="true">
+ <jar destfile="${lwjgl.temp}/webstart/${lwjgl.version}/lwjgl.jar" update="true">
<manifest>
<attribute name="Specification-Title" value="LWJGL ${lwjgl.version}"/>
<attribute name="Specification-Version" value="${lwjgl.version}"/>
@@ -57,7 +64,7 @@
</manifest>
</jar>
- <jar destfile="${lwjgl.temp}/jnlp/jinput.jar" update="true">
+ <jar destfile="${lwjgl.temp}/webstart/${lwjgl.version}/jinput.jar" update="true">
<manifest>
<attribute name="Specification-Title" value="LWJGL ${lwjgl.version}"/>
<attribute name="Specification-Version" value="${lwjgl.version}"/>
@@ -72,7 +79,7 @@
</manifest>
</jar>
- <jar destfile="${lwjgl.temp}/jnlp/lwjgl_util.jar" update="true">
+ <jar destfile="${lwjgl.temp}/webstart/${lwjgl.version}/lwjgl_util.jar" update="true">
<manifest>
<attribute name="Specification-Title" value="LWJGL ${lwjgl.version}"/>
<attribute name="Specification-Version" value="${lwjgl.version}"/>
@@ -87,14 +94,8 @@
</manifest>
</jar>
- <jar destfile="${lwjgl.temp}/jnlp/lwjgl_test.jar" update="true">
- <manifest>
- <attribute name="Sealed" value="true"/>
- </manifest>
- </jar>
-
<!-- create native jars -->
- <jar destfile="${lwjgl.temp}/jnlp/native_windows.jar" basedir="${lwjgl.temp}/jnlp/temp/native/windows">
+ <jar destfile="${lwjgl.temp}/webstart/${lwjgl.version}/native_windows.jar" basedir="${lwjgl.temp}/webstart/temp/lwjgl-${lwjgl.version}/native/windows">
<manifest>
<attribute name="Specification-Title" value="LWJGL ${lwjgl.version}"/>
<attribute name="Specification-Version" value="${lwjgl.version}"/>
@@ -109,7 +110,7 @@
</manifest>
</jar>
- <jar destfile="${lwjgl.temp}/jnlp/native_linux.jar" basedir="${lwjgl.temp}/jnlp/temp/native/linux">
+ <jar destfile="${lwjgl.temp}/webstart/${lwjgl.version}/native_linux.jar" basedir="${lwjgl.temp}/webstart/temp/lwjgl-${lwjgl.version}/native/linux">
<manifest>
<attribute name="Specification-Title" value="LWJGL ${lwjgl.version}"/>
<attribute name="Specification-Version" value="${lwjgl.version}"/>
@@ -124,7 +125,7 @@
</manifest>
</jar>
- <jar destfile="${lwjgl.temp}/jnlp/native_macosx.jar" basedir="${lwjgl.temp}/jnlp/temp/native/macosx">
+ <jar destfile="${lwjgl.temp}/webstart/${lwjgl.version}/native_macosx.jar" basedir="${lwjgl.temp}/webstart/temp/lwjgl-${lwjgl.version}/native/macosx">
<manifest>
<attribute name="Specification-Title" value="LWJGL ${lwjgl.version}"/>
<attribute name="Specification-Version" value="${lwjgl.version}"/>
@@ -139,7 +140,7 @@
</manifest>
</jar>
- <jar destfile="${lwjgl.temp}/jnlp/native_solaris.jar" basedir="${lwjgl.temp}/jnlp/temp/native/solaris">
+ <jar destfile="${lwjgl.temp}/webstart/${lwjgl.version}/native_solaris.jar" basedir="${lwjgl.temp}/webstart/temp/lwjgl-${lwjgl.version}/native/solaris">
<manifest>
<attribute name="Specification-Title" value="LWJGL ${lwjgl.version}"/>
<attribute name="Specification-Version" value="${lwjgl.version}"/>
@@ -153,21 +154,28 @@
<attribute name="Trusted-Library" value="true"/>
</manifest>
</jar>
-
- <!-- create media jar -->
- <jar destfile="${lwjgl.temp}/jnlp/media.jar" basedir="${lwjgl.res}">
- <manifest>
- <attribute name="Sealed" value="true"/>
- </manifest>
- </jar>
<!-- sign 'em -->
- <signjar jar="${lwjgl.temp}/jnlp/lwjgl.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/jinput.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
- <signjar jar="${lwjgl.temp}/jnlp/native_solaris.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_windows.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/webstart/${lwjgl.version}/lwjgl.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/webstart/${lwjgl.version}/lwjgl_util.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/webstart/${lwjgl.version}/jinput.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/webstart/${lwjgl.version}/native_solaris.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/webstart/${lwjgl.version}/native_linux.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/webstart/${lwjgl.version}/native_macosx.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+ <signjar jar="${lwjgl.temp}/webstart/${lwjgl.version}/native_windows.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+
+ <!-- copy over extension jnlp file -->
+ <copy todir="${lwjgl.temp}/webstart/${lwjgl.version}">
+ <fileset dir="${lwjgl.web}/webstart">
+ <include name="extension.jnlp"/>
+ </fileset>
+ <filterset>
+ <filter token="LWJGL_VERSION" value="${lwjgl.version}"/>
+ </filterset>
+ </copy>
+
+ <!-- nuke extracted dir -->
+ <delete dir="${lwjgl.temp}/webstart/temp"/>
+
</target>
</project>
\ No newline at end of file
Added: trunk/LWJGL/www/webstart/demo.php
===================================================================
--- trunk/LWJGL/www/webstart/demo.php (rev 0)
+++ trunk/LWJGL/www/webstart/demo.php 2010-10-12 19:21:35 UTC (rev 3440)
@@ -0,0 +1,35 @@
+<?
+header("Content-type: application/x-java-jnlp-file");
+?>
+
+<!-- JNLP File for LWJGL Demos -->
+<jnlp
+ spec="1.0+"
+ codebase="http://lwjgl.org/webstart/"
+ href="demo.php/<?php echo substr($_SERVER["PATH_INFO"], 1, strlen($_SERVER["PATH_INFO"])-1); ?>">
+ <information>
+ <title>LWJGL Demo [<?php echo substr($_SERVER["PATH_INFO"], 1, strlen($_SERVER["PATH_INFO"])-1); ?>]</title>
+ <vendor>LWJGL</vendor>
+ <homepage href="http://lwjgl.org/"/>
+ <description>Demonstration of LWJGL</description>
+ <description kind="short">Technology Preview</description>
+ <icon kind="splash" href="logo.png" />
+ <offline-allowed/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="lwjgl_test.jar" main="true"/>
+ <jar href="media.jar"/>
+ <extension name="lwjgl" href="http://lwjgl.org/webstart/2.5/extension.jnlp" />
+ </resources>
+ <application-desc main-class="org.lwjgl.<?php echo substr($_SERVER["PATH_INFO"], 1, strlen($_SERVER["PATH_INFO"])-1); ?>">
+ <?php
+ if(isset($HTTP_GET_VARS['arguments'])) {
+ $arguments = $HTTP_GET_VARS['arguments'];
+ foreach ($arguments as $argument) {
+ echo "<argument>" . $argument . "</argument>\n";
+ }
+ }
+ ?>
+ </application-desc>
+</jnlp>
Added: trunk/LWJGL/www/webstart/extension.jnlp
===================================================================
--- trunk/LWJGL/www/webstart/extension.jnlp (rev 0)
+++ trunk/LWJGL/www/webstart/extension.jnlp 2010-10-12 19:21:35 UTC (rev 3440)
@@ -0,0 +1,36 @@
+<jnlp codebase="http://lwjgl.org/webstart/@LWJGL_VERSION@" href="extension.jnlp">
+ <information>
+ <title>LWJGL</title>
+ <vendor>lwjgl.org</vendor>
+ <homepage href="http://lwjgl.org/"/>
+ <description>LWJGL webstart extension</description>
+ <description kind="short">LWJGL webstart extension</description>
+ <offline-allowed/>
+ </information>
+ <update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
+ <resources>
+ <jar href="lwjgl.jar"/>
+ <jar href="lwjgl_util.jar"/>
+ <jar href="jinput.jar"/>
+ </resources>
+ <resources os="Windows">
+ <j2se version="1.4+"/>
+ <nativelib href="native_windows.jar"/>
+ </resources>
+ <resources os="Linux">
+ <j2se version="1.4+"/>
+ <nativelib href="native_linux.jar"/>
+ </resources>
+ <resources os="Mac OS X">
+ <j2se version="1.4+"/>
+ <nativelib href="native_macosx.jar"/>
+ </resources>
+ <resources os="SunOS" arch="x86">
+ <j2se version="1.4+"/>
+ <nativelib href="native_solaris.jar"/>
+ </resources>
+ <component-desc />
+</jnlp>
Added: trunk/LWJGL/www/webstart/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/LWJGL/www/webstart/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/LWJGL/www/webstart/source.php
===================================================================
--- trunk/LWJGL/www/webstart/source.php (rev 0)
+++ trunk/LWJGL/www/webstart/source.php 2010-10-12 19:21:35 UTC (rev 3440)
@@ -0,0 +1,4 @@
+<?php
+ header("Location: http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/trunk/LWJGL/src/java/org/lwjgl/" . $_GET['path'] . "?rev=HEAD&content-type=text/vnd.viewcvs-markup");
+ exit;
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
