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

Commit 6a3db80

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-8.2' into HEAD
2 parents 0c6d117 + 7ee8116 commit 6a3db80

39 files changed

+203
-143
lines changed

‎Installer/package.txt‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -635,22 +635,22 @@ component Runtime.iOS
635635
file ios:iphonesimulator10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
636636
file ios:iphonesimulator10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
637637
file ios:iphonesimulator10.2/fontmap as "fontmap"
638-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_3" place
639-
executable ios:iphonesimulator10.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
640-
executable ios:iphonesimulator10.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
641-
executable ios:iphonesimulator10.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
642-
executable ios:iphonesimulator10.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
643-
executable ios:iphonesimulator10.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
644-
executable ios:iphonesimulator10.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
645-
executable ios:iphonesimulator10.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
646-
executable ios:iphonesimulator10.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
647-
file ios:iphonesimulator10.3/mobile-template.plist as "Settings.plist"
648-
file ios:iphonesimulator10.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
649-
file ios:iphonesimulator10.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
650-
file ios:iphonesimulator10.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
651-
file ios:iphonesimulator10.3/mobile-disable-ats-template.plist as "DisableATS.plist"
652-
file ios:iphonesimulator10.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
653-
file ios:iphonesimulator10.3/fontmap as "fontmap"
638+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_0" place
639+
executable ios:iphonesimulator11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
640+
executable ios:iphonesimulator11.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
641+
executable ios:iphonesimulator11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
642+
executable ios:iphonesimulator11.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
643+
executable ios:iphonesimulator11.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
644+
executable ios:iphonesimulator11.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
645+
executable ios:iphonesimulator11.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
646+
executable ios:iphonesimulator11.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
647+
file ios:iphonesimulator11.0/mobile-template.plist as "Settings.plist"
648+
file ios:iphonesimulator11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
649+
file ios:iphonesimulator11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
650+
file ios:iphonesimulator11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
651+
file ios:iphonesimulator11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
652+
file ios:iphonesimulator11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
653+
file ios:iphonesimulator11.0/fontmap as "fontmap"
654654
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
655655
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
656656
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -691,26 +691,26 @@ component Runtime.iOS
691691
file ios:iphoneos10.2/mobile-disable-ats-template.plist as "DisableATS.plist"
692692
file ios:iphoneos10.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
693693
file ios:iphoneos10.2/fontmap as "fontmap"
694-
into "[[ToolsFolder]]/Runtime/iOS/Device-10_3" place
695-
executable ios:iphoneos10.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
696-
executable ios:iphoneos10.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
697-
executable ios:iphoneos10.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
698-
executable ios:iphoneos10.3/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
699-
executable ios:iphoneos10.3/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
700-
executable ios:iphoneos10.3/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
701-
executable ios:iphoneos10.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
702-
executable ios:iphoneos10.3/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
703-
file ios:iphoneos10.3/mobile-device-template.plist as "Settings.plist"
704-
file ios:iphoneos10.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
705-
file ios:iphoneos10.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
706-
file ios:iphoneos10.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
707-
file ios:iphoneos10.3/template-entitlements.xcent as "Entitlements.xcent"
708-
file ios:iphoneos10.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
709-
file ios:iphoneos10.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
710-
file ios:iphoneos10.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
711-
file ios:iphoneos10.3/mobile-disable-ats-template.plist as "DisableATS.plist"
712-
file ios:iphoneos10.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
713-
file ios:iphoneos10.3/fontmap as "fontmap"
694+
into "[[ToolsFolder]]/Runtime/iOS/Device-11_0" place
695+
executable ios:iphoneos11.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
696+
executable ios:iphoneos11.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
697+
executable ios:iphoneos11.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
698+
executable ios:iphoneos11.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
699+
executable ios:iphoneos11.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
700+
executable ios:iphoneos11.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
701+
executable ios:iphoneos11.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
702+
executable ios:iphoneos11.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
703+
file ios:iphoneos11.0/mobile-device-template.plist as "Settings.plist"
704+
file ios:iphoneos11.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
705+
file ios:iphoneos11.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
706+
file ios:iphoneos11.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
707+
file ios:iphoneos11.0/template-entitlements.xcent as "Entitlements.xcent"
708+
file ios:iphoneos11.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
709+
file ios:iphoneos11.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
710+
file ios:iphoneos11.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
711+
file ios:iphoneos11.0/mobile-disable-ats-template.plist as "DisableATS.plist"
712+
file ios:iphoneos11.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
713+
file ios:iphoneos11.0/fontmap as "fontmap"
714714

715715
////////////////////////////////////////////////////////////////////////////////
716716

@@ -728,12 +728,10 @@ component Externals.Linux
728728
component Externals.Windows
729729
into [[TargetFolder]]/Externals place
730730
executable windows:revspeech.dll
731-
executable windows:revvideograbber.dll
732731
executable windows:revxml.dll
733732
executable windows:revbrowser.dll
734733
executable windows:revzip.dll
735734
declare external "Speech" using revspeech.dll
736-
declare external "Video Grabber" using revvideograbber.dll
737735
declare external "XML" using revxml.dll
738736
declare external "Browser" using revbrowser.dll
739737
declare external "Revolution Zip" using revzip.dll

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

3232
IOS_SDKS ?= \

‎buildbot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
'x86_64-linux-debian8',
4343
'armv6-android-api9',
4444
'universal-mac-macosx10.9', # Minimum deployment target
45-
'universal-ios-iphoneos10.3',
45+
'universal-ios-iphoneos11.0',
4646
'universal-ios-iphoneos10.2',
4747
'universal-ios-iphoneos9.2',
48-
'universal-ios-iphonesimulator10.3',
48+
'universal-ios-iphonesimulator11.0',
4949
'universal-ios-iphonesimulator10.2',
5050
'universal-ios-iphonesimulator9.2',
5151
'universal-ios-iphonesimulator8.2',

