Skip to content

Commit 5eb416e

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop_9.0_05.06.18
2 parents 4338d77 + 899cd79 commit 5eb416e

File tree

66 files changed

+609
-762
lines changed

Some content is hidden

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

66 files changed

+609
-762
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -684,22 +684,22 @@ component Runtime.iOS
684684
file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
685685
file ios:iphonesimulator11.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
686686
file ios:iphonesimulator11.2/fontmap as "fontmap"
687-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_3" place
688-
executable ios:iphonesimulator11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
689-
executable ios:iphonesimulator11.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
690-
executable ios:iphonesimulator11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
691-
executable ios:iphonesimulator11.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
692-
executable ios:iphonesimulator11.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
693-
executable ios:iphonesimulator11.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
694-
executable ios:iphonesimulator11.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
695-
executable ios:iphonesimulator11.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
696-
file ios:iphonesimulator11.3/mobile-template.plist as "Settings.plist"
697-
file ios:iphonesimulator11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
698-
file ios:iphonesimulator11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
699-
file ios:iphonesimulator11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
700-
file ios:iphonesimulator11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
701-
file ios:iphonesimulator11.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
702-
file ios:iphonesimulator11.3/fontmap as "fontmap"
687+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_4" place
688+
executable ios:iphonesimulator11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
689+
executable ios:iphonesimulator11.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
690+
executable ios:iphonesimulator11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
691+
executable ios:iphonesimulator11.4/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
692+
executable ios:iphonesimulator11.4/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
693+
executable ios:iphonesimulator11.4/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
694+
executable ios:iphonesimulator11.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
695+
executable ios:iphonesimulator11.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
696+
file ios:iphonesimulator11.4/mobile-template.plist as "Settings.plist"
697+
file ios:iphonesimulator11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
698+
file ios:iphonesimulator11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
699+
file ios:iphonesimulator11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
700+
file ios:iphonesimulator11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
701+
file ios:iphonesimulator11.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
702+
file ios:iphonesimulator11.4/fontmap as "fontmap"
703703
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
704704
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
705705
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -760,26 +760,26 @@ component Runtime.iOS
760760
file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
761761
file ios:iphoneos11.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
762762
file ios:iphoneos11.2/fontmap as "fontmap"
763-
into "[[ToolsFolder]]/Runtime/iOS/Device-11_3" place
764-
executable ios:iphoneos11.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
765-
executable ios:iphoneos11.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
766-
executable ios:iphoneos11.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
767-
executable ios:iphoneos11.3/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
768-
executable ios:iphoneos11.3/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
769-
executable ios:iphoneos11.3/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
770-
executable ios:iphoneos11.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
771-
executable ios:iphoneos11.3/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
772-
file ios:iphoneos11.3/mobile-device-template.plist as "Settings.plist"
773-
file ios:iphoneos11.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
774-
file ios:iphoneos11.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
775-
file ios:iphoneos11.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
776-
file ios:iphoneos11.3/template-entitlements.xcent as "Entitlements.xcent"
777-
file ios:iphoneos11.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
778-
file ios:iphoneos11.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
779-
file ios:iphoneos11.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
780-
file ios:iphoneos11.3/mobile-disable-ats-template.plist as "DisableATS.plist"
781-
file ios:iphoneos11.3/[email protected] as "Default4InchSplash.png" base ios:[email protected]
782-
file ios:iphoneos11.3/fontmap as "fontmap"
763+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_4" place
764+
executable ios:iphoneos11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
765+
executable ios:iphoneos11.4/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
766+
executable ios:iphoneos11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
767+
executable ios:iphoneos11.4/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
768+
executable ios:iphoneos11.4/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
769+
executable ios:iphoneos11.4/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
770+
executable ios:iphoneos11.4/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
771+
executable ios:iphoneos11.4/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
772+
file ios:iphoneos11.4/mobile-device-template.plist as "Settings.plist"
773+
file ios:iphoneos11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
774+
file ios:iphoneos11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
775+
file ios:iphoneos11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
776+
file ios:iphoneos11.4/template-entitlements.xcent as "Entitlements.xcent"
777+
file ios:iphoneos11.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
778+
file ios:iphoneos11.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
779+
file ios:iphoneos11.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
780+
file ios:iphoneos11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
781+
file ios:iphoneos11.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
782+
file ios:iphoneos11.4/fontmap as "fontmap"
783783

