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

Commit f53cb6f

Browse files
montegouldingmontegoulding
committed
Merge branch 'develop-8.2' into mergedreleasenotes
2 parents 2cd0c43 + 1edf8a1 commit f53cb6f

File tree

99 files changed

+858
-397
lines changed

Some content is hidden

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

99 files changed

+858
-397
lines changed

‎Installer/package.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@ component Databases.MacOSX
859859
component Toolset
860860
into [[ToolsFolder]] place
861861
rfolder ide:Toolset
862+
emit variable TargetEdition to "[[ToolsFolder]]/edition.txt"
862863
into [[ToolsFolder]]/Toolset/libraries place
863864
stack ide-support:revdeploylibraryandroid.livecodescript
864865
stack ide-support:revdeploylibraryios.livecodescript

‎buildbot.mk‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@
2323
# Load version information
2424
include version
2525

26+
GIT_HASH_HEXIT_COUNT=10
27+
2628
# Get git commit information
2729
ifeq ($(BUILD_EDITION),commercial)
28-
GIT_VERSION=g$(shell git --git-dir=../.git rev-parse --short HEAD)
30+
GIT_VERSION=g$(shell git --git-dir=../.git rev-parse --short=$(GIT_HASH_HEXIT_COUNT) HEAD)
2931
else
30-
GIT_VERSION=g$(shell git rev-parse --short HEAD)
32+
GIT_VERSION=g$(shell git rev-parse --short=$(GIT_HASH_HEXIT_COUNT) HEAD)
3133
endif
3234

3335
################################################################
@@ -151,7 +153,9 @@ dist-tools-commercial:
151153
# Ensure that the version for which we're trying to build installers
152154
# hasn't already been tagged.
153155
dist-tools-version-check:
154-
@if git rev-parse refs/tags/$(BUILD_SHORT_VERSION) \
156+
@git tag -l | xargs git tag -d ;\
157+
git fetch --tags ;\
158+
if git rev-parse refs/tags/$(BUILD_SHORT_VERSION) \
155159
>/dev/null 2>&1 ; then \
156160
echo; \
157161
echo "$(BUILD_SHORT_VERSION) has already been released."; \

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

66
local sEngineDir
77
local sWorkDir

‎builder/package_compiler.livecodescript‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -489,15 +489,29 @@ private command compilerParse @self, pScript
489489
end if
490490
break
491491
case "emit"
492-
if the number of words of tLine is not 4 or \
493-
word 2 of tLine is not among the items of "externals,dbdrivers" or \
494-
word 3 of tLine is not "to" then
495-
compilerSyntaxError self, "Invalid command, syntax is 'emit <class> to <target>'", tLineNumber
492+
local tMaxWords
493+
switch word 2 of tLine
494+
case "externals"
495+
case "dbdrivers"
496+
put 4 into tMaxWords
497+
break
498+
case "string"
499+
case "variable"
500+
put 5 into tMaxWords
501+
put wordToName(word 3 of tLine) into tCommand["name"]
502+
break
503+
default
504+
put 0 into tMaxWords
505+
end switch
506+
507+
if the number of words of tLine is not tMaxWords or \
508+
word -2 of tLine is not "to" then
509+
compilerSyntaxError self, "Invalid command, syntax is 'emit <class> [{<variable> | <string>}] to <target>'", tLineNumber
496510
end if
497511

498512
put "emit" into tCommand["type"]
499513
put wordToName(word 2 of tLine) into tCommand["class"]
500-
put wordToName(word 4 of tLine) into tCommand["target"]
514+
put wordToName(word -1 of tLine) into tCommand["target"]
501515
break
502516
case "declare"
503517
if the number of words of tLine is not 5 or \
@@ -976,10 +990,23 @@ private command compilerExecuteEmit @self, pCommand
976990
put the number of elements in self["derived"] + 1 into tIndex
977991
put "derived/" & tClass & "-" & tIndex & ".txt" into self["derived"][tIndex]["name"]
978992
put "text" into self["derived"][tIndex]["type"]
979-
put self["groups"][tClass] into self["derived"][tIndex]["data"]
993+
994+
-- allow emitting a a variable to a file
995+
switch tClass
996+
case "dbdriver"
997+
case "external"
998+
put self["groups"][tClass] into self["derived"][tIndex]["data"]
999+
put empty into self["groups"][tClass]
1000+
break
1001+
case "variable"
1002+
put self["context"][pCommand["name"]] into self["derived"][tIndex]["data"]
1003+
break
1004+
case "string"
1005+
put pCommand["name"] into self["derived"][tIndex]["data"]
1006+
break
1007+
end switch
9801008

