Skip to content

Commit 84ee9a3

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-8.2' into merge-develop-8.2-27.11.2017
2 parents 5df9b0d + ba02be3 commit 84ee9a3

Some content is hidden

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

44 files changed

+251
-197
lines changed

‎buildbot.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ dist-docs-guide:
121121
--stage guide --warn-as-error
122122

123123
ifeq ($(BUILD_EDITION),commercial)
124-
dist-server: dist-server-indy dist-server-business
124+
dist-server: dist-server-communityplus dist-server-indy dist-server-business
125125
endif
126126

127127
dist-server: dist-server-community
@@ -130,6 +130,10 @@ dist-server-community:
130130
$(buildtool_command) --platform mac --platform win --platform linux \
131131
--stage server --edition community --warn-as-error
132132

133+
dist-server-communityplus:
134+
$(buildtool_command) --platform mac --platform win --platform linux \
135+
--stage server --edition communityplus --warn-as-error
136+
133137
dist-server-indy:
134138
$(buildtool_command) --platform mac --platform win --platform linux \
135139
--stage server --edition indy --warn-as-error

‎builder/server_builder.livecodescript‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,12 @@ command serverBuilderRun pPlatform, pEdition
110110
end repeat
111111

112112
local tServerPath, tServerZipPath
113-
switch pEdition
114-
case "Community"
115-
put tEngineFolder & slash & "server-community" & tExeExtension into tServerPath
113+
put tEngineFolder & slash & "server-" & toLower(pEdition) & tExeExtension into tServerPath
114+
if pEdition is "Community" then
116115
put "livecode-community-server" & tOutExeExtension into tServerZipPath
117-
break
118-
case "Indy"
119-
put tEngineFolder & slash & "server-commercial" & tExeExtension into tServerPath
120-
put "livecode-server" & tOutExeExtension into tServerZipPath
121-
break
122-
case "Business"
123-
put tEngineFolder & slash & "server-professional" & tExeExtension into tServerPath
116+
else
124117
put "livecode-server" & tOutExeExtension into tServerZipPath
125-
break
126-
end switch
118+
end if
127119

128120
if there is a file tServerPath then
129121
builderLog "message", "Adding livecode-server engine"

‎builder/tools_builder.livecodescript‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ private command toolsBuilderFilterExternals pFolder, pPlatform
112112
end repeat
113113
end if
114114

115+
-- remove windows 64 bit builds only required for filemaker
116+
get shell("rm -fv *x86_64.dll")
117+
115118
-- If the directory contains no code any more, remove it
116119
put the files & return & the folders into tFiles
117120
filter lines of tFiles with regex pattern "^.*\.(so|dylib|bundle|dll|lcext)$"

‎docs/dictionary/command/export-snapshot.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: export snapshot
22

33
Type: command
44

5-
Syntax: export snapshot {[from rect[angle] <rectangle>] [of <object(glossary)>] | from <object> [{with | without} effects]} [at size <size>] [{with|and} metadata <metadata>] to {file <filePath> | <container>} [as <format>] [with mask <maskFile>]
5+
Syntax: export snapshot {[from rect[angle] <rectangle>] [of <object>] | from <object> [{with | without} effects]} [at size <size>] [{with|and} metadata <metadata>] to {file <filePath> | <container>} [as <format>] [with mask <maskFile>]
66

77
Summary:
88
Creates a picture file from a portion of the screen.
@@ -126,7 +126,7 @@ expression evaluating to a control reference.
126126

127127
To export a snapshot of an object in iOS use the form:
128128

129-
<export snapshot> from [rectangle rect of] <object(glossary)>
129+
<export snapshot> from [rectangle rect of] object
130130

131131
To export a snapshot of the screen in iOS use the form:
132132

‎docs/dictionary/command/export-widget.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Syntax: export <widget> to array <arrayVar>
66

77
Summary:
88
Exports the state of the given widget in a form which can be imported
9-
using <import widget | import widget from array>.
9+
using <import widget|import widget from array>.
1010

