incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: Fixed CB-260: Can't install Phonegap with new Xcode 4.3
Date Thu, 08 Mar 2012 23:58:50 GMT
Updated Branches:
  refs/heads/master 7e3752e25 -> d279bf97e


Fixed CB-260: Can't install Phonegap with new Xcode 4.3

commit af1f7ad2f67b31563a5b4e55c66a2bf3641e900c
Author: Shazron Abdullah <shazron@apache.org>
Date:   Tue Mar 6 16:16:49 2012 -0800

    Makefile fix for Xcode in check-utils target.

commit 5ccb435caba4e39bc9a7705a34bce740b4ae7845
Author: Shazron Abdullah <shazron@apache.org>
Date:   Tue Mar 6 16:11:14 2012 -0800

    Fixed CB-260: Can't install Phonegap with new Xcode 4.3


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/d279bf97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/d279bf97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/d279bf97

Branch: refs/heads/master
Commit: d279bf97ed7380293dd9ce7b6660c2e4bddd1421
Parents: 7e3752e
Author: Shazron Abdullah <shazron@apache.org>
Authored: Thu Mar 8 15:58:32 2012 -0800
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Thu Mar 8 15:58:32 2012 -0800

----------------------------------------------------------------------
 Makefile |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/d279bf97/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 9aa3e34..c262c8d 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,11 @@ CONVERTPDF = /System/Library/Printers/Libraries/convert
 COMBINEPDF = /System/Library/Automator/Combine\ PDF\ Pages.action/Contents/Resources/join.py
 DOXYGEN = 
 IPHONE_DOCSET_TMPDIR = docs/iphone/tmp
-DEVELOPER = $(shell xcode-select -print-path)
-PACKAGEMAKER = '$(DEVELOPER)/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker'
-XC = xcodebuild
+XC_APP = '$(shell mdfind "kMDItemDisplayName=='Xcode' && kMDItemKind=='Application'")'
+DEVELOPER = '$(XC_APP)/Contents/Developer'
+PM_APP = '$(shell mdfind "kMDItemDisplayName=='PackageMaker*' && kMDItemKind=='Application'")'
+PACKAGEMAKER = '$(PM_APP)/Contents/MacOS/PackageMaker'
+XC = $(DEVELOPER)/usr/bin/xcodebuild
 CDV_VER = $(shell head -1 CordovaLib/VERSION)
 GIT = $(shell which git)
 COMMIT_HASH=$(shell git describe --tags)	
@@ -150,10 +152,18 @@ clean: clean-installer clean-cordova-lib clean-xcode3-template clean-xcode4-temp
 	fi
 	@$(RM_RF) $(BUILD_BAK)
 
-checkos:
+check-os:
 	@if [ "$$OSTYPE" != "darwin11" ]; then echo "Error: You need to package the installer on
a Mac OS X 10.7 Lion system."; exit 1; fi
 
-installer: clean markdown wkhtmltopdf cordova-lib xcode3-template xcode4-template cordova-framework
+check-utils:
+		@if [ $(XC_APP) == '' ] ; then \
+			echo 'No Xcode found. Please download from the Mac App Store.'; exit 1;  \
+		fi
+		@if [ $(PM_APP) == '' ] ; then \
+			echo 'No PackageMaker found. You need to download the Xcode Auxiliary Tools: https://developer.apple.com/downloads/index.action?name=auxiliary';
exit 1; \
+		fi
+
+installer: check-utils clean markdown wkhtmltopdf cordova-lib xcode3-template xcode4-template
cordova-framework
 	@# remove the dist folder
 	@if [ -d "dist" ]; then \
 		$(CP) -Rf dist ~/.Trash; \


Mime
View raw message