Skip to content

Commit d7c4bee

Browse files
livecodefraserlivecodefraser
committed
Merge branch 'develop' of https://github.com/runrev/livecode into mac64-cleanups
Conflicts: engine/src/osxprefix.h
2 parents 9c535b3 + 679756f commit d7c4bee

349 files changed

Lines changed: 172723 additions & 6120 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
@@ -38,7 +38,7 @@ addons:
3838
# 'coverity_scan' branch.
3939
coverity_scan:
4040
project:
41-
name: "runrev/livecode"
41+
name: "livecode/livecode"
4242
description: "Build submitted via Travis CI"
4343
notification_email: engineteam@livecode.com
4444
build_command: "make all-linux"

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Once your changes have been reviewed and tested, they will be merged in time for
8080

8181
Finding and fixing bugs in LiveCode is a particularly valuable contribution.
8282

83-
If you've found a bug, please add a ticket to the [LiveCode issue tracking system](http://quality.runrev.com/). This will give you a bug number which can be used whenever discussing the issue, and included in git commit log messages and in GitHub pull request descriptions. This will help other contributors keep track of who's working on what.
83+
If you've found a bug, please add a ticket to the [LiveCode issue tracking system](http://quality.livecode.com/). This will give you a bug number which can be used whenever discussing the issue, and included in git commit log messages and in GitHub pull request descriptions. This will help other contributors keep track of who's working on what.
8484

8585
When you submit a pull request that fixes a bug, the status of the bug should be set to "AWAITING_MERGE" -- please also add a comment to the bug with a link to the pull request's page.
8686

‎Installer/package.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
// This is where the application executable/bundle will be placed:
55
// Windows: C:/Program Files/LiveCode 4.5 (dp 5)
66
// Mac OS X: /Applications
7-
// Linux: /opt/runrev/livecode-4.5-dp-5
7+
// Linux: /opt/livecode/livecode-4.5-dp-5
88
//
99
// SupportFolder:
1010
// This is where supporting (user-accessible) resources will be placed:
1111
// Windows: C:/Program Files/LiveCode 4.5 (dp 5)
1212
// Mac OS X: /Application/LiveCode 4.5 (dp 5).app/Contents/Support
13-
// Linux: /opt/runrev/livecode-4.5-dp-5
13+
// Linux: /opt/livecode/livecode-4.5-dp-5
1414
//
1515
// ToolsFolder:
1616
// This is where the toolset will be placed:
1717
// Windows: C:/Program Files/LiveCode 4.5 (dp 5)
1818
// Mac OS X: /Application/LiveCode 4.5 (dp 5).app/Contents/Tools
19-
// Linux: /opt/runrev/livecode-4.5-dp-5
19+
// Linux: /opt/livecode/livecode-4.5-dp-5
2020
//
2121
// ProductTitle:
2222
// LiveCode 4.5 (dp 5)
@@ -113,13 +113,13 @@ component Uninstaller
113113
register key "HKLM/Software/Microsoft/Windows/CurrentVersion/Uninstall/[[ProductTitle]]"
114114
with RegistryRoot as "HKLM/Software/Microsoft/Windows/CurrentVersion/Uninstall/[[ProductTitle]]" do
115115
register value "DisplayIcon" as path "[[TargetFolder]]/[[ProductName]].exe"
116-
register value "DisplayName" as "RunRev [[ProductTitle]]"
116+
register value "DisplayName" as "[[ProductTitle]]"
117117
register value "DisplayVersion" as "[[VersionTag]]"
118118
register value "InstallDate" as "[[TodaysDate]]"
119119
register value "InstallLocation" as path "[[TargetFolder]]"
120120
register value "NoModify" as 1
121121
register value "NoRepair" as 1
122-
register value "Publisher" as "RunRev Ltd."
122+
register value "Publisher" as "LiveCode Ltd."
123123
register value "Version" as "[[VersionTag]]"
124124
register value "UninstallString" as path "\q[[TargetFolder]]/.setup.exe\q uninstall"
125125
if TargetPlatform is "Linux" then
@@ -151,6 +151,7 @@ component Plugins
151151
stack ide:Plugins/Go_RevNet.rev
152152
stack ide:Plugins/Navigator.rev
153153
stack "ide:Plugins/RegExBuilder 1.6.rev"
154+
stack ide:Plugins/revapplicationoverview.rev
154155
stack ide:Plugins/revexample.rev
155156
stack "ide:Plugins/revSmartProperties 1.2.rev"
156157
stack "ide:Plugins/revSmartSave 1.1.rev"
@@ -536,7 +537,7 @@ component Documentation
536537
// Temporary work-around
537538
file ide:Documentation/html_viewer/resources/data/api/built_api.js as resources/data/api/built_api.js
538539
file ide:Documentation/html_viewer/resources/data/guide/built_guide.js as resources/data/guide/built_guide.js
539-
540+
file ide::Documentation/html_viewer/resources/data/api/built_api.js as resources/data/api/api.sqlite
540541
component Extensions
541542
into [[ToolsFolder]]/Extensions place
542543
rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.browser

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ check: check-$(guess_platform)
7070
check-common-%:
7171
$(MAKE) -C tests bin_dir=../$*-bin
7272
$(MAKE) -C ide/tests bin_dir=../../$*-bin
73+
$(MAKE) -C extensions bin_dir=../$*-bin
7374

