create single distribution

This commit is contained in:
Brian Matzon 2006-02-21 22:11:49 +00:00
parent 2e3c168792
commit 63e997aae4
2 changed files with 18 additions and 38 deletions

View File

@ -167,10 +167,13 @@
<mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" /> <mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder" />
<mkdir dir="${lwjgl.res}" taskname="initialiazing res folder" /> <mkdir dir="${lwjgl.res}" taskname="initialiazing res folder" />
<mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder" /> <mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder" />
<mkdir dir="${lwjgl.temp}/jar" taskname="initialiazing temp folder" /> <mkdir dir="${lwjgl.temp}/jar" taskname="initialiazing temp/jar folder" />
<mkdir dir="${lwjgl.temp}/doc" taskname="initialiazing temp folder" /> <mkdir dir="${lwjgl.temp}/doc" taskname="initialiazing temp/doc folder" />
<mkdir dir="${lwjgl.temp}/res" taskname="initialiazing temp folder" /> <mkdir dir="${lwjgl.temp}/res" taskname="initialiazing temp/res folder" />
<mkdir dir="${lwjgl.temp}/native" taskname="initialiazing temp folder" /> <mkdir dir="${lwjgl.temp}/native" taskname="initialiazing temp/native folder" />
<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" />
</target> </target>
<target name="clean-generated" description="Deletes the generated java and native source"> <target name="clean-generated" description="Deletes the generated java and native source">
@ -227,9 +230,7 @@
<!-- create distribution from files in libs/ and temp/ --> <!-- create distribution from files in libs/ and temp/ -->
<antcall target="-distribution_javadoc" /> <antcall target="-distribution_javadoc" />
<antcall target="-distribution_source" /> <antcall target="-distribution_source" />
<antcall target="-distribute_win32" /> <antcall target="-distribute" />
<antcall target="-distribute_linux" />
<antcall target="-distribute_macosx" />
</target> </target>
<!-- Create ONLY the jar archives --> <!-- Create ONLY the jar archives -->
@ -270,51 +271,30 @@
</jar> </jar>
</target> </target>
<!-- Distributes win32 files --> <!-- Distributes files -->
<target name="-distribute_win32"> <target name="-distribute">
<delete> <delete>
<fileset dir="${lwjgl.temp}/native/" includes="**/*"/> <fileset dir="${lwjgl.temp}/native/" includes="**/*"/>
</delete> </delete>
<copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/> <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
<copy todir="${lwjgl.temp}/native"> <copy todir="${lwjgl.temp}/native/win32">
<fileset dir="${lwjgl.lib}/win32"> <fileset dir="${lwjgl.lib}/win32">
<patternset refid="lwjgl-win32.fileset" /> <patternset refid="lwjgl-win32.fileset" />
</fileset> </fileset>
</copy> </copy>
<zip destfile="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip"> <copy todir="${lwjgl.temp}/native/linux">
<zipfileset dir="${lwjgl.temp}" prefix="lwjgl-win32-${lwjgl.version}/"/>
</zip>
</target>
<!-- Distributes linux files -->
<target name="-distribute_linux">
<delete>
<fileset dir="${lwjgl.temp}/native/" includes="**/*"/>
</delete>
<copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
<copy todir="${lwjgl.temp}/native">
<fileset dir="${lwjgl.lib}/linux"> <fileset dir="${lwjgl.lib}/linux">
<patternset refid="lwjgl-linux.fileset" /> <patternset refid="lwjgl-linux.fileset" />
</fileset> </fileset>
</copy> </copy>
<zip destfile="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip"> <copy todir="${lwjgl.temp}/native/macosx">
<zipfileset dir="${lwjgl.temp}" prefix="lwjgl-linux-${lwjgl.version}/"/>
</zip>
</target>
<!-- Distributes macosx files -->
<target name="-distribute_macosx">
<delete>
<fileset dir="${lwjgl.temp}/native/" includes="**/*"/>
</delete>
<copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
<copy todir="${lwjgl.temp}/native">
<fileset dir="${lwjgl.lib}/macosx"> <fileset dir="${lwjgl.lib}/macosx">
<patternset refid="lwjgl-macosx.fileset" /> <patternset refid="lwjgl-macosx.fileset" />
</fileset> </fileset>
</copy> </copy>
<zip destfile="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip">
<zipfileset dir="${lwjgl.temp}" prefix="lwjgl-macosx-${lwjgl.version}/"/> <zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip">
<zipfileset dir="${lwjgl.temp}" prefix="lwjgl-${lwjgl.version}/"/>
</zip> </zip>
</target> </target>

View File

@ -12,7 +12,7 @@ To run some of the included tests:
Extract the archive, and cd into directory Extract the archive, and cd into directory
(please substitute ; and \ according to platform) (please substitute ; and \ according to platform)
java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\lwjgl_fmod3.jar;jar\lwjgl_devil.jar;jar\jinput.jar; -Djava.library.path=native TEST java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar;jar\lwjgl_fmod3.jar;jar\lwjgl_devil.jar;jar\jinput.jar; -Djava.library.path=native\<win32|linux|macosx> TEST
(this specifies that the jvm should locate the lwjgl native libs in 'native' directory) (this specifies that the jvm should locate the lwjgl native libs in 'native' directory)
where TEST is one of the following: where TEST is one of the following:
@ -59,7 +59,7 @@ To run some of the included tests:
org.lwjgl.test.devil.BasicTest org.lwjgl.test.devil.BasicTest
You may also run the Space invaders demo by executing: You may also run the Space invaders demo by executing:
java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar; -Djava.library.path=native org.lwjgl.examples.spaceinvaders.Game java -cp .;res;jar\lwjgl.jar;jar\lwjgl_test.jar;jar\lwjgl_util.jar; -Djava.library.path=native\<win32|linux|macosx> org.lwjgl.examples.spaceinvaders.Game
Project Webpage: www.lwjgl.org Project Webpage: www.lwjgl.org
Project Forum: forum.lwjgl.org Project Forum: forum.lwjgl.org