Merge pull request #1259 from masonmark/fix-test-for-leopard-sdk

Fix build-time test for presence of Mac OS X 10.5 SDK
This commit is contained in:
Francisco Ryan Tolmasky I committed 2011-05-10 21:33:25 -07:00
commit 4509df3c2a
3 files changed
+15 -2

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ task ("build", function()
{
var args = "-alltargets -configuration Release";
if (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")))
if (xcodebuildHasTenPointFiveSDK())
args = "-sdk macosx10.5 " + args;
else
+1 -1
View File
@@ -10,7 +10,7 @@ task ("build", function()
{
var args = "-alltargets -configuration " + $CONFIGURATION;
if (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")))
if (xcodebuildHasTenPointFiveSDK())
args = "-sdk macosx10.5 " + args;
else
+13
View File
@@ -456,6 +456,19 @@ global.copyManPage = function(/*String*/ name, /*int*/ section)
}
}
global.xcodebuildCanListSDKs = function ()
{
return OS.system("xcodebuild -showsdks > /dev/null 2>&1") == 0;
}
global.xcodebuildHasTenPointFiveSDK = function ()
{
if (xcodebuildCanListSDKs())
return OS.system("xcodebuild -showsdks | grep 'macosx10.5' > /dev/null 2>&1") == 0;
else
return (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")));
}
// built in tasks