Skip to content

Commit 978dc86

Browse files
author
livecodeali
committed
Merge remote-tracking branch 'upstream/develop-7.0' into develop
Conflicts: docs/dictionary/command/answer-effect.xml docs/dictionary/command/get.xml docs/dictionary/command/launch-url.xml docs/dictionary/command/mobileAddContact.xml docs/dictionary/command/mobileComposeHtmlMail.xml docs/dictionary/command/mobileComposeMail.xml docs/dictionary/command/mobileComposeUnicodeMail.xml docs/dictionary/command/mobileUpdateContact.xml docs/dictionary/command/open-socket.xml docs/dictionary/command/play-video.xml docs/dictionary/command/print-link.xml docs/dictionary/command/put-cookie.xml docs/dictionary/command/revBrowserAddJavaScriptHandler.xml docs/dictionary/command/revBrowserNavigate.xml docs/dictionary/command/revBrowserSet.xml docs/dictionary/command/revMail.xml docs/dictionary/command/revVideoGrabDialog.xml docs/dictionary/command/revXMLRPC_SetHost.xml docs/dictionary/command/secure-socket.xml docs/dictionary/function/QTEffects.xml docs/dictionary/function/QTVersion.xml docs/dictionary/function/mobileControlGet.xml docs/dictionary/function/revBrowserOpen.xml docs/dictionary/function/revBrowserOpenCef.xml docs/dictionary/object/AndroidBrowser.xml docs/dictionary/object/iosBrowser.xml docs/dictionary/property/dontUseQT.xml engine/Makefile.kernel-standalone engine/src/flst.h engine/src/sysosxrandom.cpp engine/src/sysunxrandom.cpp engine/src/sysw32random.cpp ide libcore/include/sserialize.h libcore/include/sserialize_lnx.h libcore/include/sserialize_osx.h libcore/include/sserialize_w32.h libcore/src/binary.cpp libcore/src/sserialize.cpp libcore/src/sserialize_lnx.cpp libcore/src/sserialize_osx.cpp libcore/src/sserialize_w32.cpp libgraphics/src/coretext.cpp libgraphics/src/legacyblendmodes.cpp libgraphics/src/legacygradients.cpp libgraphics/src/mblandroidtext.cpp libgraphics/src/path.cpp libgraphics/src/utils.cpp thirdparty
2 parents bffe6d3 + 7bf4990 commit 978dc86

File tree

1,026 files changed

+2006
-1618
lines changed

Some content is hidden

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

1,026 files changed

+2006
-1618
lines changed

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Notes:
22

33
The majority of the code in the LiveCode Community edition is copyrighted
4-
by Runtime Revolution Ltd and has been released under the GPLv3.
4+
by LiveCode Ltd and has been released under the GPLv3.
55

66
However, the revBrowser component on Windows and secure sockets and
77
encryption feature on Windows and Linux utilises code that is under a
88
license incompatible with the GPL. Specifically revBrowser uses ATL and
99
the secure sockets and encryption feature uses OpenSSL.
1010

1111
To this end, as a special exception to the terms and conditions of the
12-
GPL listed below, Runtime Revolution Ltd gives you explicit permission to
12+
GPL listed below, LiveCode Ltd gives you explicit permission to
1313
combine its GPL code contained in LiveCode Community with ATL and
1414
OpenSSL. You may copy and distribute such a combination provided that
1515
you adhere to the terms and conditions of all of the GPL and licenses

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2015 Runtime Revolution Ltd.
1+
# Copyright (C) 2015 LiveCode Ltd.
22
#
33
# This file is part of LiveCode.
44
#

‎buildbot.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2015 Runtime Revolution Ltd.
1+
# Copyright (C) 2015 LiveCode Ltd.
22
#
33
# This file is part of LiveCode.
44
#

‎builder/installer_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "InstallerUtilities"
22
# This is the back-end installer, updater and uninstaller code.
33
# This code doesn't know anything about the product it is installing, and should be capable
4-
# of being re-used for products other than Revolution. It reads a "manifest" file, which contains
4+
# of being re-used for products other than LiveCode. It reads a "manifest" file, which contains
55
# a list of files to be installed and some metadata. The files are then installed according to command
66
# line options. Uninstallation uses a "record" file, which is created by the installer. This is basically the same
77
# as the manifest file, but with a little less information.

‎builder/mac_info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
16-
<string>runrevinstaller</string>
16+
<string>livecodeinstaller</string>
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleSignature</key>
@@ -27,7 +27,7 @@
2727
<key>NSAppleScriptEnabled</key>
2828
<string>YES</string>
2929
<key>NSHumanReadableCopyright</key>
30-
<string>Copyright 2000-2014, Runtime Revolution Ltd., All Rights Reserved.</string>
30+
<string>Copyright 2000-2015, LiveCode Ltd., All Rights Reserved.</string>
3131
<key>NSHighResolutionCapable</key>
3232
<true/>
3333
<key>LSBackgroundOnly</key>

‎builder/markdown_compiler.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "MarkdownCompiler"
22
/*
33
4-
Compiles RunRev flavoured markdown files to HTML
4+
Compiles LiveCode flavoured markdown files to HTML
55
66
MD:
77
##... <headings>

‎builder/package_compiler.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ private command compilerExecuteShortcut @self, pCommand
10331033
exit repeat
10341034
end if
10351035

1036-
-- See if the target matches a folder prefix (e.g. .../Revolution.app)
1036+
-- See if the target matches a folder prefix (e.g. .../LiveCode.app)
10371037
if item 2 of tLine begins with (tTarget & slash) then
10381038
put true into tFound
10391039
exit repeat

‎builder/public_key_setter‎

6.03 MB
Binary file not shown.

‎builder/release_notes_builder.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For images, use the syntax
2020
![<alt id>](<image number>.<extension>)
2121
The image must be named bugfix-<bug number>-<image number>.<extension>
2222
23-
Otherwise the file should be RunRev flavoured Markdown.
23+
Otherwise the file should be LiveCode flavoured Markdown.
2424
2525
Single line files will be added to the table of sepcific bug fixes along with a link to their entry
2626
on Bugzilla. Multiline files will have their own subsection in the release notes.

‎builder/tools_builder.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
364364
put tCertificatesFolder & "/runrev.pvk" into tSignParams["privatekey"]
365365
put word 1 of url ("file:" & tCertificatesFolder & "/runrev_password.txt") into tSignParams["passphrase"]
366366
put "http://timestamp.verisign.com/scripts/timstamp.dll" into tSignParams["timestamper"]
367-
put "http://www.runrev.com" into tSignParams["url"]
367+
put "http://www.livecode.com" into tSignParams["url"]
368368
if pEdition is "Community" then
369369
put "LiveCode Community Installer" into tSignParams["description"]
370370
else
@@ -412,7 +412,7 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
412412
local tPlistFile
413413
put macPList() into tPlistFile
414414
replace "[[BundleId]]" with "com.runrev.installer" in tPlistFile
415-
replace "[[BundleName]]" with "runrevinstaller" in tPlistFile
415+
replace "[[BundleName]]" with "livecodeinstaller" in tPlistFile
416416

417417
create folder tOutputFileStub & ".app"
418418
create folder tOutputFileStub & ".app" & slash & "Contents"

0 commit comments

Comments
 (0)