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

Commit 19e6aef

Browse files
livecodefraserlivecodefraser
committed
Merge branch 'develop' of https://github.com/runrev/livecode into feature-raw_clipboard
Conflicts: engine/src/fieldf.cpp engine/src/globals.h engine/src/util.h
2 parents b2f00ac + 28abeed commit 19e6aef

File tree

179 files changed

+2995
-1424
lines changed

Some content is hidden

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

179 files changed

+2995
-1424
lines changed

‎INSTALL-android.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Create a standalone toolchain (this simplifies setting up the build environment)
3737
````bash
3838
android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
3939
--toolchain=arm-linux-androideabi-clang3.5 \
40-
--platform=android-8 \
40+
--platform=android-10 \
4141
--install-dir=${HOME}/android/toolchain/standalone
4242
````
4343

@@ -75,11 +75,11 @@ LINK="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -fuse-ld=bfd"
7575
AR="${BINDIR}/${TRIPLE}-ar"
7676

7777
# Android platform information
78-
ANDROID_NDK_VERSION=r10d
79-
ANDROID_PLATFORM=android-8
80-
ANDROID_NDK=${TOOLCHAIN}/android-ndk-r10d
78+
ANDROID_NDK_VERSION=r10e
79+
ANDROID_PLATFORM=android-10
80+
ANDROID_NDK=${TOOLCHAIN}/android-ndk-r10e
8181
ANDROID_SDK=${TOOLCHAIN}/android-sdk-linux
82-
ANDROID_BUILD_TOOLS=22.0.1
82+
ANDROID_BUILD_TOOLS=23.0.1
8383

8484
export JAVA_SDK
8585
export CC CXX LINK AR

‎Installer/package.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,8 @@ component Extensions
557557
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.navbar
558558
into [[ToolsFolder]]/Extensions place
559559
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.paletteactions
560+
into [[ToolsFolder]]/Extensions place
561+
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.pushbutton
560562
into [[ToolsFolder]]/Extensions place
561563
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.segmented
562564
into [[ToolsFolder]]/Extensions place
@@ -567,6 +569,8 @@ component Extensions
567569
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.switchbutton
568570
into [[ToolsFolder]]/Extensions place
569571
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.treeview
572+
into [[ToolsFolder]]/Extensions place
573+
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.widget-utils
570574

571575
component Toolchain.MacOSX
572576
into [[ToolsFolder]]/Toolchain place

‎builder/installer.rev‎

100644100755
1.49 KB
Binary file not shown.

‎builder/installer_utilities.livecodescript‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,14 @@ end runFacelessInstall
244244

245245
-- Faceless uninstall option
246246
command runFacelessUninstall
247-
send "runFaceless" to stack "UninstallerUI"
247+
put true into sIsFaceless
248+
249+
try
250+
send "runFaceless" to stack "UninstallerUI"
251+
catch tError
252+
quit 1
253+
end try
254+
quit 0
248255
end runFacelessUninstall
249256

250257
-- InstallerActions mode is backend process for installation. It reads the
@@ -1227,9 +1234,9 @@ command actionUninstall pPath, pRecord, pPreInstall
12271234
end if
12281235
end if
12291236

1230-
-- Notify the master that we are done (but only if this is not a pre-install uninstall)
1237+
-- Notify the master that uninstalling is done (but only if this is not a pre-install uninstall)
12311238
if not pPreInstall then
1232-
reportFinished
1239+
reportFinished true
12331240
end if
12341241
end actionUninstall
12351242

@@ -1400,14 +1407,18 @@ private command reportProgress pProgress, pMessage
14001407
end if
14011408
end reportProgress
14021409

1403-
private command reportFinished
1410+
private command reportFinished pIsUninstall
14041411
if not sIsFaceless then
14051412
if the environment is "installer" then
14061413
log "Done"
14071414
write "done" & return to stdout
14081415
end if
14091416
else
1410-
write "Installation succeded." & return to stdout
1417+
if pIsUninstall then
1418+
write "Successfully uninstalled." & return to stdout
1419+
else
1420+
write "Installation succeeded." & return to stdout
1421+
end if
14111422
end if
14121423
end reportFinished
14131424

‎builder/release_notes_builder.livecodescript‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -655,21 +655,24 @@ on generateExtensionsDiff pFirstVersion, pCurrentVersion, pType, @xDataA
655655
end repeat
656656
end generateExtensionsDiff
657657

