From 4175a09b4bc931004c6f5706eb3ca9b2003cecac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Mon, 11 Apr 2016 18:09:23 -0700 Subject: [ios] Build CI-specific scheme in CI The new scheme builds both the All aggregate target generated by gyp and the iosapp target. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4a1f65a2b8..ddb802f09e 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ test-osx: $(OSX_PROJ_PATH) $(OSX_PROJ_PATH)/xcshareddata/xcschemes/osxtest.xcsch #### iOS targets ############################################################## IOS_PROJ_PATH = build/ios-all/platform/ios/platform.xcodeproj +IOS_WORK_PATH = platform/ios/ios.xcworkspace $(IOS_PROJ_PATH): platform/ios/platform.gyp platform/ios/scripts/configure.sh mbgl.gypi test/test.gypi $(RUN) PLATFORM=ios Xcode/__project__ @@ -49,10 +50,10 @@ ios: $(IOS_PROJ_PATH) ARCHS=i386 ONLY_ACTIVE_ARCH=YES \ -configuration $(BUILDTYPE) -sdk iphonesimulator \ -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ - -project $(IOS_PROJ_PATH) -target All build | xcpretty + -workspace $(IOS_WORK_PATH) -scheme CI build | xcpretty iproj: $(IOS_PROJ_PATH) - open platform/ios/ios.xcworkspace + open $(IOS_WORK_PATH) test-ios: ios ios-sim start -- cgit v1.2.1