Skip to content

Commit bbbd258

Browse files
author
livecodeali
committed
Merge branch 'develop' of github.com:runrev/livecode into feature-treeview_enhancements
2 parents fbc4fe7 + 60e2c02 commit bbbd258

File tree

71 files changed

+1031
-134
lines changed

Some content is hidden

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

71 files changed

+1031
-134
lines changed

‎.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
31+
make all-linux && make -C tests/lcb check
3232
fi
3333
3434
addons:

‎Installer/package.txt‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ installer LiveCode
8888
include Commercial.IndyComponents
8989
if TargetEdition is Business then
9090
include Commercial.BusinessComponents
91+
if TargetEdition is Community then
92+
include Runtime.Emscripten
9193

9294
component Runtime
9395
include Runtime.[[TargetPlatform]]
@@ -535,33 +537,33 @@ component Documentation
535537
file ide:Documentation/html_viewer/resources/data/guide/built_guide.js as resources/data/guide/built_guide.js
536538

537539
component Extensions
538-
into [[ToolsFolder]]/extensions place
540+
into [[ToolsFolder]]/Extensions place
539541
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.clock
540-
into [[ToolsFolder]]/extensions place
542+
into [[ToolsFolder]]/Extensions place
541543
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.colorswatch
542-
into [[ToolsFolder]]/extensions place
544+
into [[ToolsFolder]]/Extensions place
543545
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.gradientrampeditor
544-
into [[ToolsFolder]]/extensions place
546+
into [[ToolsFolder]]/Extensions place
545547
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.graph
546-
into [[ToolsFolder]]/extensions place
548+
into [[ToolsFolder]]/Extensions place
547549
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.header
548-
into [[ToolsFolder]]/extensions place
550+
into [[ToolsFolder]]/Extensions place
549551
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.iconpicker
550-
into [[ToolsFolder]]/extensions place
552+
into [[ToolsFolder]]/Extensions place
551553
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.iconsvg
552-
into [[ToolsFolder]]/extensions place
554+
into [[ToolsFolder]]/Extensions place
553555
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.navbar
554-
into [[ToolsFolder]]/extensions place
556+
into [[ToolsFolder]]/Extensions place
555557
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.paletteactions
556-
into [[ToolsFolder]]/extensions place
558+
into [[ToolsFolder]]/Extensions place
557559
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.segmented
558-
into [[ToolsFolder]]/extensions place
560+
into [[ToolsFolder]]/Extensions place
559561
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.selector
560-
into [[ToolsFolder]]/extensions place
562+
into [[ToolsFolder]]/Extensions place
561563
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.svgpath
562-
into [[ToolsFolder]]/extensions place
564+
into [[ToolsFolder]]/Extensions place
563565
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.switchbutton
564-
into [[ToolsFolder]]/extensions place
566+
into [[ToolsFolder]]/Extensions place
565567
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.treeview
566568

567569
component Toolchain.MacOSX
@@ -673,6 +675,14 @@ component Runtime.MacOSX
673675
into [[TargetFolder]]/Support place
674676
executable macosx:revpdfprinter.bundle
675677
executable macosx:revsecurity.dylib
678+
//////////
679+
680+
component Runtime.Emscripten
681+
into "[[ToolsFolder]]/Runtime/Emscripten/js" place
682+
file emscripten:standalone[[BaseEditionTagLower]]-[[VersionTag]].html
683+
file emscripten:standalone[[BaseEditionTagLower]]-[[VersionTag]].html.mem
684+
file emscripten:standalone[[BaseEditionTagLower]]-[[VersionTag]].js
685+
rfolder emscripten:emscripten-standalone-template
676686

677687
//////////
678688

@@ -961,6 +971,7 @@ component Toolset
961971
stack ide-support:revdeploylibraryios.livecodescript
962972
stack ide-support:revliburl.livecodescript
963973
stack ide-support:revsaveasandroidstandalone.livecodescript
974+
stack ide-support:revsaveasemscriptenstandalone.livecodescript
964975
stack ide-support:revsaveasiosstandalone.livecodescript
965976
stack ide-support:revsaveasstandalone.livecodescript
966977
stack ide-support:revsblibrary.livecodescript