9811009
put "file" & tab & tTarget & tab & self["derived"][tIndex]["name"] & return after self["manifest"]
982-
put empty into self["groups"][tClass]
9831010
end compilerExecuteEmit
9841011

9851012
private command compilerExecuteDeclare @self, pCommand

‎docs/dictionary/command/answer-color.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Description:
4747
Use the <answer color> <command> to select a custom color.
4848

4949
The <answer color> <command> displays a <dialog box> where the user can
50-
select a color. (This dialog box is displayed by the operating system,
50+
select a color. (This <dialog box> is displayed by the operating system,
5151
not by LiveCode.)
5252

53-
If you specify a <startingColor>, the dialog box displays that color by
53+
If you specify a <startingColor>, the <dialog box> displays that color by
5454
default.
5555

5656
The color is returned in the form of three comma-separated integers

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ if the altKey is down then answer effect
2525
It:
2626
An encoded description of the visual effect the user chooses is placed
2727
in the it <variable>. You can either use the encoded description
28-
immediately, or store it (for example, in a <variable> or in a <custom
29-
property>) for later use. To display the effect, use the encoded
28+
immediately, or store it (for example, in a <variable> or in a
29+
<custom property>) for later use. To display the effect, use the encoded
3030
description with the <visual effect> <command>, with the <unlock screen>
3131
<command>, or with the hide with visual effect or show with visual
3232
effect form of the <hide> or <show> <command>. If the user cancels the
@@ -58,7 +58,7 @@ bit builds of LiveCode.
5858
References: answer (command), visual effect (command),
5959
answer record (command), show (command), hide (command),
6060
unlock screen (command), function (control structure), result (function),
61-
QTEffects (function), dialog box (glossary), custom property (glossary),
61+
qtEffects (function), dialog box (glossary), custom property (glossary),
6262
variable (glossary), command (glossary), QuickTime (glossary),
6363
return (glossary), dontUseQTEffects (property), dontUseQT (property)
6464

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Example:
2929
answer file (field "Prompt") with type "LiveCode Stacks|rev|RSTK"
3030

3131
Example:
32-
answer files "Select the images you wish to view:" with type "JPEG Images|jpg|JPEG" \
32+
answer files "Select the images you wish to view:" with type "JPEG Images|jpg|JPEG"
3333

3434
Parameters:
3535
prompt (string):
@@ -54,8 +54,8 @@ have a title bar.)
5454
It:
5555
The absolute file path of the file the user chose is placed in the it
5656
<variable>. If the answer files form is used, a return-delimited list of
57-
such paths is placed in the it variable. If the user cancels the <dialog
58-
box|dialog>, the <it> <variable> is set to empty.
57+
such paths is placed in the it variable. If the user cancels the
58+
<dialog box|dialog>, the <it> <variable> is set to empty.
5959

6060
The result:
6161
If <types> are specified, the result function will return the tag of the
@@ -65,11 +65,11 @@ Description:
6565
Use the <answer file> command when a <handler> needs the <file path> of
6666
a <file> before continuing.
6767

68-
The dialog box displayed is the same one most programs use for the
68+
The <dialog box> displayed is the same one most programs use for the
6969
"Open" command in the File menu.
7070

7171
>*Important:* The <answer file> <command> does not open the <file>. It
72-
> only displays the dialog box and retrieves the path to the file the
72+
> only displays the <dialog box> and retrieves the path to the file the
7373
> user specifies.
7474

7575
If more than one type is specified, a drop-down list containing the tags
@@ -78,15 +78,15 @@ display. (This list is always displayed on Windows systems).
7878

7979
If the as sheet form is used, the dialog box appears as a sheet on OS X
8080
systems. On other systems, the as sheet form has no effect and the
81-
dialog box appears normally. Attempting to open a sheet from within
81+
<dialog box> appears normally. Attempting to open a sheet from within
8282
another sheet displays the second stack as a <modal dialog box> instead.
83-
To give a dialog box a prompt when using the as sheet form a non-empty
83+
To give a <dialog box> a prompt when using the as sheet form a non-empty
8484
title must be provided. This will cause the prompt to appear in the same
8585
place it would if as sheet was not being used.
8686

8787
If the systemFileSelector <property> is set to false, LiveCode's
88-
built-in <dialog box> is used instead of the operating system's <file
89-
dialog box|standard file dialog>.
88+
built-in <dialog box> is used instead of the operating system's
89+
<file dialog box|standard file dialog>.
9090

