Skip to content

Commit 6e9f68f

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop' of https://github.com/livecode/livecode into feature-browser_widget_callbacks
2 parents d8133ea + f244683 commit 6e9f68f

561 files changed

Lines changed: 5365 additions & 3965 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ install: (cd prebuilt && ./fetch-libraries.sh linux)
2828
# the default test suite.
2929
script: >
3030
if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then
31-
make all-linux && make -C tests/lcb check
31+
make all-linux && make -C tests/lcb && make -C tests/lcs
3232
fi
3333
3434
addons:

‎Installer/package.txt‎

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,8 @@ component Extensions
551551
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.iconpicker
552552
into [[ToolsFolder]]/Extensions place
553553
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.iconsvg
554+
into [[ToolsFolder]]/Extensions place
555+
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.json
554556
into [[ToolsFolder]]/Extensions place
555557
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.navbar
556558
into [[ToolsFolder]]/Extensions place
@@ -747,20 +749,35 @@ component Runtime.iOS
747749
file ios:iphonesimulator8.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
748750
file ios:iphonesimulator8.2/fontmap as "fontmap"
749751
into "[[ToolsFolder]]/Runtime/iOS/Simulator-8_4" place
750-
executable ios:iphonesimulator8.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator6.1/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
751-
executable ios:iphonesimulator8.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator6.1/revsecurity.dylib
752-
executable ios:iphonesimulator8.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator6.1/revpdfprinter.dylib
753-
executable ios:iphonesimulator8.4/revzip.ios-extension as RevZip base ios:iphonesimulator6.1/revzip.dylib
754-
executable ios:iphonesimulator8.4/revxml.ios-extension as RevXml base ios:iphonesimulator6.1/revxml.dylib
755-
executable ios:iphonesimulator8.4/revdb.ios-extension as RevDb base ios:iphonesimulator6.1/revdb.dylib
756-
executable ios:iphonesimulator8.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator6.1/dbsqlite.dylib
757-
executable ios:iphonesimulator8.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator6.1/dbmysql.dylib
752+
executable ios:iphonesimulator8.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
753+
executable ios:iphonesimulator8.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
754+
executable ios:iphonesimulator8.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
755+
executable ios:iphonesimulator8.4/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
756+
executable ios:iphonesimulator8.4/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
757+
executable ios:iphonesimulator8.4/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
758+
executable ios:iphonesimulator8.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
759+
executable ios:iphonesimulator8.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
758760
file ios:iphonesimulator8.4/mobile-template.plist as "Settings.plist"
759761
file ios:iphonesimulator8.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
760762
file ios:iphonesimulator8.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
761763
file ios:iphonesimulator8.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
762764
file ios:iphonesimulator8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
763765
file ios:iphonesimulator8.4/fontmap as "fontmap"
766+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_0" place
767+
executable ios:iphonesimulator9.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
768+
executable ios:iphonesimulator9.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
769+
executable ios:iphonesimulator9.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
770+
executable ios:iphonesimulator9.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
771+
executable ios:iphonesimulator9.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
772+
executable ios:iphonesimulator9.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
773+
executable ios:iphonesimulator9.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
774+
executable ios:iphonesimulator9.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
775+
file ios:iphonesimulator9.0/mobile-template.plist as "Settings.plist"
776+
file ios:iphonesimulator9.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
777+
file ios:iphonesimulator9.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
778+
file ios:iphonesimulator9.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
779+
file ios:iphonesimulator9.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
780+
file ios:iphonesimulator9.0/fontmap as "fontmap"
764781
into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
765782
executable ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
766783
executable ios:iphoneos8.2/revsecurity.ios-extension as RevSecurity
@@ -801,6 +818,26 @@ component Runtime.iOS
801818
file ios:iphoneos8.4/template-ResourceRules.plist as "ResourceRules.plist"
802819
file ios:iphoneos8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
803820
file ios:iphoneos8.4/fontmap as "fontmap"
821+
into "[[ToolsFolder]]/Runtime/iOS/Device-9_0" place
822+
executable ios:iphoneos9.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
823+
executable ios:iphoneos9.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
824+
executable ios:iphoneos9.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
825+
executable ios:iphoneos9.0/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
826+
executable ios:iphoneos9.0/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
827+
executable ios:iphoneos9.0/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
828+
executable ios:iphoneos9.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
829+
executable ios:iphoneos9.0/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
830+
file ios:iphoneos9.0/mobile-device-template.plist as "Settings.plist"
831+
file ios:iphoneos9.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
832+
file ios:iphoneos9.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
833+
file ios:iphoneos9.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
834+
file ios:iphoneos9.0/template-entitlements.xcent as "Entitlements.xcent"
835+
file ios:iphoneos9.0/template-store-entitlements.xcent as "StoreEntitlements.xcent"
836+
file ios:iphoneos9.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
837+
file ios:iphoneos9.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
838+
file ios:iphoneos9.0/template-ResourceRules.plist as "ResourceRules.plist"
839+
file ios:iphoneos9.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
840+
file ios:iphoneos9.0/fontmap as "fontmap"
804841

