From d8d3690010170a4930adbdc64a88dcec43b7f3d4 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 11 Apr 2016 20:10:22 -0700 Subject: [ios] Use the same build configuration for `make ios` and `make test-ios` --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 679dd0df1e..2e5d8f1b6c 100644 --- a/Makefile +++ b/Makefile @@ -40,19 +40,18 @@ test-osx: $(OSX_PROJ_PATH) $(OSX_PROJ_PATH)/xcshareddata/xcschemes/osxtest.xcsch IOS_PROJ_PATH = build/ios-all/platform/ios/platform.xcodeproj -ios: - $(RUN) PLATFORM=ios Xcode/All - $(IOS_PROJ_PATH): platform/ios/platform.gyp platform/ios/scripts/configure.sh mbgl.gypi test/test.gypi $(RUN) PLATFORM=ios Xcode/__project__ +ios: $(IOS_PROJ_PATH) + set -o pipefail && xcodebuild -configuration $(BUILDTYPE) -sdk iphonesimulator \ + -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ + -project $(IOS_PROJ_PATH) -target All build | xcpretty + iproj: $(IOS_PROJ_PATH) open $(IOS_PROJ_PATH) -test-ios: $(IOS_PROJ_PATH) - set -o pipefail && xcodebuild -project $(IOS_PROJ_PATH) -configuration $(BUILDTYPE) \ - -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ - -target test build | xcpretty +test-ios: ios ios-sim start ios-sim launch build/ios-all/$(BUILDTYPE)-iphonesimulator/ios-test.app --verbose -- cgit v1.2.1