Merge branch 'develop' of https://github.com/runrev/livecode into mac…

…64-cleanups

Conflicts:
	engine/src/osxprefix.h

.travis.yml

@@ -38,7 +38,7 @@ addons:
   # 'coverity_scan' branch.
   coverity_scan:
     project:
-      name: "runrev/livecode"
+      name: "livecode/livecode"
       description: "Build submitted via Travis CI"
     notification_email: engineteam@livecode.com
     build_command: "make all-linux"

CONTRIBUTING.md

@@ -80,7 +80,7 @@ Once your changes have been reviewed and tested, they will be merged in time for
 
 Finding and fixing bugs in LiveCode is a particularly valuable contribution.
 
-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.
+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.
 
 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.
 

Installer/package.txt

@@ -4,19 +4,19 @@
 //    This is where the application executable/bundle will be placed:
 //      Windows: C:/Program Files/LiveCode 4.5 (dp 5)
 //      Mac OS X: /Applications
-//      Linux: /opt/runrev/livecode-4.5-dp-5
+//      Linux: /opt/livecode/livecode-4.5-dp-5
 //
 //  SupportFolder:
 //    This is where supporting (user-accessible) resources will be placed:
 //      Windows: C:/Program Files/LiveCode 4.5 (dp 5)
 //      Mac OS X: /Application/LiveCode 4.5 (dp 5).app/Contents/Support
-//      Linux: /opt/runrev/livecode-4.5-dp-5
+//      Linux: /opt/livecode/livecode-4.5-dp-5
 //
 //  ToolsFolder:
 //    This is where the toolset will be placed:
 //      Windows: C:/Program Files/LiveCode 4.5 (dp 5)
 //      Mac OS X: /Application/LiveCode 4.5 (dp 5).app/Contents/Tools
-//      Linux: /opt/runrev/livecode-4.5-dp-5
+//      Linux: /opt/livecode/livecode-4.5-dp-5
 //
 //  ProductTitle:
 //    LiveCode 4.5 (dp 5)
@@ -113,13 +113,13 @@ component Uninstaller
 		register key "HKLM/Software/Microsoft/Windows/CurrentVersion/Uninstall/[[ProductTitle]]"
 		with RegistryRoot as "HKLM/Software/Microsoft/Windows/CurrentVersion/Uninstall/[[ProductTitle]]" do
 			register value "DisplayIcon" as path "[[TargetFolder]]/[[ProductName]].exe"
-			register value "DisplayName" as "RunRev [[ProductTitle]]"
+			register value "DisplayName" as "[[ProductTitle]]"
 			register value "DisplayVersion" as "[[VersionTag]]"
 			register value "InstallDate" as "[[TodaysDate]]"
 			register value "InstallLocation" as path "[[TargetFolder]]"
 			register value "NoModify" as 1
 			register value "NoRepair" as 1
-			register value "Publisher" as "RunRev Ltd."
+			register value "Publisher" as "LiveCode Ltd."
 			register value "Version" as "[[VersionTag]]"
 			register value "UninstallString" as path "\q[[TargetFolder]]/.setup.exe\q uninstall"
 	if TargetPlatform is "Linux" then
@@ -151,6 +151,7 @@ component Plugins
 		stack ide:Plugins/Go_RevNet.rev
 		stack ide:Plugins/Navigator.rev
 		stack "ide:Plugins/RegExBuilder 1.6.rev"
+		stack ide:Plugins/revapplicationoverview.rev
 		stack ide:Plugins/revexample.rev
 		stack "ide:Plugins/revSmartProperties 1.2.rev"
 		stack "ide:Plugins/revSmartSave 1.1.rev"
@@ -536,7 +537,7 @@ component Documentation
 		// Temporary work-around
 		file ide:Documentation/html_viewer/resources/data/api/built_api.js as resources/data/api/built_api.js
 		file ide:Documentation/html_viewer/resources/data/guide/built_guide.js as resources/data/guide/built_guide.js
-
+		file ide::Documentation/html_viewer/resources/data/api/built_api.js as resources/data/api/api.sqlite
 component Extensions
 	into [[ToolsFolder]]/Extensions place
 		rfolder macosx:packaged_extensions/com.livecode.extensions.livecode.browser

Makefile

@@ -70,6 +70,7 @@ check: check-$(guess_platform)
 check-common-%:
 	$(MAKE) -C tests bin_dir=../$*-bin
 	$(MAKE) -C ide/tests bin_dir=../../$*-bin
+	$(MAKE) -C extensions bin_dir=../$*-bin
 
 ################################################################
 # Linux rules

README.md

@@ -88,7 +88,7 @@ There are several ways to get help with installing and using LiveCode:
 
 * 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.
 
-* 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/).
+* 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/).
 
 ## Contributing to LiveCode
 

benchmarks/_benchmarklib.livecodescript

@@ -0,0 +1,56 @@
+script "BenchmarkLibrary"
+/*
+Copyright (C) 2015 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+----------------------------------------------------------------
+-- Helper functions
+----------------------------------------------------------------
+
+----------------------------------------------------------------
+-- Benchmark library functions
+----------------------------------------------------------------
+
+local sBenchmarkStartTime
+local sBenchmarkVariant
+
+on BenchmarkStartTiming pVariant
+   put pVariant into sBenchmarkVariant
+   put the millisecs into sBenchmarkStartTime
+end BenchmarkStartTiming
+
+on BenchmarkStopTiming
+   write sBenchmarkVariant & tab & (the millisecs - sBenchmarkStartTime) & return to stdout
+end BenchmarkStopTiming
+
+on BenchmarkLoadNativeTextFile pFilename
+   set the itemDelimiter to slash
+   put item 1 to -2 of the filename of the target & slash & pFilename into pFilename
+
+   get url ("binfile:" & pFilename)
+   if the result is not empty then
+      throw "BenchmarkLoadNativeTextFile" && quote & pFilename & quote && "failed" & return & it
+   end if
+   replace crlf with lf in it
+   replace numToChar(13) with lf in it
+
+   return it
+end BenchmarkLoadNativeTextFile
+
+on errorDialog executionError, parseError
+   write executionError & return to stderr
+   quit 1
+end errorDialog