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

Commit 6c279f5

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop-9.0-20.06.2019
2 parents c00c24f + ba425f0 commit 6c279f5

49 files changed

Lines changed: 348 additions & 197 deletions

Some content is hidden

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

‎Installer/package.txt‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -847,18 +847,23 @@ component Externals.MacOSX
847847
component Externals.CEF.Linux
848848
into [[TargetFolder]]/Externals/CEF place
849849
executable linux-[[TargetArchitecture]]:Externals/CEF/libcef.so
850+
executable linux-[[TargetArchitecture]]:Externals/CEF/libEGL.so
851+
executable linux-[[TargetArchitecture]]:Externals/CEF/libGLESv2.so
852+
executable linux-[[TargetArchitecture]]:Externals/CEF/chrome-sandbox
850853
rfolder linux-[[TargetArchitecture]]:Externals/CEF/locales
851854
file linux-[[TargetArchitecture]]:Externals/CEF/cef.pak
852855
file linux-[[TargetArchitecture]]:Externals/CEF/cef_100_percent.pak
853856
file linux-[[TargetArchitecture]]:Externals/CEF/cef_200_percent.pak
854857
file linux-[[TargetArchitecture]]:Externals/CEF/cef_extensions.pak
855-
858+
file linux-[[TargetArchitecture]]:Externals/CEF/icudtl.dat
859+
file linux-[[TargetArchitecture]]:Externals/CEF/natives_blob.bin
860+
file linux-[[TargetArchitecture]]:Externals/CEF/snapshot_blob.bin
861+
file linux-[[TargetArchitecture]]:Externals/CEF/v8_context_snapshot.bin
862+
into [[TargetFolder]]/Externals/CEF/swiftshader place
863+
executable linux-[[TargetArchitecture]]:Externals/CEF/swiftshader/libEGL.so
864+
executable linux-[[TargetArchitecture]]:Externals/CEF/swiftshader/libGLESv2.so
856865
// Horrible workaround for a libCEF bug
857866
into [[TargetFolder]] place
858-
file linux-[[TargetArchitecture]]:icudtl.dat
859-
file linux-[[TargetArchitecture]]:natives_blob.bin
860-
file linux-[[TargetArchitecture]]:snapshot_blob.bin
861-
file linux-[[TargetArchitecture]]:v8_context_snapshot.bin
862867
executable linux-[[TargetArchitecture]]:revbrowser-cefprocess
863868
executable linux-[[TargetArchitecture]]:libbrowser-cefprocess
864869

@@ -867,7 +872,6 @@ component Externals.CEF.Windows
867872
executable win-[[TargetArchitecture]]:libbrowser-cefprocess.exe
868873
executable win-[[TargetArchitecture]]:revbrowser-cefprocess.exe
869874
executable win-[[TargetArchitecture]]:Externals/CEF/libcef.dll
870-
executable win-[[TargetArchitecture]]:Externals/CEF/d3dcompiler_43.dll
871875
executable win-[[TargetArchitecture]]:Externals/CEF/d3dcompiler_47.dll
872876
executable win-[[TargetArchitecture]]:Externals/CEF/libEGL.dll
873877
executable win-[[TargetArchitecture]]:Externals/CEF/libGLESv2.dll

‎builder/tools_builder.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,8 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
530530
put tInstallerStackFile into tParams["stackfile"]
531531
put tOutputFileStub & ".app" & slash & "Contents/MacOS/Installer" into tParams["output"]
532532

533-
-- We deploy as 32-bit only for now as the 64-bit slice isn't neccessary
534-
put "i386" into tParams["architectures"]
533+
-- We deploy as 64-bit only as 32-bit apps will be blocked on MacOS 10.15+
534+
put "x86-64" into tParams["architectures"]
535535

536536
put url ("binfile:" & pPackageFile) into url ("binfile:" & tOutputFileStub & ".app" & slash & "Contents/Resources/payload")
537537

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ close file (command), answer file (command), return (constant),
154154
function (control structure), result (function), tempName (function),
155155
textDecode (function), textEncode (function), return (glossary),
156156
null (glossary), property (glossary), file (glossary), port (glossary),
157-
command (glossary), Windows (glossary), textDecode (glossary),
157+
command (glossary), Windows (glossary),
158158
OS X (glossary), type signature (glossary), creator signature (glossary),
159159
Mac OS (glossary), Unix (glossary), ASCII (glossary),
160160
characters (keyword), file (keyword), URL (keyword), fileType (property),

