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

Commit 1d6ee5d

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop_8.1_03.05.17
Conflicts: Makefile buildbot.py engine/src/exec-interface.cpp engine/src/executionerrors.h engine/src/object.h engine/src/sellst.cpp ide ide-support/revdeploylibraryios.livecodescript prebuilt/fetch-libraries.sh prebuilt/scripts/ios.inc tools/setup_xcode_sdks.py version
2 parents 2428eff + 575678f commit 1d6ee5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+730
-322
lines changed

‎.mention-bot‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"requiredOrgs": ["livecode"]
3+
}

‎Installer/package.txt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,22 @@ component Runtime.iOS
602602
file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
603603
file ios:iphonesimulator10.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
604604
file ios:iphonesimulator10.2/fontmap as "fontmap"
605+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_3" place
606+
executable ios:iphonesimulator10.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
607+
executable ios:iphonesimulator10.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
608+
executable ios:iphonesimulator10.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
609+
executable ios:iphonesimulator10.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
610+
executable ios:iphonesimulator10.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
611+
executable ios:iphonesimulator10.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
612+
executable ios:iphonesimulator10.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
613+
executable ios:iphonesimulator10.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
614+
file ios:iphonesimulator10.3/mobile-template.plist as "Settings.plist"
615+
file ios:iphonesimulator10.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
616+
file ios:iphonesimulator10.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
617+
file ios:iphonesimulator10.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
618+
file ios:iphonesimulator10.3/mobile-disable-ats-template.plist as "DisableATS.plist"
619+
file ios:iphonesimulator10.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
620+
file ios:iphonesimulator10.3/fontmap as "fontmap"
605621
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
606622
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
607623
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -642,6 +658,26 @@ component Runtime.iOS
642658
file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
643659
file ios:iphoneos10.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
644660
file ios:iphoneos10.2/fontmap as "fontmap"
661+
into "[[ToolsFolder]]/Runtime/iOS/Device-10_3" place
662+
executable ios:iphoneos10.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
663+
executable ios:iphoneos10.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
664+
executable ios:iphoneos10.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
665+
executable ios:iphoneos10.3/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
666+
executable ios:iphoneos10.3/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
667+
executable ios:iphoneos10.3/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
668+
executable ios:iphoneos10.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
669+
executable ios:iphoneos10.3/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
670+
file ios:iphoneos10.3/mobile-device-template.plist as "Settings.plist"
671+
file ios:iphoneos10.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
672+
file ios:iphoneos10.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
673+
file ios:iphoneos10.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
674+
file ios:iphoneos10.3/template-entitlements.xcent as "Entitlements.xcent"
675+
file ios:iphoneos10.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
676+
file ios:iphoneos10.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
677+
file ios:iphoneos10.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
678+
file ios:iphoneos10.3/mobile-disable-ats-template.plist as "DisableATS.plist"
679+
file ios:iphoneos10.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
680+
file ios:iphoneos10.3/fontmap as "fontmap"
645681

646682
////////////////////////////////////////////////////////////////////////////////
647683

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

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
28-
IPHONEOS_VERSIONS ?= 9.2 10.2
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 10.3
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 10.3
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
IOS_SDKS ?= \

‎buildbot.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@
4242
'x86_64-linux-debian8',
4343
'armv6-android-api9',
4444
'universal-mac-macosx10.9', # Minimum deployment target
45+
'universal-ios-iphoneos10.3',
4546
'universal-ios-iphoneos10.2',
4647
'universal-ios-iphoneos9.2',
48+
'universal-ios-iphonesimulator10.3',
4749
'universal-ios-iphonesimulator10.2',
4850
'universal-ios-iphonesimulator9.2',
4951
'universal-ios-iphonesimulator8.2',

‎config/ios.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x',
4444

4545
'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
46-
'DEVELOPMENT_TEAM': 'SA2BUJR53Y',
46+
'DEVELOPMENT_TEAM': 'KR649NSGHP',
4747
},
4848

4949
'target_defaults':

‎docs/dictionary/property/mirrored.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Associations: player
1212

1313
Introduced: 6.7
1414

15-
OS: mac
15+
OS: mac, windows
1616

1717
Platforms: desktop
1818

‎docs/notes/bugfix-15997.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Implement player 'mirrored' property on Windows

‎docs/notes/bugfix-17850.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix inconsistent browser callbacks in browser widget on iOS

‎docs/notes/bugfix-19026.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix DNS resolver issue causing connection hang when using tsNet on Linux

‎docs/notes/bugfix-19327.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix incorrect browser widget location when stack has a menu on OSX

0 commit comments

Comments
 (0)