658+
constant kExtensionsSections = "libraries,modules,widgets"
659+
658660
on addExtensionReleaseNoteData pFirstVersion, pCurVersion, @xDataA
659661
local tReleaseNoteDataA
660-
generateExtensionsDiff pFirstVersion, pCurVersion, "libraries", tReleaseNoteDataA
661-
generateExtensionsDiff pFirstVersion, pCurVersion, "widgets", tReleaseNoteDataA
662+
repeat for each item tSection in kExtensionsSections
663+
generateExtensionsDiff pFirstVersion, pCurVersion, tSection, tReleaseNoteDataA
664+
end repeat
662665

663666
local tExtensionDataA
664667
repeat for each key tType in tReleaseNoteDataA
665668
repeat for each key tName in tReleaseNoteDataA[tType]
666669
put empty into tExtensionDataA
667670
local tSectionName
668-
if tType is "libraries" then
669-
# Libraries usually have 'Library' in their name already
670-
put tName into tSectionName
671-
else
671+
if tType is "widgets" then
672672
put tName && "Widget" into tSectionName
673+
else
674+
# Modules/libraries names don't need modifying
675+
put tName into tSectionName
673676
end if
674677
repeat for each line tFile in tReleaseNoteDataA[tType][tName]
675678
addLCBReleaseNoteData tFile, tSectionName, xDataA

‎builder/tools_builder.livecodescript‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
320320
end repeat
321321
delete the last char of tParams["auxiliary_stackfiles"]
322322

323-
put "insert script of stack" && quote & "revLibUrl" & quote && "into back" into tParams["startup_script"]
323+
// revLibURL needs to initialise its custom props, and revLoadLibrary must therefore be called.
324+
put merge("send [[quote]]revLoadLibrary[[quote]] to stack [[quote]]revLibUrl[[quote]]") into tParams["startup_script"]
324325
put return & "insert script of stack" && quote & "InstallerUtilities" & quote && "into back" after tParams["startup_script"]
325326

326327
switch pPlatform

‎docs/dictionary/command/answer-file-with-type.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: answer file with type
22

33
Type: command
44

5-
Syntax: answer file[s] <prompt> [with <defaultPath>] [with type <types> [or type <types> ...]] <windowTitle>] [as sheet]
5+
Syntax: answer file[s] <prompt> [with <defaultPath>] [with type <types> [or type <types> ...]] [titled <windowTitle>] [as sheet]
66

77
Summary: Displays a <file dialog box|standard file dialog> for the user to select a <file>.
88

‎docs/dictionary/command/iphoneUseDeviceResolution.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: iphoneUseDeviceResolution
22

33
Type: command
44

5-
Syntax: iphoneUseDeviceResolution { <true> | <false> }, [true | false]
5+
Syntax: iphoneUseDeviceResolution { true | false }, [{ true | false }]
66

77
Summary: Sets whether the full resolution of high-resolution devices is to be used
88

‎docs/dictionary/command/relayer.lcdoc‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ Name: relayer
22

33
Type: command
44

5-
Syntax: relayer <control> {<before> | <after>} <layer> <index>
5+
Syntax: relayer <control> {before | after} <layer> <index>
66

7-
Syntax: relayer <control> {<before> | <after>} control <target>
7+
Syntax: relayer <control> {before | after} control <target>
88

9-
Syntax: relayer <control> {<before> | <after>} <owner>
9+
Syntax: relayer <control> {before | after} <owner>
1010

11-
Syntax: relayer <control> to {<before> | <after>} of <layer> <index>
11+
Syntax: relayer <control> to {front | back} of <layer> <index>
1212

13-
Syntax: relayer <control> to {<before> | <after>} of control <target>
13+
Syntax: relayer <control> to {front | back} of control <target>
1414

15-
Syntax: relayer <control> to {<before> | <after>} of <owner>
15+
Syntax: relayer <control> to {front | back} of <owner>
1616

1717
Summary: Aids the manipulation of layers.
1818

@@ -30,18 +30,19 @@ relayer button "b1" to back of card "testCard" -- send button b1 to the back of
3030