805842
////////////////////////////////////////////////////////////////////////////////
806843

‎builder/docs_builder.livecodescript‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,8 +1911,10 @@ end escape
19111911
command docsBuilderGenerateDocsNew
19121912
start using stack (builderRepoFolder() & slash & "ide-support" & slash & "revdocsparser.livecodescript")
19131913
builderLog "report", "Building guide into" && builderGuideFolder() & slash & "distributed_guide.js"
1914+
pathEnsure (builderGuideFolder())
19141915
docsBuilderGenerateDistributedGuide
19151916
builderLog "report", "Building api into" && builderAPIFolder() & slash & "distributed_api.js"
1917+
pathEnsure (builderAPIFolder())
19161918
docsBuilderGenerateDistributedAPI
19171919

19181920
# Build the actual JSON data for the dictionary. This is needed until the docs are built on the fly in a

‎builder/markdown_compiler.rev‎

-143 KB
Binary file not shown.

‎builder/release_notes_builder.livecodescript‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -442,13 +442,10 @@ function notesFolderToHTML pIsIDE, pFolder, pVersion, pTags, @xContents, @rUpdat
442442
else
443443
put tLine into tFile
444444
end if
445-
put url ("file:" & tFile) into tFileText
446-
put the number of lines of tFileText into tNumLines
447445

448-
// AL-2014-11-14: Still a one-liner if the bugfix note contains a second empty line
449-
if tNumLines is 2 and word 1 of line 2 of tFileText is empty then
450-
delete line 2 of tFileText
451-
end if
446+
# Delete any empty trailing lines
447+
put word 1 to -1 of url ("file:" & tFile) into tFileText
448+
put the number of lines of tFileText into tNumLines
452449

453450
if tLine contains "bugfix" then
454451
local tOffset
@@ -458,7 +455,7 @@ function notesFolderToHTML pIsIDE, pFolder, pVersion, pTags, @xContents, @rUpdat
458455
put tOneLiners & tId & "," & tTitle & CR into tOneLiners
459456
put tId & " - " & tTitle & CR after rUpdateBugs
460457
end if
461-
if tNumLines > 1 and not (tNumLines is 2 and the last line of tFileText is not empty) then
458+
if tNumLines > 1 then
462459
if tLine contains "feature" then put char 2 to -1 of line 1 of tFileText & CR after rUpdateFeatures
463460
put markdownToHTML(tFileText, 2, 1, xContents, true) into tParsedFile
464461
if tParsedFile is not empty then

‎config/emscripten-settings.gypi‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919

