[Jake2-commits] jake2 build.xml,1.29,1.30

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30129

Modified Files:
	build.xml 
Log Message:
joal via webstart from sun

 * patch removed
 * joal-native jar build removed

Index: build.xml
===================================================================
RCS file: /cvsroot/jake2/jake2/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** build.xml	24 Oct 2006 22:15:52 -0000	1.29
--- build.xml	25 Oct 2006 21:04:38 -0000	1.30
***************
*** 23,27 ****
  	<path id="build.class.path">
  		<pathelement location="lib/jogl/jogl.jar"/>
! 		<pathelement location="lib/joal/linux/joal.jar"/>
  		<pathelement location="lib/lwjgl/lwjgl.jar"/>
  		<pathelement location="lib/lwjgl/lwjgl_util.jar"/>
--- 23,27 ----
  	<path id="build.class.path">
  		<pathelement location="lib/jogl/jogl.jar"/>
! 		<pathelement location="lib/joal/joal.jar"/>
  		<pathelement location="lib/lwjgl/lwjgl.jar"/>
  		<pathelement location="lib/lwjgl/lwjgl_util.jar"/>
***************
*** 72,75 ****
--- 72,78 ----
  				<include name="*.jar"/>
  			</fileset>
+ 			<fileset dir="lib/joal">
+ 				<include name="*.jar"/>
+ 			</fileset>
  			<fileset dir="lib/lwjgl">
  				<include name="*.jar"/>
***************
*** 152,156 ****
  			<injar name="jake2.jar"/>
  			<libraryjar name="lib/jogl/jogl.jar"/>
! 			<libraryjar name="lib/joal/linux/joal.jar"/>
  			<libraryjar name="${classes}"/>
  			<keep access="public" name="jake2.Jake2">
--- 155,160 ----
  			<injar name="jake2.jar"/>
  			<libraryjar name="lib/jogl/jogl.jar"/>
! 			<libraryjar name="lib/joal/joal.jar"/>
! 			<libraryjar name="lib/joal/gluegen-rt.jar"/>
  			<libraryjar name="${classes}"/>
  			<keep access="public" name="jake2.Jake2">
***************
*** 195,199 ****
  			<tarfileset dir="." prefix="Jake2">
  				<include name="src/jake2/**"/>
- 				<include name="patch/**"/>
  				<include name="resources/**"/>
  				<include name="lib/**"/>
--- 199,202 ----
***************
*** 211,215 ****
  			<zipfileset dir="." prefix="Jake2">
  				<include name="src/jake2/**"/>
- 				<include name="patch/**"/>
  				<include name="resources/**"/>				
  				<include name="scripts/*.*"/>
--- 214,217 ----
***************
*** 238,242 ****
  	
  	<!-- webstart -->
! 	<target name="webstart" depends="dist,patch">
  		<mkdir dir="webstart/lib"/>
  		<copy todir="webstart/lib">
--- 240,244 ----
  	
  	<!-- webstart -->
! 	<target name="webstart" depends="dist">
  		<mkdir dir="webstart/lib"/>
  		<copy todir="webstart/lib">
***************
*** 244,273 ****
  				<include name="**/*.jar"/>
  				<exclude name="jogl.jar"/>
! 			</fileset>
! 			<fileset dir=".">
! 				<include name="patch.jar"/>
  			</fileset>
  		</copy>
  
! 		<jar destfile="webstart/lib/linux/joal-native.jar" basedir="${dist}/lib/linux">
! 			<include name="libjoal.so"/>
! 		</jar>
  		<jar destfile="webstart/lib/linux/lwjgl-native.jar" basedir="${dist}/lib/linux/lwjgl">
  			<include name="*.so"/>
  		</jar>
! 		<jar destfile="webstart/lib/linux/openal.jar" basedir="${dist}/lib/linux">
! 			<include name="libopenal.so"/>
! 		</jar>
! 		<jar destfile="webstart/lib/osx/joal-native.jar" basedir="${dist}/lib/osx">
! 			<include name="libjoal.jnilib"/>
! 		</jar>
! 		<jar destfile="webstart/lib/osx/lwjgl-native.jar" basedir="${dist}/lib/osx">
! 			<include name="liblwjgl.jnilib"/>
! 			<include name="openal.dylib"/>
! 		</jar>
! 		<jar destfile="webstart/lib/windows/joal-native.jar" basedir="${dist}/lib/windows">
! 			<include name="joal.dll"/>
! 			<include name="OpenAL32.dll"/>
! 		</jar>
  		<jar destfile="webstart/lib/windows/lwjgl-native.jar" basedir="${dist}/lib/windows">
  			<include name="lwjgl.dll"/>
--- 246,259 ----
  				<include name="**/*.jar"/>
  				<exclude name="jogl.jar"/>
! 				<exclude name="joal.jar"/>
! 				<exclude name="gluegen-rt.jar"/>
  			</fileset>
  		</copy>
  
! 		<mkdir dir="webstart/lib/linux"/>
  		<jar destfile="webstart/lib/linux/lwjgl-native.jar" basedir="${dist}/lib/linux/lwjgl">
  			<include name="*.so"/>
  		</jar>
! 		<mkdir dir="webstart/lib/windows"/>
  		<jar destfile="webstart/lib/windows/lwjgl-native.jar" basedir="${dist}/lib/windows">
  			<include name="lwjgl.dll"/>
***************
*** 299,313 ****
  		</delete>
  	</target>
- 	
- 	<!-- patch -->
- 	<target name="patch">
- 		<javac destdir="${build}" optimize="on" debug="off" source="1.4">
- 			<src path="${patch}"/>
- 			<include name="**"/>
- 			<classpath refid="build.class.path"/>
- 		</javac>
- 			<jar destfile="patch.jar" basedir="${build}">
- 			<include name="net/**"/>
- 		</jar>
- 	</target>
  </project>
\ No newline at end of file
--- 285,287 ----