9191
Changes:
9292
The answer file ... with type ... form was introduced in version 2.6.

‎docs/dictionary/command/answer-folder.lcdoc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ If you specify empty, no prompt appears.
3333

3434
defaultPath:
3535
The name and location of the folder whose contents are listed when the
36-
dialog box appears. If no defaultPath is specified, the dialog box lists
37-
the contents of the last folder you used with a file dialog box.
36+
<dialog box> appears. If no defaultPath is specified, the <dialog box> lists
37+
the contents of the last <folder> you used with a <file dialog box>.
3838

3939
windowTitle:
4040
If specified, appears in the title bar of the dialog box.
4141
If no <windowTitle> is given, the title bar is blank. This parameter
4242
has no effect on macOS 10.11 (El Capitan) and above, so make sure that any important information is placed in the <prompt> parameter.
4343

4444
It:
45-
The absolute file path of the folder the user selects is placed in the
46-
it <variable>.
45+
The absolute file path of the <folder> the user selects is placed in the
46+
<it> <variable>.
4747

4848
The result:
4949
If the user cancels the <dialog box|dialog>, the <it> <variable> is set
@@ -53,17 +53,17 @@ Description:
5353
Use the <answer folder> <command> when you want the user to choose a
5454
<folder> --for example, as a destination for <export|exported> <files>.
5555

56-
If the as sheet form is used, the dialog box appears as a sheet on OS X
56+
If the as sheet form is used, the <dialog box> appears as a sheet on OS X
5757
systems. On other systems, the as sheet form has no effect and the
58-
dialog box appears normally. Attempting to open a sheet from within
58+
<dialog box> appears normally. Attempting to open a sheet from within
5959
another sheet displays the second stack as a <modal dialog box> instead.
60-
To give a dialog box a prompt when using the as sheet form a non-empty
60+
To give a <dialog box> a prompt when using the as sheet form a non-empty
6161
title must be provided. This will cause the prompt to appear in the same
6262
place it would if as sheet was not being used.
6363

6464
If the systemFileSelector <property> is set to false, LiveCode's
65-
built-in <dialog box> is used instead of the operating system's <file
66-
dialog box|standard file dialog>.
65+
built-in <dialog box> is used instead of the operating system's
66+
<file dialog box|standard file dialog>.
6767

6868
Changes:
6969
The answer folder...as sheet form was introduced in version 2.0.

‎docs/dictionary/command/answer.lcdoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,5 @@ property (glossary), OS X (glossary), variable (glossary),
121121
message (glossary), modal dialog box (glossary), dialog box (glossary),
122122
command (glossary), gRevAppIcon (keyword), image (keyword),
123123
gRevProfileReadOnly (keyword), gRevSmallAppIcon (keyword),
124-
gRevSmallAppIcon keyword (keyword), gRevAppIcon keyword (keyword),
125124
HTMLText (property)
126125

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ If <types> are specified, the result function will return the tag of the
5757
corresponding type selected from the supplied drop-down list.
5858

5959
Description:
60-
Use the ask file <command> to let the user provide the <file path|name
61-
and location> of a new <file>.
60+
Use the ask file <command> to let the user provide the
61+
<file path|name and location> of a new <file>.
6262

6363
The dialog box is the same one most applications use for the "Save"
6464
command in the File menu. (If the systemFileSelector <property> is set
6565
to true on <Mac OS> and <Windows|Windows systems>, and always on
66-
<Unix|Unix systems>, the <application> displays its own built-in <dialog
67-
box>, instead of the one provided by the operating system.)
66+
<Unix|Unix systems>, the <application> displays its own built-in
67+
<dialog box>, instead of the one provided by the operating system.)
6868

6969
>*Important:* The ask file command does not create the file. It only
7070
> displays the dialog box and retrieves the path to the file the user
@@ -84,8 +84,8 @@ appears normally. Attempting to open a sheet from within another sheet
8484
displays the second stack as a <modal dialog box> instead.
8585

8686
If the systemFileSelector <property> is set to false, LiveCode's
87-
built-in <dialog box> is used instead of the operating system's <file
88-
dialog box|standard file dialog>.
87+
built-in <dialog box> is used instead of the operating system's
88+
<file dialog box|standard file dialog>.
8989

9090
Changes:
9191
The ask file ... with type ... form was introduced in version 2.6.

0 commit comments

Comments
 (0)