From c9bc6c399194bd5adf0a91db554bc33d803205e1 Mon Sep 17 00:00:00 2001 From: Randall Luecke Date: Thu, 24 Feb 2011 01:25:11 -0500 Subject: [PATCH] Fix for Xcode 4.0 pre-release causing cappuccino not to build because of NativeHost. This is just a work around for the time being so that Cappuccino still finishes building. --- Tools/NativeHost/Jakefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Tools/NativeHost/Jakefile b/Tools/NativeHost/Jakefile index f6151df83..aff3d15cd 100644 --- a/Tools/NativeHost/Jakefile +++ b/Tools/NativeHost/Jakefile @@ -3,17 +3,23 @@ require("../../common.jake"); var OS = require("os"); var task = require("jake").task +var stream = require("narwhal/term").stream; task ("build", function() { if (executableExists("xcodebuild")) { - if (OS.system("xcodebuild -alltargets -configuration Release")) - OS.exit(1); + if (OS.popen("xcodebuild -version").stdout.read().match("Xcode 4.0")) + stream.print("\0red(Building NativeHost was skipped due to your Xcode 4.0 pre-release not including the Mac OS X 10.5 SDK.\0)"); + else + { + if (OS.system("xcodebuild -alltargets -configuration Release")) + OS.exit(1); - rm_rf(FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app")); - FILE.mkdirs(FILE.join($BUILD_CJS_CAPPUCCINO, "support")) - cp_r(FILE.join("build", "Release", "NativeHost.app"), FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app")); + rm_rf(FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app")); + FILE.mkdirs(FILE.join($BUILD_CJS_CAPPUCCINO, "support")) + cp_r(FILE.join("build", "Release", "NativeHost.app"), FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app")); + } } else {