diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-06-13 14:47:13 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-06-18 14:58:07 -0700 |
| commit | 061854990ffe495910a5f0dc7c6bb5d394f772e9 (patch) | |
| tree | e0f4581369d44fb3c7501abaa8d624588e2ab3fc /Makefile | |
| parent | d564302c6d376da123f01028124b1702b13ad1ef (diff) | |
| download | qtlocation-mapboxgl-061854990ffe495910a5f0dc7c6bb5d394f772e9.tar.gz | |
[macos] Renamed OS X SDK to macOS SDK
Also renamed as many references to OS X as possible to macOS in documentation.
Cherry-picked from b9702ef41a4cfdd0ab3107cfe5cec16ba3a4c230.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 58 |
1 files changed, 29 insertions, 29 deletions
@@ -1,7 +1,7 @@ export BUILDTYPE ?= Debug ifeq ($(shell uname -s), Darwin) - HOST_PLATFORM = osx + HOST_PLATFORM = macos export JOBS ?= $(shell sysctl -n hw.ncpu) else ifeq ($(shell uname -s), Linux) HOST_PLATFORM = linux @@ -36,54 +36,54 @@ CONFIG_DEPENDENCIES = .mason/mason configure # files are added or removed. GYP_DEPENDENCIES = mbgl.gypi test/test.gypi benchmark/benchmark.gypi bin/*.gypi $(shell find src include -type d) node_modules -#### OS X targets ############################################################## +#### macOS targets ############################################################## -OSX_OUTPUT_PATH = build/osx -OSX_PROJ_PATH = $(OSX_OUTPUT_PATH)/platform/osx/platform.xcodeproj -OSX_WORK_PATH = platform/osx/osx.xcworkspace -OSX_USER_DATA_PATH = $(OSX_WORK_PATH)/xcuserdata/$(USER).xcuserdatad +MACOS_OUTPUT_PATH = build/macos +MACOS_PROJ_PATH = $(MACOS_OUTPUT_PATH)/platform/macos/platform.xcodeproj +MACOS_WORK_PATH = platform/macos/macos.xcworkspace +MACOS_USER_DATA_PATH = $(MACOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad -$(OSX_OUTPUT_PATH)/config.gypi: platform/osx/scripts/configure.sh $(CONFIG_DEPENDENCIES) - ./configure $< $@ osx +$(MACOS_OUTPUT_PATH)/config.gypi: platform/macos/scripts/configure.sh $(CONFIG_DEPENDENCIES) + ./configure $< $@ macos -$(OSX_OUTPUT_PATH)/mbgl.xcconfig: $(OSX_OUTPUT_PATH)/config.gypi +$(MACOS_OUTPUT_PATH)/mbgl.xcconfig: $(MACOS_OUTPUT_PATH)/config.gypi ./scripts/export-xcconfig.py $< $@ -$(OSX_PROJ_PATH): platform/osx/platform.gyp $(OSX_OUTPUT_PATH)/config.gypi $(OSX_OUTPUT_PATH)/mbgl.xcconfig $(GYP_DEPENDENCIES) - $(GYP) -f xcode --generator-output=$(OSX_OUTPUT_PATH) $< +$(MACOS_PROJ_PATH): platform/macos/platform.gyp $(MACOS_OUTPUT_PATH)/config.gypi $(MACOS_OUTPUT_PATH)/mbgl.xcconfig $(GYP_DEPENDENCIES) + $(GYP) -f xcode --generator-output=$(MACOS_OUTPUT_PATH) $< -osx: $(OSX_PROJ_PATH) +macos: $(MACOS_PROJ_PATH) set -o pipefail && xcodebuild \ - -derivedDataPath $(OSX_OUTPUT_PATH) \ + -derivedDataPath $(MACOS_OUTPUT_PATH) \ -configuration $(BUILDTYPE) \ - -workspace $(OSX_WORK_PATH) -scheme CI build $(XCPRETTY) + -workspace $(MACOS_WORK_PATH) -scheme CI build $(XCPRETTY) -xproj: $(OSX_PROJ_PATH) $(OSX_WORK_PATH) - mkdir -p "$(OSX_USER_DATA_PATH)" - cp platform/osx/WorkspaceSettings.xcsettings "$(OSX_USER_DATA_PATH)/WorkspaceSettings.xcsettings" - open $(OSX_WORK_PATH) +xproj: $(MACOS_PROJ_PATH) $(MACOS_WORK_PATH) + mkdir -p "$(MACOS_USER_DATA_PATH)" + cp platform/macos/WorkspaceSettings.xcsettings "$(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings" + open $(MACOS_WORK_PATH) -test-osx: osx node_modules - ulimit -c unlimited && ($(OSX_OUTPUT_PATH)/Build/Products/$(BUILDTYPE)/test & pid=$$! && wait $$pid \ +test-macos: macos node_modules + ulimit -c unlimited && ($(MACOS_OUTPUT_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 \ - -derivedDataPath $(OSX_OUTPUT_PATH) \ + -derivedDataPath $(MACOS_OUTPUT_PATH) \ -configuration $(BUILDTYPE) \ - -workspace $(OSX_WORK_PATH) -scheme CI test $(XCPRETTY) + -workspace $(MACOS_WORK_PATH) -scheme CI test $(XCPRETTY) -xpackage: $(OSX_PROJ_PATH) - SYMBOLS=$(SYMBOLS) ./platform/osx/scripts/package.sh +xpackage: $(MACOS_PROJ_PATH) + SYMBOLS=$(SYMBOLS) ./platform/macos/scripts/package.sh xdocument: - OUTPUT=$(OUTPUT) ./platform/osx/scripts/document.sh + OUTPUT=$(OUTPUT) ./platform/macos/scripts/document.sh genstrings: - genstrings -u -o platform/osx/sdk/Base.lproj platform/darwin/src/*.{m,mm} - genstrings -u -o platform/osx/sdk/Base.lproj platform/osx/src/*.{m,mm} + genstrings -u -o platform/macos/sdk/Base.lproj platform/darwin/src/*.{m,mm} + genstrings -u -o platform/macos/sdk/Base.lproj platform/macos/src/*.{m,mm} genstrings -u -o platform/ios/resources/Base.lproj platform/ios/src/*.{m,mm} - -find platform/ios/resources platform/osx/sdk -path '*/Base.lproj/*.strings' -exec \ + -find platform/ios/resources platform/macos/sdk -path '*/Base.lproj/*.strings' -exec \ textutil -convert txt -extension strings -inputencoding UTF-16 -encoding UTF-8 {} \; - mv platform/osx/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/ + mv platform/macos/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/ #### iOS targets ############################################################## |