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

Commit 246739d

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop_8.1_09.01.17
2 parents 1b03bf4 + 36ea5f4 commit 246739d

Some content is hidden

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

41 files changed

+415
-219
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -612,22 +612,22 @@ component Runtime.iOS
612612
file ios:iphonesimulator9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
613613
file ios:iphonesimulator9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
614614
file ios:iphonesimulator9.2/fontmap as "fontmap"
615-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_1" place
616-
executable ios:iphonesimulator10.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
617-
executable ios:iphonesimulator10.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
618-
executable ios:iphonesimulator10.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
619-
executable ios:iphonesimulator10.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
620-
executable ios:iphonesimulator10.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
621-
executable ios:iphonesimulator10.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
622-
executable ios:iphonesimulator10.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
623-
executable ios:iphonesimulator10.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
624-
file ios:iphonesimulator10.1/mobile-template.plist as "Settings.plist"
625-
file ios:iphonesimulator10.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
626-
file ios:iphonesimulator10.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
627-
file ios:iphonesimulator10.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
628-
file ios:iphonesimulator10.1/mobile-disable-ats-template.plist as "DisableATS.plist"
629-
file ios:iphonesimulator10.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
630-
file ios:iphonesimulator10.1/fontmap as "fontmap"
615+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_2" place
616+
executable ios:iphonesimulator10.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
617+
executable ios:iphonesimulator10.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
618+
executable ios:iphonesimulator10.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
619+
executable ios:iphonesimulator10.2/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
620+
executable ios:iphonesimulator10.2/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
621+
executable ios:iphonesimulator10.2/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
622+
executable ios:iphonesimulator10.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
623+
executable ios:iphonesimulator10.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
624+
file ios:iphonesimulator10.2/mobile-template.plist as "Settings.plist"
625+
file ios:iphonesimulator10.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
626+
file ios:iphonesimulator10.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
627+
file ios:iphonesimulator10.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
628+
file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
629+
file ios:iphonesimulator10.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
630+
file ios:iphonesimulator10.2/fontmap as "fontmap"
631631
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
632632
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
633633
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -648,26 +648,26 @@ component Runtime.iOS
648648
file ios:iphoneos9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
649649
file ios:iphoneos9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
650650
file ios:iphoneos9.2/fontmap as "fontmap"
651-
into "[[ToolsFolder]]/Runtime/iOS/Device-10_1" place
652-
executable ios:iphoneos10.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
653-
executable ios:iphoneos10.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
654-
executable ios:iphoneos10.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
655-
executable ios:iphoneos10.1/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
656-
executable ios:iphoneos10.1/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
657-
executable ios:iphoneos10.1/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
658-
executable ios:iphoneos10.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
659-
executable ios:iphoneos10.1/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
660-
file ios:iphoneos10.1/mobile-device-template.plist as "Settings.plist"
661-
file ios:iphoneos10.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
662-
file ios:iphoneos10.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
663-
file ios:iphoneos10.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
664-
file ios:iphoneos10.1/template-entitlements.xcent as "Entitlements.xcent"
665-
file ios:iphoneos10.1/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
666-
file ios:iphoneos10.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
667-
file ios:iphoneos10.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
668-
file ios:iphoneos10.1/mobile-disable-ats-template.plist as "DisableATS.plist"
669-
file ios:iphoneos10.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
670-
file ios:iphoneos10.1/fontmap as "fontmap"
651+
into "[[ToolsFolder]]/Runtime/iOS/Device-10_2" place
652+
executable ios:iphoneos10.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
653+
executable ios:iphoneos10.2/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
654+
executable ios:iphoneos10.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
655+
executable ios:iphoneos10.2/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
656+
executable ios:iphoneos10.2/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
657+
executable ios:iphoneos10.2/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
658+
executable ios:iphoneos10.2/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
659+
executable ios:iphoneos10.2/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
660+
file ios:iphoneos10.2/mobile-device-template.plist as "Settings.plist"
661+
file ios:iphoneos10.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
662+
file ios:iphoneos10.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
663+
file ios:iphoneos10.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
664+
file ios:iphoneos10.2/template-entitlements.xcent as "Entitlements.xcent"
665+
file ios:iphoneos10.2/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
666+
file ios:iphoneos10.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
667+
file ios:iphoneos10.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
668+
file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
669+
file ios:iphoneos10.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
670+
file ios:iphoneos10.2/fontmap as "fontmap"
671671

672672
////////////////////////////////////////////////////////////////////////////////
673673

‎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.1
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.1
28+
IPHONEOS_VERSIONS ?= 9.2 10.2
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \

‎builder/builder_utilities.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2016-10-26"
4-
constant kTSNetVersion = "1.2.5"
3+
constant kMergExtVersion = "2016-12-22"
4+
constant kTSNetVersion = "1.2.6"
55

66
local sEngineDir
77
local sWorkDir

‎docs/notes/bugfix-18778.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Send standalone saving messages at correct time

‎docs/notes/bugfix-18871.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Add support for upper and lower case field shortcuts on Mac

‎docs/notes/bugfix-18969.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Add builtin implementation of field 'Select All'
2+
3+
The field control will now understand Cmd/Ctrl+A as the 'Select All'
4+
action - causing the whole text of the field to be selected.

‎docs/notes/bugfix-18982.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Improve shift+click behavior of text selection in XPDF

‎docs/notes/bugfix-19003.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Stackfiles under the mainstack path preserve folder structure in standalone

‎docs/notes/bugfix-19004.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Improve efficiency of compiled regex cache
2+
3+
The efficiency of lookups of previously compiled regexs has been
4+
improved. To take full advantage of the regex cache make sure
5+
that you either use a string constant for the regex pattern, or
6+
a variable which is not mutated between uses. e.g.
7+
8+
get matchText(tTarget, "someregexpattern") -- efficient
9+
get matchText(tTarget, tUnchangedPatternVar) -- efficient
10+
get matchText(tTarget, tPatternPrefix & tPatternSuffix) -- inefficient
11+
12+
In general you will only gain advantage from the regex cache
13+
if you repeated use the same regex pattern in the way described
14+
above repeatedly in a tight loop.

‎docs/notes/bugfix-19005.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Ensure matchText and replaceText don't affect target string
2+
3+
Previously calling matchText or replaceText on a string would
4+
cause subsequent uses of that string to use slower codepaths
5+
causing unexpected performance degredation.

0 commit comments

Comments
 (0)