Rename iOS device and simulator targets
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:
parent
c10a1c8f14
commit
f05d5dfa85
@ -6,13 +6,13 @@ QMAKE_PLATFORM += ios
|
||||
QMAKE_MAC_SDK = iphoneos
|
||||
|
||||
simulator.sdk = iphonesimulator
|
||||
simulator.target = $${simulator.sdk}
|
||||
simulator.target = simulator
|
||||
simulator.dir_affix = $${simulator.sdk}
|
||||
simulator.CONFIG = $${simulator.sdk}
|
||||
simulator.deployment_identifier = ios-simulator
|
||||
|
||||
device.sdk = iphoneos
|
||||
device.target = $${device.sdk}
|
||||
device.target = device
|
||||
device.dir_affix = $${device.sdk}
|
||||
device.CONFIG = $${device.sdk}
|
||||
device.deployment_identifier = $${device.sdk}
|
||||
|
@ -40,17 +40,17 @@ $(EXPORT_SUBTARGETS): % : %-build
|
||||
%-install: ACTION = install
|
||||
%-install: xcodebuild-% ;
|
||||
|
||||
# iOS Simulator doesn't support archiving
|
||||
%-iphonesimulator-install: ACTION = build
|
||||
iphonesimulator-install: ACTION = build
|
||||
# Simulator doesn't support archiving
|
||||
%-simulator-install: ACTION = build
|
||||
simulator-install: ACTION = build
|
||||
|
||||
# Limit check to a single configuration
|
||||
%-iphoneos-check: check-iphoneos ;
|
||||
%-iphonesimulator-check: check-iphonesimulator ;
|
||||
%-device-check: check-device ;
|
||||
%-simulator-check: check-simulator ;
|
||||
|
||||
# SDK
|
||||
%-iphoneos: SDK = iphoneos
|
||||
%-iphonesimulator: SDK = iphonesimulator
|
||||
%-device: SDK = iphoneos
|
||||
%-simulator: SDK = iphonesimulator
|
||||
|
||||
# Configuration
|
||||
release-%: CONFIGURATION = Release
|
||||
@ -67,8 +67,8 @@ ifneq ($(filter check%,$(MAKECMDGOALS)),)
|
||||
endif
|
||||
endif
|
||||
|
||||
%-iphonesimulator: DEVICES = $(firstword $(IPHONESIMULATOR_DEVICES))
|
||||
%-iphoneos: DEVICES = $(IPHONEOS_DEVICES)
|
||||
%-simulator: DEVICES = $(firstword $(IPHONESIMULATOR_DEVICES))
|
||||
%-device: DEVICES = $(IPHONEOS_DEVICES)
|
||||
|
||||
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)"
|
||||
|
Loading…
x
Reference in New Issue
Block a user