diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-04-16 21:58:36 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-04-16 22:46:56 -0700 |
| commit | 15769537c308560eaa7f467fca9302f43d518ca6 (patch) | |
| tree | 0413cd2a51292660734d5c0cfdea6f76fa0d7b57 /Makefile | |
| parent | 7054f808bc3f1b31b361217290540810e61cda8e (diff) | |
| download | qtlocation-mapboxgl-15769537c308560eaa7f467fca9302f43d518ca6.tar.gz | |
[osx] Moved SDK from gyp into Xcode project
Added a new Cocoa dynamic framework target target to the main OS X Xcode project. The target is based on the template provided by Xcode. It contains headers and source files in the darwin/ and osx/ subdirectories. Headers are explicitly marked public or project-internal instead of implicitly by subdirectory. Removed the osxsdk target from platform.gypi.
The SDK target has a few dependencies that are managed by mason. Transform the config.gypi generated by configure into an .xcconfig file that Xcode uses to fill in compiler and linker flags.
Added a CI scheme that builds the All aggregate target generated by gyp and the osxapp and SDK test targets.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -20,24 +20,25 @@ OSX_PROJ_PATH = build/osx-x86_64/platform/osx/platform.xcodeproj OSX_WORK_PATH = platform/osx/osx.xcworkspace OSX_DERIVED_DATA_PATH = build/DerivedData/osx -osx: - $(RUN) PLATFORM=osx Xcode/All - $(OSX_PROJ_PATH): platform/osx/platform.gyp platform/osx/scripts/configure.sh mbgl.gypi test/test.gypi bin/*.gypi $(RUN) PLATFORM=osx Xcode/__project__ +osx: $(OSX_PROJ_PATH) + set -o pipefail && xcodebuild \ + -derivedDataPath $(OSX_DERIVED_DATA_PATH) \ + -configuration $(BUILDTYPE) \ + -workspace $(OSX_WORK_PATH) -scheme CI build | xcpretty + xproj: $(OSX_PROJ_PATH) open $(OSX_WORK_PATH) -$(OSX_PROJ_PATH)/xcshareddata/xcschemes/osxtest.xcscheme: platform/osx/scripts/osxtest.xcscheme - mkdir -p $(basename $@) - cp $< $@ - -test-osx: $(OSX_PROJ_PATH) $(OSX_PROJ_PATH)/xcshareddata/xcschemes/osxtest.xcscheme node_modules/express - set -o pipefail && xcodebuild -project $(OSX_PROJ_PATH) -configuration $(BUILDTYPE) -target test build | xcpretty - ulimit -c unlimited && (build/osx-x86_64/$(BUILDTYPE)/test & pid=$$! && wait $$pid \ +test-osx: osx node_modules/express + ulimit -c unlimited && ($(OSX_DERIVED_DATA_PATH)/Build/Products/$(BUILDTYPE)/test & pid=$$! && wait $$pid \ || (lldb -c /cores/core.$$pid --batch --one-line 'thread backtrace all' --one-line 'quit' && exit 1)) - set -o pipefail && xcodebuild -project $(OSX_PROJ_PATH) -configuration $(BUILDTYPE) -scheme osxtest test | xcpretty + set -o pipefail && xcodebuild \ + -derivedDataPath $(OSX_DERIVED_DATA_PATH) \ + -configuration $(BUILDTYPE) \ + -workspace $(OSX_WORK_PATH) -scheme CI test | xcpretty #### iOS targets ############################################################## |