Remove version check from build.xml
This commit is contained in:
parent
b7e7d97f20
commit
58e900386a
24
build.xml
24
build.xml
|
@ -432,26 +432,6 @@
|
||||||
</echo>
|
</echo>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<macrodef name="version-check">
|
|
||||||
<attribute name="platform"/>
|
|
||||||
<sequential>
|
|
||||||
<java classname="org.lwjgl.test.NativeTest" logError="true" resultproperty="nativetest.res" outputproperty="nativetest.out" errorproperty="nativetest.err" fork="true">
|
|
||||||
<jvmarg value="-Djava.library.path=libs/@{platform}"/>
|
|
||||||
<jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
|
|
||||||
<classpath>
|
|
||||||
<pathelement path="${lwjgl.target.gen.classes}"/>
|
|
||||||
<pathelement path="${java.class.path}"/>
|
|
||||||
</classpath>
|
|
||||||
</java>
|
|
||||||
|
|
||||||
<fail message="Unable to load native library: ${nativetest.err}">
|
|
||||||
<condition><not><equals arg1="OK" arg2="${nativetest.out}"/></not></condition>
|
|
||||||
</fail>
|
|
||||||
|
|
||||||
<echo message="Successfully executed NativeTest"/>
|
|
||||||
</sequential>
|
|
||||||
</macrodef>
|
|
||||||
|
|
||||||
<!-- Compiles the Java source code -->
|
<!-- Compiles the Java source code -->
|
||||||
<target name="compile+NoGen" description="Compiles the java source code" depends="-initialize">
|
<target name="compile+NoGen" description="Compiles the java source code" depends="-initialize">
|
||||||
<javac debug="yes" destdir="${lwjgl.target.gen.classes}" nativeHeaderDir="${lwjgl.target.gen.headers}" source="1.8" target="1.8" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar:${lwjgl.lib}/asm-debug-all.jar" taskname="core">
|
<javac debug="yes" destdir="${lwjgl.target.gen.classes}" nativeHeaderDir="${lwjgl.target.gen.headers}" source="1.8" target="1.8" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar:${lwjgl.lib}/asm-debug-all.jar" taskname="core">
|
||||||
|
@ -504,13 +484,11 @@
|
||||||
<!-- Compiles LWJGL on Win32 platforms -->
|
<!-- Compiles LWJGL on Win32 platforms -->
|
||||||
<target name="-compile_native_win32" if="lwjgl.platform.windows">
|
<target name="-compile_native_win32" if="lwjgl.platform.windows">
|
||||||
<ant antfile="platform_build/windows_ant/build.xml"/>
|
<ant antfile="platform_build/windows_ant/build.xml"/>
|
||||||
<version-check platform="windows"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- Compiles LWJGL on Linux platforms -->
|
<!-- Compiles LWJGL on Linux platforms -->
|
||||||
<target name="-compile_native_linux" if="lwjgl.platform.linux">
|
<target name="-compile_native_linux" if="lwjgl.platform.linux">
|
||||||
<ant antfile="platform_build/linux_ant/build.xml"/>
|
<ant antfile="platform_build/linux_ant/build.xml"/>
|
||||||
<!-- headless issues <version-check platform="linux"/> -->
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- Compiles LWJGL on FreeBSD platforms -->
|
<!-- Compiles LWJGL on FreeBSD platforms -->
|
||||||
|
@ -528,13 +506,11 @@
|
||||||
<target name="-compile_native_solaris" if="lwjgl.platform.solaris">
|
<target name="-compile_native_solaris" if="lwjgl.platform.solaris">
|
||||||
<!-- Reusing the linux ant task, but copy the output to solaris -->
|
<!-- Reusing the linux ant task, but copy the output to solaris -->
|
||||||
<ant antfile="platform_build/linux_ant/build.xml"/>
|
<ant antfile="platform_build/linux_ant/build.xml"/>
|
||||||
<version-check platform="solaris"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- Compiles LWJGL on Mac platforms -->
|
<!-- Compiles LWJGL on Mac platforms -->
|
||||||
<target name="-compile_native_macosx" if="lwjgl.platform.macosx">
|
<target name="-compile_native_macosx" if="lwjgl.platform.macosx">
|
||||||
<ant antfile="platform_build/macosx_ant/build.xml"/>
|
<ant antfile="platform_build/macosx_ant/build.xml"/>
|
||||||
<version-check platform="macosx"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile_native_es" depends="-initialize, generate-all, version-mismatch" description="Compiles the native files">
|
<target name="compile_native_es" depends="-initialize, generate-all, version-mismatch" description="Compiles the native files">
|
||||||
|
|
Loading…
Reference in New Issue