‎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 = "2017-9-4"
4-
constant kTSNetVersion = "1.3.1"
3+
constant kMergExtVersion = "2017-9-25"
4+
constant kTSNetVersion = "1.3.2"
55

66
local sEngineDir
77
local sWorkDir

‎config.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ def guess_xcode_arch(target_sdk):
203203
if sdk == 'iphoneos':
204204
if int(ver) < 8:
205205
return 'armv7'
206+
elif int(ver) >= 11:
207+
return 'arm64'
206208
else:
207209
return 'armv7 arm64'
208210
if sdk == 'iphonesimulator':

‎docs/dictionary/command/cancel.lcdoc‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,23 @@ that card or stack. For example, you might have queued a number of
5757
<message|messages> that create an animated display on the current
5858
<card>, and need to <cancel> them when the user goes to another <card>.
5959
The best solution in a case like this is to place each <messageQueueID>
60-
in a <script local variable>, a <global> <variable>, or a <custom
61-
property> at the time the <message> is sent. Then you can <cancel> all
62-
those <message|messages> in a <repeat> <loop> :
60+
in a <script local variable>, a <global> <variable>, or a
61+
<custom property> at the time the <message> is sent. Then you can
62+
<cancel> all those <message|messages> in a <repeat> <loop> :
6363

64-
global myPendingMessages # you've stored the message IDs here
64+
global gMyPendingMessages # you've stored the message IDs here
6565
on closeCard
66-
67-
repeat for each line thisMessageID in myPendingMessages
68-
69-
cancel thisMessageID
70-
71-
end repeat
66+
repeat for each line tThisMessageID in gMyPendingMessages
67+
cancel tThisMessageID
68+
end repeat
7269
end closeCard
7370

7471

7572
References: send (command), function (control structure),
76-
repeat (control structure), flushEvents (function), (function),
77-
result (function), command (glossary), custom property (glossary),
78-
global (glossary), loop (glossary), message (glossary), (glossary),
73+
repeat (control structure), flushEvents (function),
74+
pendingMessages (function), result (function), command (glossary),
75+
custom property (glossary), global (glossary), loop (glossary),
76+
message (glossary), script local variable (glossary),
7977
variable (glossary), item (keyword), card (object), stack (object)
8078

8179
Tags: messages

‎docs/dictionary/command/choose.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ Use the <choose> <command> to <select> <object|objects>, create
5353
The tool you choose is effective for all editable windows, until you
5454
choose another tool. (The Browse tool is always in effect for stacks
5555
whose cantModify <property> is true, and for <stacks> being displayed as
56-
a <palette>, <modeless dialog box|modeless dialog>, or <modal dialog
57-
box|modal dialog>.)
56+
a <palette>, <modeless dialog box|modeless dialog>, or
57+
<modal dialog box|modal dialog>.)
5858

5959
All types of graphics are drawn with the single Graphic tool. To draw a
6060
specific shape, first draw with the Graphic tool, then set the style
6161
<property> of the new <graphic> to the shape you want. (You can also set
6262
the <style> of the <templateGraphic> to the shape you want, then draw
63-
the <graphic> with the Graphic <tool(function)>. The <graphic> icons on
63+
the <graphic> with the Graphic tool. The <graphic> icons on
6464
the Tools <palette> work this way: each one sets the <style> of the
6565
<templateGraphic>, then chooses the Graphic tool.)
6666

‎docs/dictionary/command/clone.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ control>, the clone is also <owner|owned> by the <group>.
5050
> visible
5151
>property set to false.
5252

53-
If the <object(glossary)> is a <card>, the copy becomes the <current
54-
card>.
53+
If the <object(glossary)> is a <card>, the copy becomes the
54+
<current card>.
5555

5656
If the <object(glossary)> is a <stack>, the newly created <stack> is
5757
opened. It is named "Copy of" and the stack's name.
@@ -65,7 +65,7 @@ References: create card (command), paste (command), group (command),
6565
copy (command), create stack (command), clipboard (function),
6666
object (glossary), grouped control (glossary), current card (glossary),
6767
owner (glossary), command (glossary), card (keyword), control (keyword),
68-
it Keyword (keyword), newAudioclip (message), newButton (message),
68+
it (keyword), newAudioclip (message), newButton (message),
6969
newCard (message), newGroup (message), newPlayer (message),
7070
newGraphic (message), newField (message), newScrollbar (message),
7171
newEPS (message), newImage (message), newVideoclip (message),

‎docs/dictionary/command/close-file.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ defaultFolder.
3535

3636
The result:
3737
If you try to close a file that is not already open, the result function
38-
is set to.
38+
is set to "file is not open".
3939

4040
Description:
4141
Use the <close file> <command> to release a <file> after reading from it

‎docs/dictionary/command/close-printing.lcdoc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ batch. The <close printing> <command> prints out this batch of
3939
<card(object)|cards> on a page.
4040

4141
If no <print> <card(keyword)> <command|commands> have been
42-
<execute|executed> since the <open printing> <command>, the <close
43-
printing> <command> prints a blank page. If you used theform of the
44-
<open printing> <command>, and the user canceled the <dialog
45-
box|dialog>, you don't need to issue a <close printing> <command>.
42+
<execute|executed> since the <open printing> <command>, the
43+
<close printing> <command> prints a blank page. If you used the form
44+
of the <open printing> <command>, and the user canceled the
45+
<dialog box|dialog>, you don't need to issue a <close printing>
46+
<command>.
4647

4748
References: print (command), close (command), open printing (command),
4849
cancel printing (command), dialog box (glossary), print job (glossary),

0 commit comments

Comments
 (0)