diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-11 20:10:22 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-11 21:21:36 -0700 |
| commit | d8d3690010170a4930adbdc64a88dcec43b7f3d4 (patch) | |
| tree | 34ea6d53fd44f712b5ca8ad62fa6d8abdd0d9224 /Makefile | |
| parent | eda132d922df160a413bac9238e98d96c8748667 (diff) | |
| download | qtlocation-mapboxgl-d8d3690010170a4930adbdc64a88dcec43b7f3d4.tar.gz | |
[ios] Use the same build configuration for `make ios` and `make test-ios`
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -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 |