‎docs/dictionary/command/open-process.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ References: kill (command), close process (command),
143143
read from process (command), write to process (command),
144144
exit (control structure), screenName (function), command (glossary),
145145
OS X (glossary), textDecode (function), Windows (glossary),
146-
Mac OS (glossary), Unix (glossary), textEncode (keyword),
146+
Mac OS (glossary), Unix (glossary),
147147
background (glossary), process (glossary), characters (keyword),
148148
hideConsoleWindows (property)
149149

‎docs/dictionary/control_st/on.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ reaches the <object(glossary)> whose <script> contains the <on>
8484

8585
References: dispatch (command), exit (control structure),
8686
return (control structure), result (function), commandNames (function),
87-
paramCount (function), the result (function), object (glossary),
87+
paramCount (function), object (glossary),
8888
handle (glossary), handler (glossary), execute (glossary),
8989
message handler (glossary), pass (glossary), message path (glossary),
9090
control structure (glossary), message (glossary),

‎docs/dictionary/function/movingControls.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ window is still moving, or to perform an action on each <control> or
3232
window that is moving.
3333

3434
References: move (command), function (control structure),
35-
command (glossary), return (glossary), control (keyword), line (keyword),
36-
control (object), properties (property), ID (property)
35+
command (glossary), control (glossary), return (glossary), control (keyword),
36+
line (keyword), properties (property), ID (property)
3737

3838
Tags: multimedia
3939

‎docs/dictionary/function/optionKey.lcdoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ Use the <optionKey> <function(control structure)> to check whether the
3131
<optionKey> to add alternative capabilities to user actions such as
3232
clicking.
3333

34-
The altKey, optionKey, and <metaKey> <function(glossary)|functions> all
34+
The <altKey> and <optionKey> <function(glossary)|functions> both
3535
<return> the same <value>. Which one to use is a matter of preference.
3636

3737
The terminology varies depending on platform. Users of different
3838
operating systems may know this key as the Option key (Mac OS systems),
3939
Meta key (Unix systems), or Alt key (Windows systems).
4040

41-
References: left (constant), return (constant),
41+
References: left (constant), return (constant),
4242
function (control structure), value (function), keysDown (function),
43-
Alt key (glossary), Meta key (glossary), Option key (glossary),
44-
return (glossary), metaKey (glossary), function (glossary),
43+
altKey (function), Alt key (glossary), Meta key (glossary),
44+
Option key (glossary), return (glossary), function (glossary),
4545
optionKeyDown (message)
4646

4747
Tags: ui

‎docs/dictionary/keyword/msg.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ In LiveCode IDE <msg> and the <msgChanged> <message> are used to implement
3333
the message box.
3434

3535
References: put (command), msgChanged (message), keyword (glossary),
36-
global (keyword), variable (glossary), message (glossary),
37-
stdout <keyword>
36+
global (glossary), variable (glossary), message (glossary),
37+
stdout (keyword)

‎docs/dictionary/keyword/opaque.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Setting a control's <style> <property> to "opaque" sets its <opaque>
2929
<property> to true.
3030

3131
References: object (glossary), property (glossary), keyword (glossary),
32-
transparent (keyword), button (keyword), field (keyword),
33-
opaque (keyword), control (keyword), button (object), style (property),
34-
owner (property), opaque (property), backgroundColor (property)
32+
button (keyword), field (keyword), opaque (keyword), control (keyword),
33+
button (object), style (property), owner (property), opaque (property),
34+
backgroundColor (property)
3535

3636
Tags: ui
3737

‎docs/dictionary/message/msgChanged.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ handlerName (string): The name of the handler that modified <msg>
3434
lineNumber (integer): The line number within the script that modified
3535
<msg>
3636

37-
References: put (command), message (glossary), msg (keyword),
38-
stdout (keyword)
37+
References: put (command), message (glossary), command (glossary),
38+
msg (keyword), stdout (keyword)

0 commit comments

Comments
 (0)