1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename iOS device and simulator targets

Browse Source 
Use non-os specific target names in Makefiles (device as opposed to
iphoneos, simulator as opposed to iphonesimulator)

Change-Id: Ic8441c09a0e9a254e43f31b678025f16e9a1c440
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
This commit is contained in:
Mike Krus 2016-03-05 16:55:50 +00:00
parent c10a1c8f14
commit f05d5dfa85
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/common/ios.conf
View File

@ -6,13 +6,13 @@ QMAKE_PLATFORM += ios
QMAKE_MAC_SDK = iphoneos QMAKE_MAC_SDK = iphoneos
simulator.sdk = iphonesimulator simulator.sdk = iphonesimulator
simulator.target = $${simulator.sdk} simulator.target = simulator
simulator.dir_affix = $${simulator.sdk} simulator.dir_affix = $${simulator.sdk}
simulator.CONFIG = $${simulator.sdk} simulator.CONFIG = $${simulator.sdk}
simulator.deployment_identifier = ios-simulator simulator.deployment_identifier = ios-simulator
device.sdk = iphoneos device.sdk = iphoneos
device.target = $${device.sdk} device.target = device
device.dir_affix = $${device.sdk} device.dir_affix = $${device.sdk}
device.CONFIG = $${device.sdk} device.CONFIG = $${device.sdk}
device.deployment_identifier = $${device.sdk} device.deployment_identifier = $${device.sdk}

18
mkspecs/macx-ios-clang/xcodebuild.mk
View File

@ -40,17 +40,17 @@ $(EXPORT_SUBTARGETS): % : %-build
%-install: ACTION = install %-install: ACTION = install
%-install: xcodebuild-% ; %-install: xcodebuild-% ;
# iOS Simulator doesn't support archiving # Simulator doesn't support archiving
%-iphonesimulator-install: ACTION = build %-simulator-install: ACTION = build
iphonesimulator-install: ACTION = build simulator-install: ACTION = build
# Limit check to a single configuration # Limit check to a single configuration
%-iphoneos-check: check-iphoneos ; %-device-check: check-device ;
%-iphonesimulator-check: check-iphonesimulator ; %-simulator-check: check-simulator ;
# SDK # SDK
%-iphoneos: SDK = iphoneos %-device: SDK = iphoneos
%-iphonesimulator: SDK = iphonesimulator %-simulator: SDK = iphonesimulator
# Configuration # Configuration
release-%: CONFIGURATION = Release release-%: CONFIGURATION = Release
@ -67,8 +67,8 @@ ifneq ($(filter check%,$(MAKECMDGOALS)),)
endif endif
endif endif
%-iphonesimulator: DEVICES = $(firstword $(IPHONESIMULATOR_DEVICES)) %-simulator: DEVICES = $(firstword $(IPHONESIMULATOR_DEVICES))
%-iphoneos: DEVICES = $(IPHONEOS_DEVICES) %-device: DEVICES = $(IPHONEOS_DEVICES)
IPHONEOS_GENERIC_DESTINATION := "generic/platform=iOS" IPHONEOS_GENERIC_DESTINATION := "generic/platform=iOS"
IPHONESIMULATOR_GENERIC_DESTINATION := "id=$(shell xcrun simctl list devices | grep -E 'iPhone|iPad' | grep -v unavailable | perl -lne 'print $$1 if /\((.*?)\)/' | tail -n 1)" IPHONESIMULATOR_GENERIC_DESTINATION := "id=$(shell xcrun simctl list devices | grep -E 'iPhone|iPad' | grep -v unavailable | perl -lne 'print $$1 if /\((.*?)\)/' | tail -n 1)"