Skip to content

Commit 2ec7f94

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop' of https://github.com/livecode/livecode into bugfix-16713
2 parents b196055 + d977991 commit 2ec7f94

79 files changed

Lines changed: 2294 additions & 773 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ install:
7070
# Bootstrap the LCB compiler, build the default target set and run a
7171
# the default test suite.
7272
script: |
73-
echo "travis_fold:start:travisscript"
7473
case "${TRAVIS_OS_NAME}" in
7574
linux)
7675
BUILD_PLATFORM=linux
@@ -97,7 +96,6 @@ script: |
9796
make all-${BUILD_PLATFORM} &&
9897
${CHECK_COMMAND} make check-${BUILD_PLATFORM} V=1
9998
fi
100-
echo "travis_fold:end:travisscript"
10199
102100
addons:
103101
# Configuration for Coverity Scan integration

‎Installer/package.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,8 @@ component Extensions
423423
rfolder macosx:packaged_extensions/com.livecode.widget.iconpicker
424424
into [[ToolsFolder]]/Extensions place
425425
rfolder macosx:packaged_extensions/com.livecode.library.androidbgaudio
426+
into [[ToolsFolder]]/Extensions place
427+
rfolder macosx:packaged_extensions/com.livecode.library.androidaudiorecorder
426428
into [[ToolsFolder]]/Extensions place
427429
rfolder macosx:packaged_extensions/com.livecode.library.iconsvg
428430
into [[ToolsFolder]]/Extensions place

‎builder/tools_builder.livecodescript‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ end clearExtendedAttributes
569569

570570
private function findSigningIdentity
571571
get shell("/usr/bin/security -q find-identity -v")
572-
filter it with "*Developer ID Application: Runtime Revolution Ltd*"
572+
filter it with "*Developer ID Application:*"
573573
return it
574574
end findSigningIdentity
575575

@@ -703,7 +703,8 @@ command toolsBuilderMakeAppBundle pVersion, pEdition, pPlatform
703703
end if
704704
builderLog "report", "Successfully signed macosx app bundle" && "'" & tAppBundle & "'"
705705
else
706-
builderLog "warning", "No valid identity found for signing OSX app bundle"
706+
builderLog "error", "No valid identity found for signing OSX app bundle"
707+
throw "failure"
707708
end if
708709

709710
-- One last permission change (but a non-signature-breaking one) to prevent accidental IDE modifications

‎docs/dictionary/command/local.lcdoc‎

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

33
Type: command
44

5-
Syntax: local <variableName> [= <value>] [, ...]
5+
Syntax: local <variableName> [= <value>] [, <variableName> [= <value>] ...]
66

77
Summary:
88
<declare|Declares> one or more <local variable|local variables> and

‎docs/dictionary/command/mobileControlDo.lcdoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Synonyms: iphonecontroldo
44

55
Type: command
66

7-
Syntax: mobileControlDo <idOrName>, <action>, ...action specific parameters...
7+
Syntax: mobileControlDo <idOrName>, <action> [, <actionParameter> ...]
88

99
Summary:
1010
Execute specific behaviors of native mobile controls created using
@@ -42,6 +42,7 @@ The id or name of the control.
4242
action (enum):
4343
The name of the <action> to perform. See Description for complete <action> listing.
4444

45+
actionParameter: Additional parameter required for the action.
4546

4647
Description:
4748
Use the <mobileControlDo> command to execute behaviors specific to a

‎docs/dictionary/command/mobilePick.lcdoc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Synonyms: iphonepick
44

55
Type: command
66

7-
Syntax: mobilePick <optionList>, <initialIndex> [, <optionList>, <initialIndex>, ...] [, <style> ] [, <button>] [, <view>]
7+
Syntax: mobilePick <optionList1>, <initialIndex1> [, <optionList2>, <initialIndex2> ...] [, <style> ] [, <button>] [, <view>]
88

99
Summary:
1010
Presents the user with a native list picker dialog.
@@ -38,12 +38,15 @@ mobilePick tDays, 2, tMonths, 3, "checkmark"
3838
answer the result with "Okay"
3939

4040
Parameters:
41-
optionList:
41+
optionList1:
4242
A return delimited list of options.
4343

44-
initialIndex:
44+
initialIndex1:
4545
The (1-based) index of the item to be initially highlighted.
4646

47+
optionList2:
48+
initialIndex2:
49+
4750
style:
4851
The type of display used. On the iPad if "checkmark" is specified a
4952
check-mark (tick) is put against the currently selected item. If not

‎docs/dictionary/command/visual-effect.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Name: visual effect
22

33
Type: command
44

5-
Syntax: visual [effect] <effectName> [<speed>] [to <finalImage>]
6-
[with sound <audioClip>] [and <param> <value> and ...]
5+
Syntax: visual [effect] <effectName> [<speed>] [to <finalImage>] [with sound <audioClip>] [and <param> <value> ...]
76

87
Summary:
98
Adds a visual effect transition.

‎docs/dictionary/constant/arrow.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Type: constant
55
Syntax: arrow
66

77
Summary:
8-
Equivalent to the number 1.
8+
Equivalent to the number 29.
99

1010
Introduced: 1.0
1111

@@ -23,7 +23,7 @@ shape.
2323
The following two statements are equivalent:
2424

2525
set the cursor to arrow
26-
set the cursor to 1
26+
set the cursor to 29
2727

2828

2929
However, the first is easier to read and understand in LiveCode.
@@ -35,7 +35,7 @@ However, the first is easier to read and understand in LiveCode.
3535
> option on the Inclusions section on the General screen of the
3636
> <Standalone Application Settings> window is checked.
3737

38-
References: constant (command), one (constant),
38+
References: constant (command),
3939
Standalone Application Settings (glossary),
4040
standalone application (glossary), cursor (glossary), cursor (property)
4141

‎docs/dictionary/control_st/after.lcdoc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ Name: after
22

33
Type: control structure
44

5-
Syntax: after <messageName> [<parametersList>] <statementList> end <messageName>
5+
Syntax:
6+
after <messageName> [<parametersList>]
7+
<statementList>
8+
end <messageName>
69

710
Summary:
811
Defines a <message handler>.

‎docs/dictionary/control_st/before.lcdoc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ Name: before
22

33
Type: control structure
44

5-
Syntax: before <messageName> [<parametersList>] <statementList> end <messageName>
5+
Syntax:
6+
before <messageName> [<parametersList>]
7+
<statementList>
8+
end <messageName>
69

710
Summary:
811
Defines a <message handler>.

0 commit comments

Comments
 (0)