‎builder/builder_utilities.livecodescript‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ command builderFetchEngine pVersion, pPlatform
111111
return sEngineDir & slash & "ios-bin"
112112
case "android"
113113
return sEngineDir & slash & "android-armv6-bin"
114+
case "emscripten"
115+
return sEngineDir & slash & "emscripten-bin"
114116
default
115117
write the executionContexts to stderr
116118
builderLog "error", "Unknown platform '" & pPlatform & "'"

‎builder/tools_builder.livecodescript‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ command toolsBuilderRun pPlatform, pEdition, pVersion
1515
-- If on windows or linux, we can't do anything macosxy due to lack of lipo/strip :o(
1616
local tEngineFolders
1717

18-
get "windows linux-x86 linux-x86_64 linux-armv6hf macosx ios android"
18+
get "windows linux-x86 linux-x86_64 linux-armv6hf macosx ios android emscripten"
1919

2020
repeat for each word tPlatform in it
2121
builderFetchEngine pVersion, tPlatform
@@ -112,6 +112,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
112112
packageCompilerConfigureSource tPackager, "windows", pEngineFolders["windows"]
113113
packageCompilerConfigureSource tPackager, "ios", pEngineFolders["ios"]
114114
packageCompilerConfigureSource tPackager, "android", pEngineFolders["android"]
115+
packageCompilerConfigureSOurce tPackager, "emscripten", pEngineFolders["emscripten"]
115116
packageCompilerConfigureSource tPackager, "prebuilt", builderRepoFolder() & slash & "prebuilt"
116117
packageCompilerConfigureSource tPackager, "repo", builderRepoFolder()
117118
if tEditionType is among the items of "indy,business" then

‎common.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
'config/perl.gypi',
1111
'config/target_os.gypi',
1212
'config/thirdparty.gypi',
13+
'config/version.gypi',
1314
'config/yacc.gypi',
1415
],
1516
}

‎config/emscripten-settings.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
{
8787
'cflags':
8888
[
89-
'-O3',
89+
'-Os',
9090
'-g3',
9191
],
9292

‎config/version.gypi‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
'variables':
3+
{
4+
'version_major': "<!(perl -n -e '/^BUILD_MAJOR_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
5+
'version_minor': "<!(perl -n -e '/^BUILD_MINOR_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
6+
'version_point': "<!(perl -n -e '/^BUILD_POINT_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
7+
'version_build': "<!(perl -n -e '/^BUILD_REVISION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
8+
9+
'version_string': "<!(perl -n -e '/^BUILD_SHORT_VERSION[[:blank:]]*=[[:blank:]]*(.*)$/ && print $1' <(DEPTH)/version)",
10+
11+
'git_revision': '<!(git rev-parse HEAD)',
12+
},
13+
}

‎docs/dictionary/command/get.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Example:
2222
get message -- evaluates expression in message box
2323

2424
Example:
25-
get URL "https://www.runrev.com"
25+
get URL "https://www.livecode.com"
2626

2727
Parameters:
2828
expression: Any expression that yields a value.

‎docs/dictionary/command/launch-url.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Platforms: desktop,mobile
1515
Security: process
1616

1717
Example:
18-
launch url "http://www.runrev.com"
18+
launch url "http://www.livecode.com"
1919

2020
Example:
2121
launch url "file:/Users/ben/Desktop/test.pdf"

‎docs/dictionary/command/mobileAddContact.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Example:
1616
put "Just adding this" into tContact["note"]
1717
put "Jobs Ave" into tContact["address"]["home"][1]["street"]
1818
put "Job City" into tContact["address"]["home"][1]["city"]
19-
put "test@runrev.com" into tContactData["email"]["home"][1]
19+
put "test@livecode.com" into tContactData["email"]["home"][1]
2020
mobileUpdateContact tContact
2121

2222
Parameters:

0 commit comments

Comments
 (0)