7475
################################################################
7576
# Linux rules

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ There are several ways to get help with installing and using LiveCode:
8888

8989
* Visit the [LiveCode open source forums](http://forums.livecode.com/viewforum.php?f=65). In particular, you may wish to post your question in the [Engine Contributors](http://forums.livecode.com/viewforum.php?f=66) forum.
9090

91-
* If you have discovered a bug, have a feature request, or have written a patch to improve LiveCode, please create an ticket in the [LiveCode issue tracking system](http://quality.runrev.com/).
91+
* If you have discovered a bug, have a feature request, or have written a patch to improve LiveCode, please create an ticket in the [LiveCode issue tracking system](http://quality.livecode.com/).
9292

9393
## Contributing to LiveCode
9494

‎benchmarks/_benchmarklib.livecodescript‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
script "BenchmarkLibrary"
2+
/*
3+
Copyright (C) 2015 LiveCode Ltd.
4+
5+
This file is part of LiveCode.
6+
7+
LiveCode is free software; you can redistribute it and/or modify it under
8+
the terms of the GNU General Public License v3 as published by the Free
9+
Software Foundation.
10+
11+
LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
12+
WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
18+
19+
----------------------------------------------------------------
20+
-- Helper functions
21+
----------------------------------------------------------------
22+
23+
----------------------------------------------------------------
24+
-- Benchmark library functions
25+
----------------------------------------------------------------
26+
27+
local sBenchmarkStartTime
28+
local sBenchmarkVariant
29+
30+
on BenchmarkStartTiming pVariant
31+
put pVariant into sBenchmarkVariant
32+
put the millisecs into sBenchmarkStartTime
33+
end BenchmarkStartTiming
34+
35+
on BenchmarkStopTiming
36+
write sBenchmarkVariant & tab & (the millisecs - sBenchmarkStartTime) & return to stdout
37+
end BenchmarkStopTiming
38+
39+
on BenchmarkLoadNativeTextFile pFilename
40+
set the itemDelimiter to slash
41+
put item 1 to -2 of the filename of the target & slash & pFilename into pFilename
42+
43+
get url ("binfile:" & pFilename)
44+
if the result is not empty then
45+
throw "BenchmarkLoadNativeTextFile" && quote & pFilename & quote && "failed" & return & it
46+
end if
47+
replace crlf with lf in it
48+
replace numToChar(13) with lf in it
49+
50+
return it
51+
end BenchmarkLoadNativeTextFile
52+
53+
on errorDialog executionError, parseError
54+
write executionError & return to stderr
55+
quit 1
56+
end errorDialog

0 commit comments

Comments
 (0)