Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit a9902ef

Browse files
peter-blivecodeali
peter-b
authored and
livecodeali
committed
Remove support for iPhoneSimulator 6.1 and 7.1
We are retiring support for iPhoneSimulator 6.1 and 7.1 deployment in LiveCode 9, as described in https://livecode.com/updated-platform-support-policy (cherry picked from commit 75b384e)
1 parent b831f91 commit a9902ef

File tree

5 files changed

+22
-50
lines changed

5 files changed

+22
-50
lines changed

‎Installer/package.txt‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -554,45 +554,15 @@ component Runtime.Android
554554
//////////
555555

556556
component Runtime.iOS
557-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-6_1" place
558-
executable ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
559-
executable ios:iphonesimulator6.1/revsecurity.ios-extension as RevSecurity
560-
executable ios:iphonesimulator6.1/revpdfprinter.ios-extension as RevPdfPrinter
561-
executable ios:iphonesimulator6.1/revzip.ios-extension as RevZip
562-
executable ios:iphonesimulator6.1/revxml.ios-extension as RevXml
563-
executable ios:iphonesimulator6.1/revdb.ios-extension as RevDb
564-
executable ios:iphonesimulator6.1/dbsqlite.ios-extension as DbSqlite
565-
executable ios:iphonesimulator6.1/dbmysql.ios-extension as DbMysql
566-
file ios:iphonesimulator6.1/mobile-template.plist as "Settings.plist"
567-
file ios:iphonesimulator6.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
568-
file ios:iphonesimulator6.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
569-
file ios:iphonesimulator6.1/mobile-disable-ats-template.plist as "DisableATS.plist"
570-
file ios:iphonesimulator6.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
571-
file ios:iphonesimulator6.1/fontmap as "fontmap"
572-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-7_1" place
573-
executable ios:iphonesimulator7.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
574-
executable ios:iphonesimulator7.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator6.1/revsecurity.dylib
575-
executable ios:iphonesimulator7.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator6.1/revpdfprinter.dylib
576-
executable ios:iphonesimulator7.1/revzip.ios-extension as RevZip base ios:iphonesimulator6.1/revzip.dylib
577-
executable ios:iphonesimulator7.1/revxml.ios-extension as RevXml base ios:iphonesimulator6.1/revxml.dylib
578-
executable ios:iphonesimulator7.1/revdb.ios-extension as RevDb base ios:iphonesimulator6.1/revdb.dylib
579-
executable ios:iphonesimulator7.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator6.1/dbsqlite.dylib
580-
executable ios:iphonesimulator7.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator6.1/dbmysql.dylib
581-
file ios:iphonesimulator7.1/mobile-template.plist as "Settings.plist"
582-
file ios:iphonesimulator7.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
583-
file ios:iphonesimulator7.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
584-
file ios:iphonesimulator7.1/mobile-disable-ats-template.plist as "DisableATS.plist"
585-
file ios:iphonesimulator7.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
586-
file ios:iphonesimulator7.1/fontmap as "fontmap"
587557
into "[[ToolsFolder]]/Runtime/iOS/Simulator-8_2" place
588-
executable ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
589-
executable ios:iphonesimulator8.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator6.1/revsecurity.dylib
590-
executable ios:iphonesimulator8.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator6.1/revpdfprinter.dylib
591-
executable ios:iphonesimulator8.2/revzip.ios-extension as RevZip base ios:iphonesimulator6.1/revzip.dylib
592-
executable ios:iphonesimulator8.2/revxml.ios-extension as RevXml base ios:iphonesimulator6.1/revxml.dylib
593-
executable ios:iphonesimulator8.2/revdb.ios-extension as RevDb base ios:iphonesimulator6.1/revdb.dylib
594-
executable ios:iphonesimulator8.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator6.1/dbsqlite.dylib
595-
executable ios:iphonesimulator8.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator6.1/dbmysql.dylib
558+
executable ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
559+
executable ios:iphonesimulator8.2/revsecurity.ios-extension as RevSecurity
560+
executable ios:iphonesimulator8.2/revpdfprinter.ios-extension as RevPdfPrinter
561+
executable ios:iphonesimulator8.2/revzip.ios-extension as RevZip
562+
executable ios:iphonesimulator8.2/revxml.ios-extension as RevXml
563+
executable ios:iphonesimulator8.2/revdb.ios-extension as RevDb
564+
executable ios:iphonesimulator8.2/dbsqlite.ios-extension as DbSqlite
565+
executable ios:iphonesimulator8.2/dbmysql.ios-extension as DbMysql
596566
file ios:iphonesimulator8.2/mobile-template.plist as "Settings.plist"
597567
file ios:iphonesimulator8.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
598568
file ios:iphonesimulator8.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"

