Skip to content

Commit 04815b0

Browse files
peter-bpeter-b
committed
Merge branch 'develop' of github.com:runrev/livecode into develop-js
Conflicts: engine/engine.gyp -- new iOS condition engine/src/globals.cpp -- commandLine and commandArguments thirdparty -- trivial
2 parents 31531a1 + dad8963 commit 04815b0

110 files changed

Lines changed: 1035 additions & 510 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.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ xcuserdata/
9696
make-*_*/
9797
vsprojects/
9898
xcprojects/
99+
GPATH
100+
GRTAGS
101+
GTAGS
99102

100103
# Build folders #
101104
#################

‎builder/docs_builder.livecodescript‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,6 +1970,9 @@ private function builderGetDocsAPIData pExtensions
19701970
local tLcdoc
19711971
put revDocsGenerateDocsFileFromModularFile(tFolder & slash & tSource) into tLcdoc
19721972

1973+
# Output the lcdoc file
1974+
put textEncode(tLcdoc, "utf-8") into url ("binfile:" & tFolder & slash & "api.lcdoc")
1975+
19731976
# Convert to JSON
19741977
put revDocsFormatDocTextAsJSON(tLcdoc,"", "LiveCode") into tExtensionAPI
19751978

‎builder/server_builder.livecodescript‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ command serverBuilderRun pPlatform, pEdition
103103
end if
104104
end repeat
105105

106-
repeat for each word tDriver in "dbsqlite dbmysql dbpostgresql dbodbc dboracle"
106+
// SN-2015-06-25: [[ ServerBuilder ]] DBoracle has never been in the Server zip.
107+
// Removed to suppress the builder warning
108+
repeat for each word tDriver in "dbsqlite dbmysql dbpostgresql dbodbc"
107109
get tEngineFolder & slash & "server-" & tDriver & tLibExtension
108110
if there is a file it then
109111
builderLog "message", "Adding driver '" & tDriver & "'"

‎docs/dictionary/command/open-socket.lcdoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ The most common CAs such as verisign can be found in the file root.pem. If a ve
7171

7272
For technical information about the numbers used to designate standard ports, see the list of port numbers at <http://www.iana.org/assignments/port-numbers>, in particular the section titled "Well Known Port Numbers".
7373

74-
>*Important:* The open secure socket command is part of the SSL & Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. In the Inclusions section on the General screen of the Standalone Application Settings window, make sure "SSL & Encryption" is selected in the list of script libraries.
74+
>*Important:* The open secure socket command is part of the SSL & Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. For desktop standalones, in the Inclusions section on the General screen of the Standalone Application Settings window, make sure "SSL & Encryption" is selected in the list of script libraries. For iOS standalones, in the "Basic Application Settings" section on the iOS screen of the Standalone Application Settings window, make sure "Encryption" is checked. For Android standalones, in the "Basic Application Settings" section on the Android screen of the Standalone Application Settings window, make sure "SSL & Encryption" is checked.
75+
>*Important:*
76+
On Android, when using remote sockets, internet permissions must be enabled. Do this by selecting the "Internet" checkbox of the "Application Permissions" section of the Android screen.
7577

7678
(4.5) The open socket command no longer blocks on DNS resolution. Instead, if resolution is required the command will return immediately and the DNS lookup will happen in the background. If resolution fails, then a socketError message is sent in the same was as if connection fails.
7779

‎docs/dictionary/command/secure-socket.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Summary: Secures an open socket.
1010

1111
Introduced: 6.6
1212

13-
OS: mac,windows,linux
13+
OS: mac,windows,linux,ios,android
1414

15-
Platforms: desktop
15+
Platforms: desktop,mobile
1616

1717
Security: network
1818

‎docs/dictionary/command/write-to-socket.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Summary: Sends data to a <socket>.
88

99
Introduced: 1.0
1010

11-
OS: mac,windows,linux
11+
OS: mac,windows,linux,ios,android
1212

13-
Platforms: desktop,server,web
13+
Platforms: desktop,server,web,mobile
1414

1515
Security: network
1616

‎docs/dictionary/function/ceil.xml‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎docs/dictionary/function/commandArguments.lcdoc‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
Name: commandArguments
2+
3+
Type: function
4+
5+
Syntax: the commandArguments
6+
7+
Syntax: commandArguments(<index>)
8+
9+
Syntax: the commandArguments of <index>
10+
11+
Summary: If no index is given, returns a 1-based, numeric array containing all the arguments given to the command.
12+
If an index is given, returns the argument corresponding to the index (1 being the first argument).
13+
14+
Introduced: 7.1.0
15+
16+
OS: mac,windows,linux
17+
18+
Platforms: desktop,server
19+
20+
Security: none
21+
22+
Example:
23+
put the keys of the commandArguments
24+
25+
Example:
26+
repeat for each element tArgument in the commandArguments
27+
if tArgument is "-v" then
28+
put true into tVerbose
29+
end if
30+
end repeat
31+
32+
Example:
33+
put commandArguments(1)
34+
35+
Parameters:
36+
index (integer): An integer greater than 0.
37+
If the index is greater than the number of arguments, then commandArguments returns empty. .
38+
39+
Returns: Returns either a numeric array with all the commandline arguments if no <index> is given, or the argument at the <index> specified.
40+
41+
Description:
42+
Returns a 1-based numeric array containing the commandline arguments
43+
44+
With no index given, the <commandArguments> function returns an 1-based, numeric array containing the arguments given at the launch of the application.
45+
With an index given, it returns the commandline argument at this index
46+
The list only exists on desktop standalones applications and server scripts. On mobile platform or in the IDE, the <commandArguments> returns empty.
47+
48+
References: $ (keyword)

‎docs/dictionary/function/commandName.lcdoc‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Name: commandName
2+
3+
Type: function
4+
5+
Syntax: the commandName
6+
7+
Summary: Returns the command name used to start the execution of the application
8+
9+
Introduced: 7.1.0
10+
11+
OS: mac,windows,linux
12+
13+
Platforms: desktop,server
14+
15+
Security: none
16+
17+
Example:
18+
put the commandName
19+
20+
Example:
21+
set the itemdelimiter to slash
22+
put the last item of the commandName into field "log"
23+
24+
Description:
25+
Returns the full command name that has been used to start the executable.
26+
27+
The <commandName> is only available for standalone applications and server scripts. It returns empty for mobile platforms and in the IDE.
28+
29+
References: $ (keyword)

‎docs/dictionary/function/floor.xml‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)