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

Commit 5362e6b

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-8.2' into merge-develop-8.2-14.11.2017
2 parents c2c7766 + 064d03d commit 5362e6b

35 files changed

+412
-147
lines changed

‎Installer/package.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,8 @@ component Extensions
468468
rfolder macosx:packaged_extensions/com.livecode.library.oauth2
469469
into [[ToolsFolder]]/Extensions place
470470
rfolder macosx:packaged_extensions/com.livecode.library.qr
471+
into [[ToolsFolder]]/Extensions place
472+
rfolder macosx:packaged_extensions/com.livecode.library.objectrepository
471473

472474
component Toolchain.MacOSX
473475
into [[ToolsFolder]]/Toolchain place

‎buildbot.mk‎

Lines changed: 7 additions & 3 deletions
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-commercial
124+
dist-server: dist-server-indy dist-server-business
125125
endif
126126

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

133-
dist-server-commercial:
133+
dist-server-indy:
134134
$(buildtool_command) --platform mac --platform win --platform linux \
135-
--stage server --edition commercial --warn-as-error
135+
--stage server --edition indy --warn-as-error
136136

137+
dist-server-business:
138+
$(buildtool_command) --platform mac --platform win --platform linux \
139+
--stage server --edition business --warn-as-error
140+
137141
ifeq ($(BUILD_EDITION),commercial)
138142
dist-tools: dist-tools-commercial
139143
distmac-disk: distmac-disk-communityplus distmac-disk-indy distmac-disk-business

‎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-9-25"
4-
constant kTSNetVersion = "1.3.2"
3+
constant kMergExtVersion = "2017-11-3"
4+
constant kTSNetVersion = "1.3.3"
55

66
local sEngineDir
77
local sWorkDir

‎builder/docs_builder.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ command docsBuilderGenerateDistributedAPI pEdition
22092209
docsBuilderPopulateDatabase pEdition, tLibrariesA
22102210
repeat for each element tLibA in tLibrariesA
22112211
local tJSON, tFolder
2212-
put revDocsFormatLibraryDocArrayAsJSON(tLibA["name"], tLibA["doc"]) into tJSON
2212+
put revDocsFormatLibraryDocArrayAsJSON(tLibA) into tJSON
22132213
put builderAPIFolder(pEdition, tLibA["api"]) into tFolder
22142214
pathEnsure tFolder
22152215
put textEncode(tJSON, "utf-8") into url ("binfile:" & tFolder \

‎builder/installer/installeruiinstallcardbehavior.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ on installerPhaseChanged pNewPhase
6161
case "Uninstall"
6262
set the uEnabled of control "Cancel" to false
6363
put "up" into sProgressDirection
64-
put "Uninstallling existing version..." into field "Phase"
64+
put "Uninstalling existing version..." into field "Phase"
6565
break
6666
case "Cleanup"
6767
set the uEnabled of control "Cancel" to false

‎builder/server_builder.livecodescript‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,25 @@ command serverBuilderRun pPlatform, pEdition
109109
end if
110110
end repeat
111111

112-
if pEdition is "Community" then
113-
get tEngineFolder & slash & "server-community" & tExeExtension
114-
else
115-
get tEngineFolder & slash & "server-commercial" & tExeExtension
116-
end if
117-
if there is a file it then
112+
local tServerPath, tServerZipPath
113+
switch pEdition
114+
case "Community"
115+
put tEngineFolder & slash & "server-community" & tExeExtension into tServerPath
116+
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
124+
put "livecode-server" & tOutExeExtension into tServerZipPath
125+
break
126+
end switch
127+
128+
if there is a file tServerPath then
118129
builderLog "message", "Adding livecode-server engine"
119-
if pEdition is "Community" then
120-
revZipAddItemWithFile tOutputFile, "livecode-community-server" & tOutExeExtension, it
121-
else
122-
revZipAddItemWithFile tOutputFile, "livecode-server" & tOutExeExtension, it
123-
end if
130+
revZipAddItemWithFile tOutputFile, tServerZipPath, tServerPath
124131
if the result is not empty then
125132
throw the result
126133
end if
@@ -183,9 +190,5 @@ function getZipFilenameStub pVersion, pPlatform, pEdition
183190
else if pPlatform is "linux-armv6hf" then
184191
put "Linux-armv6hf" into pPlatform
185192
end if
186-
if pEdition is "Community" then
187-
return "LiveCodeCommunityServer-" & pVersion & "-" & pPlatform & ".zip"
188-
else
189-
return "LiveCodeServer-" & pVersion & "-" & pPlatform & ".zip"
190-
end if
193+
return "LiveCode" & editionTitleCase(pEdition) & "Server-" & pVersion & "-" & pPlatform & ".zip"
191194
end getZipFilenameStub

‎builder/tools_builder.livecodescript‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
199199
packageCompilerConfigureSource tPackager, "prebuilt", builderRepoFolder() & slash & "prebuilt"
200200
packageCompilerConfigureSource tPackager, "repo", builderRepoFolder()
201201
packageCompilerConfigureSource tPackager, "ext", builderUnpackFolder(pEdition)
202+
202203
if editionIsInPrivateRepo(tEditionType) then
203204
packageCompilerConfigureSource tPackager, "private", builderPrivateRepoFolder()
204205
end if

‎docs/dictionary/command/drawer.lcdoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ different locations on that side:
5959
drawer "Colors" at left of this stack aligned to bottom
6060

6161

62-
>*Cross-platform note:* On <Mac OS>, <Unix>, and <Windows|Windows
63-
> systems>, <drawer(glossary)|drawers> are not supported, so the
64-
> <drawer> <command> opens the <stack> as a <palette> instead. The
62+
>*Cross-platform note:* On <Mac OS>, <Unix>, and
63+
> <Windows|Windows systems>, <drawer(glossary)|drawers> are not supported,
64+
> so the <drawer> <command> opens the <stack> as a <palette> instead. The
6565
> <palette> uses the current <rectangle> of the <stack> and does not
6666
> resize or move it.
6767

‎docs/dictionary/command/edit.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Type: command
55
Syntax: edit [the] script of <object> [at line,column]
66

77
Summary:
8-
Opens the <script> of an <object(glossary)> in the <development
9-
environment>.
8+
Opens the <script> of an <object(glossary)> in the
9+
<development environment>.
1010

1111
Introduced: 1.0
1212

‎docs/dictionary/function/dragSource.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Description:
3232
Use the <dragSource> <function> to find out which <object(glossary)>,
3333
and which <object type>, is being dragged from.
3434

35-
The <dragSource> <function> only <return|returns> a value while a <drag
36-
and drop> is in progress. Otherwise, the <dragSource> <function>
35+
The <dragSource> <function> only <return|returns> a value while a
36+
<drag and drop> is in progress. Otherwise, the <dragSource> <function>
3737
<return|returns> empty.
3838

3939
References: function (control structure), target (function),

0 commit comments

Comments
 (0)