‎Makefile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ EMMAKE ?= emmake
2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
2828
IPHONEOS_VERSIONS ?= 9.2 10.2
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2
30+
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3031

3132
IOS_SDKS ?= \
3233
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
@@ -142,13 +143,13 @@ compile-ios-%:
142143
check-ios-%:
143144
$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check
144145

145-
# Dummy targets to prevent our build system from building iOS 5.1 simulator
146-
config-ios-iphonesimulator5.1:
147-
@echo "Skipping iOS simulator 5.1 (no longer supported)"
148-
compile-ios-iphonesimulator5.1:
149-
@echo "Skipping iOS simulator 5.1 (no longer supported)"
150-
check-ios-iphonesimulator5.1:
151-
@echo "Skipping iOS simulator 5.1 (no longer supported)"
146+
# Dummy targets to prevent our build system from building old iOS simulators
147+
$(addprefix config-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
148+
@echo "Skipping $@ (no longer supported)"
149+
$(addprefix compile-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
150+
@echo "Skipping $@ (no longer supported)"
151+
$(addprefix check-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
152+
@echo "Skipping $@ (no longer supported)"
152153

153154
# Provide some synonyms for "latest iOS SDK"
154155
$(addsuffix -ios-iphoneos,all config compile check): %: %$(lastword $(IPHONEOS_VERSIONS))

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ local sDeviceSDKs
1818
-- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
1919
-- SDKs and device relying on the engines we provide in the shipped version
2020
function deployUsableIosSdk
21-
return "6.1,7.1,8.2,9.2,10.2"
21+
return "8.2,9.2,10.2"
2222
end deployUsableIosSdk
2323

2424
// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
@@ -46,7 +46,7 @@ function deployGetIphoneOSes
4646
end deployGetIphoneOSes
4747

4848
function deployGetIosMinimumVersions
49-
return "6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3,10.0,10.1,10.2"
49+
return "8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3,10.0,10.1,10.2"
5050
end deployGetIosMinimumVersions
5151

5252
////////////////////////////////////////////////////////////////////////////////

‎prebuilt/fetch-libraries.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ LIBS_ios=( OpenSSL ICU )
1414
LIBS_win32=( OpenSSL Curl ICU CEF )
1515
LIBS_linux=( OpenSSL Curl ICU CEF )
1616
LIBS_emscripten=( ICU )
17-
SUBPLATFORMS_ios=(iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneOS9.2 iPhoneOS10.2)
17+
18+
SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneOS9.2 iPhoneOS10.2)
1819
SUBPLATFORMS_win32=(v140_static_debug v140_static_release)
1920

2021
# Fetch settings

‎tools/setup_xcode_sdks.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Update these lists if you need different SDK versions!
44

55
iphoneos_versions = ["10.2", "9.2"]
6-
iphonesimulator_versions = ["10.2", "9.2", "8.2", "7.1", "6.1"]
6+
iphonesimulator_versions = ["10.2", "9.2", "8.2"]
77
macosx_versions = ["10.9", "10.6"]
88

99
# This tool creates the symlinks required for Xcode builds of LiveCode.

0 commit comments

Comments
 (0)