784784
////////////////////////////////////////////////////////////////////////////////
785785

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

3232
IOS_SDKS ?= \

‎buildbot.py‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,6 @@
3636
import config
3737
import fetch
3838

39-
# The set of platforms for which this branch supports automated builds
40-
BUILDBOT_PLATFORM_TRIPLES = (
41-
'x86-linux-debian8',
42-
'x86_64-linux-debian8',
43-
'armv6-android-api9',
44-
'universal-mac-macosx10.9', # Minimum deployment target
45-
'universal-ios-iphoneos11.3',
46-
'universal-ios-iphoneos11.2',
47-
'universal-ios-iphoneos10.2',
48-
'universal-ios-iphoneos9.2',
49-
'universal-ios-iphonesimulator11.3',
50-
'universal-ios-iphonesimulator11.2',
51-
'universal-ios-iphonesimulator10.2',
52-
'universal-ios-iphonesimulator9.2',
53-
'universal-ios-iphonesimulator8.2',
54-
'x86-win32', # TODO[2017-03-23] More specific ABI
55-
'x86_64-win32',
56-
'js-emscripten-sdk1.35',
57-
)
5839
# The set of build tasks that this branch supports
5940
BUILDBOT_TARGETS = ('fetch', 'config', 'compile', 'bin-archive', 'bin-extract',
6041
'dist-notes', 'dist-docs', 'dist-server', 'dist-tools', 'dist-upload',
@@ -104,7 +85,7 @@ def get_build_edition():
10485
def check_target_triple():
10586
# Check that this branch can actually be built for the specified platform
10687
triple = get_target_triple()
107-
if not triple in BUILDBOT_PLATFORM_TRIPLES:
88+
if not triple in config.BUILDBOT_PLATFORM_TRIPLES:
10889
print('Buildbot build for "{}" platform is not supported'.format(triple))
10990
sys.exit(SKIP_EXIT_STATUS)
11091

‎builder/builder_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2018-4-4"
3+
constant kMergExtVersion = "2018-6-4"
44
constant kTSNetVersion = "1.3.5"
55

66
local sEngineDir

‎config.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,26 @@
2121
import os
2222
import subprocess
2323

24+
# The set of platforms for which this branch supports automated builds
25+
BUILDBOT_PLATFORM_TRIPLES = (
26+
'x86-linux-debian8',
27+
'x86_64-linux-debian8',
28+
'armv6-android-api9',
29+
'universal-mac-macosx10.9', # Minimum deployment target
30+
'universal-ios-iphoneos11.4',
31+
'universal-ios-iphoneos11.2',
32+
'universal-ios-iphoneos10.2',
33+
'universal-ios-iphoneos9.2',
34+
'universal-ios-iphonesimulator11.4',
35+
'universal-ios-iphonesimulator11.2',
36+
'universal-ios-iphonesimulator10.2',
37+
'universal-ios-iphonesimulator9.2',
38+
'universal-ios-iphonesimulator8.2',
39+
'x86-win32', # TODO[2017-03-23] More specific ABI
40+
'x86_64-win32',
41+
'js-emscripten-sdk1.35',
42+
)
43+
2444
KNOWN_PLATFORMS = (
2545
'linux-x86', 'linux-x86_64', 'android-armv6',
2646
'mac', 'ios', 'win-x86', 'win-x86_64', 'emscripten'

‎docs/dictionary/command/mobileComposeHtmlMail.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Set by <mobileComposeHtmlMail> to indicate its results.
6969

7070
Description:
7171
Use the <mobileComposeHtmlMail> <command> to create an HTML email
72-
message with attachments from within a <stack on iOS or Android>.
72+
message with attachments from within a <stack> on iOS or Android.
7373

7474
This command interfaces with the iOS and Android mail composition
7575
interface
@@ -100,7 +100,7 @@ function. This returns true if the mail client is configured.
100100
References: revMail (command), revGoURL (command),
101101
revMailUnicode (command), mobileComposeUnicodeMail (command),
102102
mobileComposeMail (command), mobileCanSendMail (function),
103-
command (glossary), stack on iOS or Android (object)
103+
command (glossary), stack (object)
104104

105105
Tags: networking
106106

‎docs/dictionary/command/mobileComposeUnicodeMail.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Set by <mobileComposeUnicodeMail> to indicate its results.
6969

7070
Description:
7171
Use the <mobileComposeUnicodeMail> <command> to create a unicode email
72-
message with attachments from within a <stack on iOS or Android>.
72+
message with attachments from within a <stack> on iOS or Android.
7373

7474
This command interfaces with the iOS and Android mail composition
7575
interface
@@ -100,7 +100,7 @@ function. This returns true if the mail client is configured.
100100
References: revMail (command), revGoURL (command),
101101
revMailUnicode (command), mobileComposeMail (command),
102102
mobileComposeHtmlMail (command), mobileCanSendMail (function),
103-
command (glossary), stack on iOS or Android (object)
103+
command (glossary), stack (object)
104104

105105
Tags: networking
106106

‎docs/dictionary/command/mobileControlCreate.lcdoc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ cannot be an integer.
5454

5555
The result:
5656
The unique (numeric) id for the new control is returned in
57-
<the result>.
57+
<result|the result>.
5858

5959
Description:
6060
Low-level support has been added for creating and manipulating some
@@ -64,12 +64,15 @@ Native mobile iOS and Android controllers can only be created
6464
dynamically in script.
6565

6666
To destroy a native control use: <mobileControlDelete>
67+
6768
To configure a native control use: <mobileControlSet>
69+
6870
To read a property of a native control use: <mobileControlGet>
71+
6972
To control the behavior of a native control use: <mobileControlDo>
7073

7174
References: mobileControlDelete (command), mobileControlDo (command),
72-
mobileControlSet (command), mobileControlGet (command),
75+
mobileControlSet (command),
7376
mobileControlGet (function), mobileControlTarget (function),
74-
the result (function), mobileControls (function)
77+
result (function), mobileControls (function)
7578

‎docs/dictionary/command/mobileCreateLocalNotification.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ The id of the local notification that is created is returned by the
5050

5151
Description:
5252
Use the <mobileCreateLocalNotification> <command> to schedule a Local
53-
Notification with the operating system from within a <stack on iOS or
54-
Android>.
53+
Notification with the operating system from within a <stack> on iOS or
54+
Android.
5555

5656
This command schedules Local Notifications with the iOS or Android
5757
operating sytem and delivers the <alertPayload> to the application. The
@@ -61,7 +61,7 @@ message.
6161
References: mobileCancelAllLocalNotifications (command),
6262
mobileCancelLocalNotification (command), result (function),
6363
command (glossary), localNotificationReceived (message),
64-
stack on iOS or Android (object)
64+
stack (object)
6565

6666
Tags: networking
6767

‎docs/dictionary/function/mobileCanMakePurchase.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ end if
2424
Returns (enum):
2525
Returns a boolean result:
2626

27-
- true: in:app purchases can be made
28-
- false: in:app purchases cannot be made
27+
- true: in-app purchases can be made
28+
- false: in-app purchases cannot be made
2929

3030

3131
Description:

0 commit comments

Comments
 (0)