2020
'cflags':
2121
[
22+
'-s ALLOW_MEMORY_GROWTH=1',
2223
'-s ASSERTIONS=1',
2324
'-s DEMANGLE_SUPPORT=1',
24-
'-s WARN_ON_UNDEFINED_SYMBOLS=1',
25-
'-s ALLOW_MEMORY_GROWTH=1',
26-
2725
'-s EMTERPRETIFY=1',
2826
'-s EMTERPRETIFY_ASYNC=1',
27+
'-s LINKABLE=1',
28+
'-s RESERVED_FUNCTION_POINTERS=1024',
29+
'-s TOTAL_MEMORY=67108864',
30+
'-s WARN_ON_UNDEFINED_SYMBOLS=1',
2931
],
3032

3133
'cflags_c':

‎docs/dictionary/command/constant.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ If you place the <constant> <statement> in a <handler>, you can use the <constan
3636

3737
Once you have defined a constant, you cannot redefine it in the same handler; doing so causes an execution error.
3838

39-
You can use the <constant> <command> to redefine <Revolution|LiveCode's> built-in <constant(glossary)|constants> within a <script> or <handler>, but doing so makes your code harder to read and maintain. To find out whether a word is already defined as a built-in <constant(command)>, use the <constantNames> <function>.
39+
You can use the <constant> <command> to redefine <LiveCode|LiveCode's> built-in <constant(glossary)|constants> within a <script> or <handler>, but doing so makes your code harder to read and maintain. To find out whether a word is already defined as a built-in <constant(command)>, use the <constantNames> <function>.
4040

4141
>*Tip:* To see a list of built-in constants, open the Documentation window, click LiveCode Dictionary, and choose "Constants" from the menu at the top of the window.
4242

43-
References: script (property), watch (constant), false (constant), slash (constant), comma (constant), plus (constant), null (constant), pi (constant), iBeam (constant), colon (constant), three (constant), formfeed (constant), help (constant), five (constant), zero (constant), seven (constant), eight (constant), CRLF (constant), quote (constant), empty (constant), space (constant), arrow (constant), six (constant), ten (constant), four (constant), two (constant), constant (command), local (command), constantNames (function), Revolution (glossary), value (glossary), handler (glossary), string (glossary), statement (glossary), constant (glossary), keyword (glossary), command (glossary), function (control_st)
43+
References: script (property), watch (constant), false (constant), slash (constant), comma (constant), plus (constant), null (constant), pi (constant), iBeam (constant), colon (constant), three (constant), formfeed (constant), help (constant), five (constant), zero (constant), seven (constant), eight (constant), CRLF (constant), quote (constant), empty (constant), space (constant), arrow (constant), six (constant), ten (constant), four (constant), two (constant), constant (command), local (command), constantNames (function), LiveCode (glossary), value (glossary), handler (glossary), string (glossary), statement (glossary), constant (glossary), keyword (glossary), command (glossary), function (control_st)
4444

4545
Tags: properties

‎docs/dictionary/command/define.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Type: command
44

55
Syntax: define <property> of <object>
66

7-
Summary: Has no effect and is included in <Revolution|LiveCode> for compatibility with imported <SuperCard> projects.
7+
Summary: Has no effect and is included in <LiveCode> for compatibility with imported <SuperCard> projects.
88

99
Introduced: 1.0
1010

@@ -19,4 +19,4 @@ In SuperCard and Oracle Media Objects, the <define> <command> is used to create
1919

2020
In LiveCode, you can use a custom property simply by setting its value with the set <command>, without creating it first, so this <command> is not needed.
2121

22-
References: undefine (command), custom property (glossary), SuperCard (glossary), command (glossary), Revolution (glossary)
22+
References: undefine (command), custom property (glossary), SuperCard (glossary), command (glossary), LiveCode (glossary)

‎docs/dictionary/command/delete-URL.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ Normally, FTP servers do not allow anonymous users to delete files, for obvious
4343

4444
>*Note:* When used with an <ftp> or <http> <URL>, the <delete URL> <command> is <blocking> : that is, the <handler> pauses until LiveCode is finished deleting the <URL>. Since deleting a file from a server may take some time due to network lag, the <delete URL> <command> may take long enough to be noticeable to the user.
4545

