Fix defining extra simulators so that they're actually installed.

The system-dependencies.sh script greps in Make.config for the
EXTRA_SIMULATORS variable, and the grepping wasn't able to correctly parse the
previous variable definition, so make it simpler so that
system-dependencies.sh understands it.
This commit is contained in:
Rolf Bjarne Kvinge 2019-05-07 07:58:00 +02:00
Родитель af30ef8a7d
Коммит 895d8ad9b8
1 изменённых файлов: 1 добавлений и 3 удалений

Просмотреть файл

@ -90,8 +90,6 @@ MIN_WATCHOS_SDK_VERSION=2.0
MIN_WATCH_OS_VERSION=1.0
MIN_TVOS_SDK_VERSION=9.0
EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK10_3
# The min simulator version available in the Xcode we're using
MIN_IOS_SIMULATOR_VERSION=8.1
MIN_WATCHOS_SIMULATOR_VERSION=2.0
@ -99,7 +97,7 @@ MIN_WATCHOS_SIMULATOR_VERSION=2.0
MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=9.0
MIN_TVOS_SIMULATOR_VERSION=9.0
# These are the simulator package ids for the versions above
EXTRA_SIMULATORS+=" com.apple.pkg.iPhoneSimulatorSDK8_1 com.apple.pkg.iPhoneSimulatorSDK9_0 com.apple.pkg.AppleTVSimulatorSDK9_0 com.apple.pkg.WatchSimulatorSDK2_0"
EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK10_3 com.apple.pkg.iPhoneSimulatorSDK8_1 com.apple.pkg.iPhoneSimulatorSDK9_0 com.apple.pkg.AppleTVSimulatorSDK9_0 com.apple.pkg.WatchSimulatorSDK2_0
INCLUDE_IOS=1
INCLUDE_MAC=1