3131
Parameters:
3232
control: The target control is the given control.
33-
before: The owner of the control becomes the owner of the target and is inserted before the target. The layer of the control becomes the layer of the target and the target and all subsequent controls shift up one.
34-
after: The owner of the control becomes the owner of the target and is inserted after the target. The layer of the control becomes one greater than the layer of the last child of the target and all subsequent controls sift one up.
3533
layer: The target control is the control with layer <index>.
3634
index:
3735
target:
3836
owner: The target control is the owner of the control.
39-
front: The owner of the control becomes the owner of the target and is inserted after the last child of the target (only valid if <target> is a container).
40-
back: The owner of the control becomes the owner of the target and is inserted before the first child of the target (only valid if <target> is a container).
4137

4238
Description:
4339
Use the <relayer> command to aid the manipulation of layers.
4440

4541
Use the <relayer> command move a control relative to a target in a number of ways. The <relayer> command can only be used within a card. Attempts to relayer controls from one card or another stack would throw an exception.
4642

43+
When using "before" the owner of the control becomes the owner of the target and is inserted before the target. The layer of the control becomes the layer of the target and the target and all subsequent controls shift up one.
44+
When using "after" the owner of the control becomes the owner of the target and is inserted after the target. The layer of the control becomes one greater than the layer of the last child of the target and all subsequent controls sift one up.
45+
When using "front" the owner of the control becomes the owner of the target and is inserted after the last child of the target (only valid if <target> is a container).
46+
When using "back" the owner of the control becomes the owner of the target and is inserted before the first child of the target (only valid if <target> is a container).
47+
4748
References: tabGroupBehavior (property), relayerGroupedControls (property), layer (property), control (keyword), group (command), ungroup (command), intersect (function), number (function), mouseControl (function)

‎docs/dictionary/command/split.lcdoc‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Summary: Transforms a list into an <array>.
1212

1313
Introduced: 1.1
1414

15+
Changed: 7.0.0
16+
1517
OS: mac,windows,linux,ios,android
1618

1719
Platforms: desktop,server,web,mobile
@@ -25,10 +27,10 @@ split tData by comma
2527
// tData[3] = "three"
2628

2729
Example:
28-
put "one,two,three" into line 1 of tData
29-
put "ben,fraser,elanor" into line 2 of tData
30-
put "apple,orange,grape" into line 3 of tData
31-
set the rowdel to comma
30+
put "one;;two;;three" into line 1 of tData
31+
put "ben;;fraser;;elanor" into line 2 of tData
32+
put "apple;;orange;;grape" into line 3 of tData
33+
set the columndel to ";;"
3234
split tData by column
3335
// RESULT
3436
// tData[1] =
@@ -46,12 +48,14 @@ split tData by column
4648

4749
Parameters:
4850
variable: Any variable that is not an array
49-
primaryDelimiter: A character or an expression that evaluates to a character.
50-
secondaryDelimiter: A character or an expression that evaluates to a character.
51+
primaryDelimiter: A string of <character|characters> or an expression that evaluates to a string of <character|characters>.
52+
secondaryDelimiter: A string of <character|characters> or an expression that evaluates to a string of <character|characters>.
5153

5254
The result: If the first form of the <split> command is used, the parts that become elements are defined by the <primaryDelimiter>. For example, if the <primaryDelimiter> is <return>, each line of the variable becomes an element in the resulting array.The resulting array looks like this:. If the second form of the <split> command is used, the string is split into elements of an array where each element using the <rowDelimiter> or <columnDelimiter>, where each element of the resulting array is a row or column of the string respectively.
5355

5456
Description:
57+
From LiveCode 7.0, you can pass a string of <character|characters> as a column and row delimiter (it is no longer restricted to a single character).
58+
5559
Use the <split> command to place a list in an array so you can easily address each part of the list.
5660

5761
The <split> command separates the parts of the variable into elements of an array. After the command is finished executing, the variable specified is an array.
@@ -64,10 +68,10 @@ If you use the as set form the <split> command converts the passed variable to a
6468

6569
For example, the following statements create an array:
6670

67-
put "A apple,B bottle,C cradle" into myVariable
68-
split myVariable by comma and space
71+
put "A apple;;B bottle;;C cradle" into myVariable
72+
split myVariable by ";;" and space
6973

70-
KEY VALUE
74+
KEY VALUE
7175
A apple
7276
B bottle
7377
C cradle

0 commit comments

Comments
 (0)