46-
>*Important:* The <delete URL> <command> is part of the <Internet library>. To ensure that the <command> works in a <standalone application>, you must include this <Revolution custom library|custom library> when you create your <standalone application|standalone>. In the Inclusions section of the <Standalone Application Settings> window, make sure "Internet Library" is selected in the list of script libraries.
46+
>*Important:* The <delete URL> <command> is part of the <Internet library>. To ensure that the <command> works in a <standalone application>, you must include this <LiveCode custom library|custom library> when you create your <standalone application|standalone>. In the Inclusions section of the <Standalone Application Settings> window, make sure "Internet Library" is selected in the list of script libraries.
4747

4848
>*Note:* When included in a <standalone application>, the <Internet library> is implemented as a hidden <group> and made available when the <group> receives its first <openBackground> message. During the first part of the <application|application's> startup process, before this <message> is sent, the <delete URL> <command> is not yet available. This may affect attempts to use this <command> in <startup>, <preOpenStack>, <openStack>, or <preOpenCard> <handler|handlers> in the <main stack>. Once the <application> has finished starting up, the <library> is available and the <delete URL> <command> can be used in any <handler>.
4949

50-
References: startup (message), openBackground (message), preOpenStack (message), openStack (message), preOpenCard (message), Revolution custom library (library), put (library), library (library), Internet library (library), binfile (keyword), ftp (keyword), file (keyword), URL (keyword), http (keyword), function (control_st), application (glossary), standalone application (glossary), statement (glossary), delete folder (glossary), blocking (glossary), Standalone Application Settings (glossary), command (glossary), expression (glossary), main stack (glossary), group (glossary), delete file (glossary), local file (glossary), server (glossary), upload (glossary), folder (glossary), message (glossary), handler (glossary), libURLSetFTPStopTime (command), post (command), delete file (command), delete folder (command), result (function)
50+
References: startup (message), openBackground (message), preOpenStack (message), openStack (message), preOpenCard (message), LiveCode custom library (library), put (library), library (library), Internet library (library), binfile (keyword), ftp (keyword), file (keyword), URL (keyword), http (keyword), function (control_st), application (glossary), standalone application (glossary), statement (glossary), delete folder (glossary), blocking (glossary), Standalone Application Settings (glossary), command (glossary), expression (glossary), main stack (glossary), group (glossary), delete file (glossary), local file (glossary), server (glossary), upload (glossary), folder (glossary), message (glossary), handler (glossary), libURLSetFTPStopTime (command), post (command), delete file (command), delete folder (command), result (function)
5151

5252
Tags: networking

‎docs/dictionary/command/do.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ To see how to create a numbered set of variables see the dictionary entry for th
5050
The ability to specify an <alternateLanguageName> on Windows systems was added in LiveCode 2.9.
5151

5252
Changes:
53-
The <alternateLanguageName> option was introduced in version 1.1. In previous versions, it was not possible to include AppleScript or other <Open Scripting Architecture (OSA)|OSA> languages in a <Revolution|LiveCode> <handler>.
53+
The <alternateLanguageName> option was introduced in version 1.1. In previous versions, it was not possible to include AppleScript or other <Open Scripting Architecture (OSA)|OSA> languages in a <LiveCode> <handler>.
5454

55-
References: message box (keyword), as (keyword), debugDo (command), breakpoint (command), local (command), call (command), local command (command), result (function), alternateLanguages (function), system (glossary), Revolution (glossary), handler (glossary), execute (glossary), statement (glossary), Unix (glossary), compile (glossary), command (glossary), Open Scripting Architecture (OSA) (glossary)
55+
References: message box (keyword), as (keyword), debugDo (command), breakpoint (command), local (command), call (command), local command (command), result (function), alternateLanguages (function), system (glossary), LiveCode (glossary), handler (glossary), execute (glossary), statement (glossary), Unix (glossary), compile (glossary), command (glossary), Open Scripting Architecture (OSA) (glossary)

0 commit comments

Comments
 (0)