fixed some small build issues
This commit is contained in:
parent
505062df9d
commit
8b7a93f623
34
build.xml
34
build.xml
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
<!-- Files to include in the lwjgl.jar file -->
|
<!-- Files to include in the lwjgl.jar file -->
|
||||||
<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
|
<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
|
||||||
<include name="**"/>
|
<include name="**/*.java"/>
|
||||||
<exclude name="**.*"/>
|
<exclude name="**.*"/>
|
||||||
<exclude name="org/lwjgl/fmod3/**"/>
|
<exclude name="org/lwjgl/fmod3/**"/>
|
||||||
<exclude name="org/lwjgl/test/**"/>
|
<exclude name="org/lwjgl/test/**"/>
|
||||||
|
@ -89,6 +89,7 @@
|
||||||
<fileset id="lwjgl.source.fileset" dir=".">
|
<fileset id="lwjgl.source.fileset" dir=".">
|
||||||
<include name="build.xml"/>
|
<include name="build.xml"/>
|
||||||
<include name="src/**"/>
|
<include name="src/**"/>
|
||||||
|
<include name="platform_build/**"/>
|
||||||
<exclude name="**/*CVS*"/>
|
<exclude name="**/*CVS*"/>
|
||||||
<exclude name="native/projb/**"/>
|
<exclude name="native/projb/**"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
|
@ -310,25 +311,14 @@
|
||||||
|
|
||||||
<!-- Creates a versioned distribution for all supported platforms -->
|
<!-- Creates a versioned distribution for all supported platforms -->
|
||||||
<target name="-distribution_application">
|
<target name="-distribution_application">
|
||||||
<!-- check each platform, and run their copy target -->
|
<!-- check each platform, and run their copy target -->
|
||||||
<condition property="lwjgl.platform.windows">
|
<antcall target="-distribute_win32"/>
|
||||||
<os family="windows"/>
|
<antcall target="-distribute_linux"/>
|
||||||
</condition>
|
<antcall target="-distribute_macosx"/>
|
||||||
<antcall target="-distribute_win32"/>
|
|
||||||
|
|
||||||
<condition property="lwjgl.platform.linux">
|
|
||||||
<os name="Linux"/>
|
|
||||||
</condition>
|
|
||||||
<antcall target="-distribute_linux"/>
|
|
||||||
|
|
||||||
<condition property="lwjgl.platform.mac">
|
|
||||||
<os name="Mac OS X"/>
|
|
||||||
</condition>
|
|
||||||
<antcall target="-distribute_macosx"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- Distributes win32 files -->
|
<!-- Distributes win32 files -->
|
||||||
<target name="-distribute_win32" if="lwjgl.platform.windows">
|
<target name="-distribute_win32">
|
||||||
<!-- copy files from lib/platform to temp -->
|
<!-- copy files from lib/platform to temp -->
|
||||||
<copy todir="${lwjgl.temp}/lwjgl-win32-${lwjgl.version}">
|
<copy todir="${lwjgl.temp}/lwjgl-win32-${lwjgl.version}">
|
||||||
<fileset dir="${lwjgl.lib}">
|
<fileset dir="${lwjgl.lib}">
|
||||||
|
@ -339,11 +329,11 @@
|
||||||
<patternset refid="lwjgl-common.fileset"/>
|
<patternset refid="lwjgl-common.fileset"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
<zip destfile="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/>
|
<zip destfile="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="lwjgl-win32-${lwjgl.version}/**"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- Distributes linux files -->
|
<!-- Distributes linux files -->
|
||||||
<target name="-distribute_linux" if="lwjgl.platform.linux">
|
<target name="-distribute_linux">
|
||||||
<!-- copy files from lib/platform to temp -->
|
<!-- copy files from lib/platform to temp -->
|
||||||
<copy todir="${lwjgl.temp}/lwjgl-linux-${lwjgl.version}">
|
<copy todir="${lwjgl.temp}/lwjgl-linux-${lwjgl.version}">
|
||||||
<fileset dir="${lwjgl.lib}">
|
<fileset dir="${lwjgl.lib}">
|
||||||
|
@ -354,11 +344,11 @@
|
||||||
<patternset refid="lwjgl-common.fileset"/>
|
<patternset refid="lwjgl-common.fileset"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
<zip destfile="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/>
|
<zip destfile="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="lwjgl-linux-${lwjgl.version}/**"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- Distributes macosx files -->
|
<!-- Distributes macosx files -->
|
||||||
<target name="-distribute_macosx" if="lwjgl.platform.macosx">
|
<target name="-distribute_macosx">
|
||||||
<!-- copy files from lib/platform to temp -->
|
<!-- copy files from lib/platform to temp -->
|
||||||
<copy todir="${lwjgl.temp}/lwjgl-macosx-${lwjgl.version}">
|
<copy todir="${lwjgl.temp}/lwjgl-macosx-${lwjgl.version}">
|
||||||
<fileset dir="${lwjgl.lib}">
|
<fileset dir="${lwjgl.lib}">
|
||||||
|
@ -369,7 +359,7 @@
|
||||||
<patternset refid="lwjgl-common.fileset"/>
|
<patternset refid="lwjgl-common.fileset"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
<zip destfile="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/>
|
<zip destfile="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="lwjgl-macosx-${lwjgl.version}/**"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- Creates a versioned distribution of javadocs -->
|
<!-- Creates a versioned distribution of javadocs -->
|
||||||
|
|
Loading…
Reference in New Issue