1111
Introduced: 8.0
1212

‎docs/dictionary/command/export-with-palette.lcdoc‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Syntax: export <image> [with metadata <metadata>] to {file <filePath> | <contain
1111
Syntax: export <image> [with metadata <metadata>] to {file <filePath> | <container>} as {gif | png} with palette <colorList>
1212

1313
Summary:
14-
<export|Exports> the <selected> <image> as a <PBM>, <JPEG>, <GIF>, BMP
15-
or <PNG (glossary)> <file>.
14+
<export|Exports> the <selected> <image> as a <PBM>, <JPEG>, <GIF>, <BMP>
15+
or <PNG> <file>.
1616

1717
Introduced: 4.5
1818

@@ -87,8 +87,7 @@ dontDither property.
8787
> palette makes no sense.
8888

8989
References: export (command), export snapshot (command), import (command),
90-
JPEG (glossary), GIF (glossary), export (glossary), PBM (glossary),
91-
container (glossary), PNG (glossary), command (glossary), file (keyword),
92-
image (keyword), paint (keyword), as (keyword), JPEGQuality (property),
93-
selected (property)
94-
90+
BMP (glossary), command (glossary), container (glossary), export (glossary),
91+
GIF (glossary), JPEG (glossary), PBM (glossary), PNG (glossary),
92+
as (keyword), file (keyword), image (keyword), paint (keyword), URL (keyword),
93+
defaultFolder (property), JPEGQuality (property), selected (property)

‎docs/dictionary/command/sort-container.lcdoc‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ Example:
1717
sort field "Output"
1818

1919
Example:
20+
local tNumbers
2021
put "5,4,3,2,1" into tNumbers
2122
sort items of tNumbers ascending numeric -- 5,4,3,2,1 becomes 1,2,3,4,5
2223

2324
Example:
25+
local tData
2426
put "1,ben" into line 1 of tData
2527
put "2,elanor" into line 2 of tData
2628
put "3,ali" into line 3 of tData
@@ -32,6 +34,7 @@ sort lines of tData descending numeric by item 1 of each
3234
# 1,ben
3335

3436
Example:
37+
local myInfo
3538
sort items of myInfo by word 2 of each -- sort by word 2 of the line
3639

3740
Parameters:
@@ -49,50 +52,51 @@ sortType (enum):
4952
If you don't specify a <sortType>, the <sortType> is `text`.
5053

5154
- international: sorts by collation according to the system locale
52-
- numeric: sorts by number. (Use this form if the sortKey consists of
53-
numbers)
54-
- datetime: treats the sortKey as a date and/or time
55+
- numeric: sorts by number. (Use this form if the sortKey consists of numbers)
56+
- datetime: treats the <sortKey> as a date and/or time
5557
- text: sorts using a codepoint by codepoint comparison
5658
- binary: sorts using a byte by byte comparison
5759

5860

5961
sortKey:
60-
An expression that evaluates to a value for each line or item in the
61-
container. If the sortKey contains a chunk expression, the keyword each
62-
indicates that the chunk expression is evaluated for each line or item.
63-
If you don't specify a sortKey, the entire line (or item) is used as the
64-
sortKey.
62+
An expression that evaluates to a value for each line or <item> in the
63+
container. If the <sortKey> contains a chunk expression, the keyword
64+
<each> indicates that the <chunk expression> is evaluated for each line
65+
or <item>. If you don't specify a <sortKey>, the entire line (or <item>)
66+
is used as the <sortKey>.
6567

6668
Description:
67-
Use the sort container command to shuffle the order of lines or items in
68-
a container.
69+
Use the <sort container> command to shuffle the order of lines or
70+
<item|items> in a container.
6971

70-
If you don't specify lines or items, the lines of the container are
71-
sorted.
72+
If you don't specify lines or <item|items>, the lines of the container
73+
are sorted.
7274

73-
The each keyword, when used in the sortKey, specifies the entire line or
74-
item. You can use the each keyword in an expression, as a placeholder
75-
for the current line or item. For example, this statement sorts the
76-
lines of a variable by the third word of each line:
75+
The <each> keyword, when used in the <sortKey>, specifies the entire line
76+
or <item>. You can use the <each> keyword in an expression, as a
77+
placeholder for the current line or <item>. For example, this statement
78+
sorts the lines of a variable by the third word of each line:
7779

78-
sort lines of myVariable by word 3 of each
80+
sort lines of myVariable by word 3 of each
7981

80-
You can use the each keyword in any expression, not just chunk
81-
expressions.
82+
You can use the <each> keyword in any expression, not just <chunk
83+
expression|chunk expressions>.
8284

83-
The sort container command is a stable sort. This means that if the
84-
sortKey for two items or lines is the same, sorting does not change
85-
their order, so you can do two successive sorts to create subcategories
86-
within the major sort categories.
85+
The <sort container> command is a stable sort. This means that if the
86+
<sortKey> for two <item|items> or lines is the same, sorting does not
87+
change their order, so you can do two successive sorts to create
88+
subcategories within the major sort categories.
8789

88-
>*Tip:* To create a custom sort order, use the each keyword to pass each
89-
> line or item to a custom function. The value returned by the function
90-
> is used as the sort key for that line or item. It is not currently
91-
> possible to debug custom sort functions, and doing so could make the
92-
> IDE unstable. It is recommended to use logging messages instead.
90+
>*Tip:* To create a custom sort order, use the <each> keyword to pass
91+
> each line or <item> to a custom function. The value returned by the
92+
> function is used as the <sortKey> for that line or <item>. It is not
93+
> currently possible to debug custom sort functions, and doing so could
94+
> make the IDE unstable. It is recommended to use logging messages
95+
> instead.
9396

94-
References: sort (command), convert (command), offset (function),
95-
text (keyword), each (keyword), ascending (keyword), descending (keyword)
97+
References: ascending (keyword), byte (glossary),
98+
chunk expression (glossary), codepoint (keyword), convert (command),
99+
descending (keyword), each (keyword), item (glossary), offset (function),
100+
sort (command), text (keyword)
96101

97102
Tags: text processing
98-

‎docs/dictionary/control_st/exit.lcdoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ The name of the handler in which the exit control structure appears.
2929
Description:
3030
Use the <exit> <control structure> to skip the rest of a
3131
<handler|handler's> <statement|statements> without <return|returning> a
32-
result. Form:The <exit> <statement> appears on a line by itself,
32+
result.
33+
34+
**Form:** The <exit> <statement> appears on a line by itself,
3335
anywhere inside a <handler>.
3436

3537
You can use an <exit> <control structure> in a <message handler>,

‎docs/dictionary/function/eventAltKey.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ The terminology varies depending on platform. Users of different
4242
operating systems may know this key as the Option key (Mac OS systems),
4343
Meta key (Unix systems), or Alt key (Windows systems).
4444

45-
**warning**: the value of this function is undefined after performing
46-
a wait operation; it may no longer be the same as the value when the
47-
event was dispatched.
45+
> **Warning**: the value of this function is undefined after performing
46+
> a wait operation; it may no longer be the same as the value when the
47+
> event was dispatched.
4848

4949

5050
References: return (constant), function (control structure),

‎docs/dictionary/function/eventCapsLockKey.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ If you want to check the state of the Caps Lock key at the current time,
3333
rather than when the event was dispatched, use the <capsLockKey>
3434
<function>.
3535

36-
**warning**: the value of this function is undefined after performing
37-
a wait operation; it may no longer be the same as the value when the
38-
event was dispatched.
36+
> **Warning**: the value of this function is undefined after performing
37+
> a wait operation; it may no longer be the same as the value when the
38+
> event was dispatched.
3939

4040

4141
References: keysDown (function), return (glossary)

0 commit comments

Comments
 (0)