From 267ca6ea19aaaaee039b6e16a3005d2a103c25fd Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Mon, 15 Sep 2008 18:28:47 +0000
Subject: [PATCH] solaris package support rc2 version string

---
 build.xml                            |  6 ++++++
 platform_build/build-applet.xml      | 12 ++++++++++++
 platform_build/build-definitions.xml |  8 +++++++-
 platform_build/build-webstart.xml    |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 2cd13832..400a3a41 100644
--- a/build.xml
+++ b/build.xml
@@ -28,6 +28,7 @@
 		<mkdir dir="${lwjgl.temp}/native/win32" 	taskname="initialiazing temp/win32 folder" />
 		<mkdir dir="${lwjgl.temp}/native/linux" 	taskname="initialiazing temp/linux folder" />
 		<mkdir dir="${lwjgl.temp}/native/macosx" 	taskname="initialiazing temp/macosx folder" />
+		<mkdir dir="${lwjgl.temp}/native/solaris" taskname="initialiazing temp/solaris folder" />
 	</target>
 	
 	<!-- Cleans up any files created during the execution of this script -->
@@ -146,6 +147,11 @@
 				<patternset refid="lwjgl-macosx.fileset" />
 			</fileset>
 		</copy>
+		<copy todir="${lwjgl.temp}/native/solaris">
+			<fileset dir="${lwjgl.lib}/solaris">
+				<patternset refid="lwjgl-solaris.fileset" />
+			</fileset>
+		</copy>		
 		
 		<!-- create base package -->
 		<zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip">
diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml
index ace31add..4fbda190 100644
--- a/platform_build/build-applet.xml
+++ b/platform_build/build-applet.xml
@@ -49,6 +49,13 @@
 			</fileset>
 		</jar>
 		<signjar jar="applet/macosx_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		
+		<jar destfile="applet/solaris_natives.jar" taskname="solaris_natives.jar">
+			<fileset dir="${lwjgl.lib}/solaris">
+				<patternset refid="lwjgl-solaris.fileset"/>
+			</fileset>
+		</jar>
+		<signjar jar="applet/solaris_natives.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>		
 			
   	<jar destfile="${lwjgl.lib}/lwjgl_util_applet.jar" update="true">
   		<fileset dir="${lwjgl.res}" includes="applet*"/>
@@ -92,6 +99,11 @@
 			<param name="input" value="applet/linux_natives.jar"/>
 			<param name="output" value="applet/linux_natives.jar.lzma"/>
 		</antcall>
+		<antcall target="compress-resource">
+			<param name="input" value="applet/solaris_natives.jar"/>
+			<param name="output" value="applet/solaris_natives.jar.lzma"/>
+		</antcall>		
+		
 		<antcall target="compress-resource">
 			<param name="input" value="applet/res.jar"/>
 			<param name="output" value="applet/res.jar.lzma"/>
diff --git a/platform_build/build-definitions.xml b/platform_build/build-definitions.xml
index b15dfe53..f7c3886c 100644
--- a/platform_build/build-definitions.xml
+++ b/platform_build/build-definitions.xml
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 					location="doc" />
 	<property name="lwjgl.temp" 					location="temp" />
 	<property name="lwjgl.res" 						location="res" />
-	<property name="lwjgl.version" 				value="2.0rc1" />
+	<property name="lwjgl.version" 				value="2.0rc2" />
 
 	<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,org/lwjgl/opengl/SGIS*.java"/>
 	<!-- ================================================================== -->
@@ -109,6 +109,12 @@
 	    <include name="libjinput-osx-legacy.jnilib" />
 	</patternset>
 	
+	<!-- Files to include in solaris package -->
+	<patternset id="lwjgl-solaris.fileset">
+		<include name="liblwjgl*.so" />
+		<include name="libopenal.so" />    
+	</patternset>
+	
 	<!-- Files to include in source distribution -->
 	<fileset id="lwjgl.source.fileset" dir=".">
         <include name="build.xml" />
diff --git a/platform_build/build-webstart.xml b/platform_build/build-webstart.xml
index 9dc80ec9..15167585 100644
--- a/platform_build/build-webstart.xml
+++ b/platform_build/build-webstart.xml
@@ -44,6 +44,7 @@
 		<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"/>
+		<jar destfile="${lwjgl.temp}/jnlp/native_solaris.jar" basedir="${lwjgl.temp}/jnlp/temp/native/solaris"/>
 		
 		<!-- create media jar -->
 		<jar destfile="${lwjgl.temp}/jnlp/media.jar" basedir="${lwjgl.res}"/>	
@@ -51,6 +52,7 @@
 		<!-- 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/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_win32.jar" 	alias="${alias}" keystore="${keystore}" storepass="${password}"/>