Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3820] branches/osx-java7/LWJGL/platform_build/ macosx_ant/build.xml
|
From: <ka...@us...> - 2012-11-06 21:45:52
|
Revision: 3820
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3820&view=rev
Author: kappa1
Date: 2012-11-06 21:45:45 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
upload mc78's latest build.xml fixes, gets rid of the depreciated warnings
Modified Paths:
--------------
branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
Modified: branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml
===================================================================
--- branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-06 16:18:28 UTC (rev 3819)
+++ branches/osx-java7/LWJGL/platform_build/macosx_ant/build.xml 2012-11-06 21:45:45 UTC (rev 3820)
@@ -7,8 +7,11 @@
<mkdir dir="x86_64"/>
<property environment="env" />
<!-- Check which gcc we have, newer releasse of Mac OS do not have gcc-4.2 installed by defaault -->
- <available file="gcc" filepath="${env.PATH}" property="gcc" value="gcc"/>
- <available file="gcc-4.2" filepath="${env.PATH}" property="gcc" value="gcc-4.2"/>
+ <available file="gcc" filepath="${env.PATH}" property="gcc.name" value="gcc"/>
+ <available file="gcc-4.2" filepath="${env.PATH}" property="gcc42.name" value="gcc-4.2"/>
+ <condition property="gcc" value="${gcc42.name}" else="${gcc.name}">
+ <isset property="gcc42.name" />
+ </condition>
<!-- Ask Xcode for correct path to XCode tools -->
<!-- Will fail if XCode Command Line Tools are not installed on 10.7+ (Lion) -->
<exec executable="xcode-select" outputproperty="developer_path" errorproperty="xcode-select.error" failonerror="false" failifexecutionfails="false">
@@ -18,33 +21,77 @@
<condition property="developer_path" value="/Developer">
<isset property="xcode-select.error" />
</condition>
- <!-- Lion and above do not have /Developer nor the 10.6 SDK, so use 10.7 SDK -->
- <condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+ <!-- Detect Mac OS X 10.7 SDK in new Xcode path for for Mac OS 10.7+ -->
+ <condition property="sdk-10.7" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" type="dir"/>
</condition>
- <condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
+ <condition property="javavm-10.7" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk">
<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
</condition>
- <!-- Fallback to 10.6 SDK if present on file system under new Xcode location -->
- <condition property="sdkroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+ <!-- Detect Mac OS X 10.6 SDK copied into new Xcode path for Mac OS 10.7+ -->
+ <condition property="sdk-10.6" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk" type="dir"/>
</condition>
- <condition property="javavmroot" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
+ <condition property="javavm-10.6" value="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk">
<available file="${developer_path}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
</condition>
- <!-- Fallback to 10.6 SDK if present on old /Developer path -->
- <condition property="sdkroot" value="${developer_path}/SDKs/MacOSx10.6.sdk">
+ <!-- Detect Mac OS X 10.6 SDK in old XCode location for Mac OS 10.6 -->
+ <condition property="old.sdk-10.6" value="${developer_path}/SDKs/MacOSx10.6.sdk">
<available file="${developer_path}/SDKs/MacOSx10.6.sdk" type="dir"/>
</condition>
- <!-- Only use /System/Library/Frameworks/JavaVM.framework/ if nothing under other SDK's is found -->
- <condition property="javavmroot" value="">
+ <condition property="old.javavm-10.6" value="">
+ <available file="/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+ </condition>
+ <!-- Use old JavaVM.framework location if nothing else is available -->
+ <condition property="javavmroot" value="${old.javavm-10.6}">
<and>
- <available file="/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers" type="dir"/>
+ <isset property="old.javavm-10.6" />
<not>
- <isset property="javavmroot" />
+ <or>
+ <isset property="javavm-10.6" />
+ <isset property="javavm-10.7" />
+ </or>
</not>
</and>
</condition>
+ <!-- Use JavaVM.framework from 10.6 in new Xcode path if available -->
+ <condition property="javavmroot" value="${javavm-10.6}">
+ <isset property="javavm-10.6" />
+ </condition>
+ <!-- Use JavaVM.framework from 10.7 in new Xcode path if available and 10.6 isn't also there -->
+ <condition property="javavmroot" value="${javavm-10.7}">
+ <and>
+ <isset property="javavm-10.7" />
+ <not>
+ <isset property="javavm-10.6" />
+ </not>
+ </and>
+ </condition>
+ <!-- Use MacOS SDK 10.6 from /Developer if nothing else is available -->
+ <condition property="sdkroot" value="${old.sdk-10.6}">
+ <and>
+ <isset property="old.sdk-10.6" />
+ <not>
+ <or>
+ <isset property="sdk-10.6" />
+ <isset property="sdk-10.7" />
+ </or>
+ </not>
+ </and>
+ </condition>
+ <!-- Use MacOS SDK 10.6 from new Xcode location if available -->
+ <condition property="sdkroot" value="${sdk-10.6}">
+ <isset property="sdk-10.6" />
+ </condition>
+ <!-- Use MacOS SDK 10.7 in new Xcode path if available and 10.6 SDK isn't also there -->
+ <condition property="sdkroot" value="${sdk-10.7}">
+ <and>
+ <isset property="sdk-10.7" />
+ <not>
+ <isset property="sdk-10.6" />
+ </not>
+ </and>
+ </condition>
</target>
<target name="clean">
@@ -83,6 +130,9 @@
</target>
<target name="nativelibrary" depends="init">
+ <echo message=" GCC: ${gcc}"/>
+ <echo message=" Mac OS SDK: ${sdkroot}"/>
+ <echo message="JavaVM.framework: ${javavmroot}"/>
<property name="universal_sdkroot" location="${sdkroot}"/>
<property name="x86_64_sdkroot" location="${sdkroot}"/>
<property name="universal_flags" value="-isysroot ${universal_sdkroot}"/>
@@ -123,4 +173,4 @@
<fileset file="x86_64/liblwjgl-i86_64.jnilib"/>
</apply>
</target>
-</project>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
