Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 59d5bee

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop' of https://github.com/livecode/livecode into bugfix-16694
2 parents 3480e1c + c90daff commit 59d5bee

File tree

84 files changed

+2083
-659
lines changed

Some content is hidden

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

84 files changed

+2083
-659
lines changed

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
![LiveCode Community Logo](http://livecode.com/wp-content/uploads/2015/02/livecode-logo.png)
44

5-
Copyright © 2003-2015 LiveCode Ltd., Edinburgh, UK
5+
Copyright © 2003-2016 LiveCode Ltd., Edinburgh, UK
6+
7+
See also the [documentation contributions guide](docs/contributing_to_docs.md).
68

79
## Contributors' forums
810

‎Installer/application.desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Encoding=UTF-8
44
Type=Application
55
Name=[[ProductTitle]]
66
Comment=IDE for creating and editing LiveCode applications.
7-
Icon=runrev-[[ProductTag]]
7+
Icon=runrev-[[ProductTag]]-[[TargetArchitecture]]
88
Exec="[[TargetFolder]]/[[ProductName]].[[TargetArchitecture]]" %U
99
Categories=Development;IDE;
1010
StartupWMClass=[[ProductTag]]

‎Installer/package.txt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ installer LiveCode
7777
include Mobile.Linux
7878
include Runtime.Android
7979
include Runtime.Emscripten
80-
desktop application "repo:Installer/application.desktop" as "runrev-[[ProductTag]]"
80+
desktop application "repo:Installer/application.desktop" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
8181
if TargetEdition is Community then
82-
desktop icon "repo:Installer/application.png" as "runrev-[[ProductTag]]"
82+
desktop icon "repo:Installer/application.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
8383
if TargetEdition is Indy then
84-
desktop icon "private:engine/rsrc/Indy/android-notify-icon.png" as "runrev-[[ProductTag]]"
84+
desktop icon "private:engine/rsrc/Indy/android-notify-icon.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
8585
if TargetEdition is Business then
86-
desktop icon "private:engine/rsrc/Business/android-notify-icon.png" as "runrev-[[ProductTag]]"
86+
desktop icon "private:engine/rsrc/Business/android-notify-icon.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
8787
include Uninstaller
8888
if BaseEdition is Commercial then
8989
additional manifest "../Installer/commercial-package.txt"
@@ -386,7 +386,10 @@ component Documentation
386386
into [[ToolsFolder]]/Documentation place
387387
rfolder "ide:Documentation/guides"
388388
rfolder "repo:docs/guides"
389-
389+
390+
into [[ToolsFolder]]/Documentation/guides place
391+
file "repo:LiveCodeNotes-[[EscapedVersionTag]].md" as "Release Notes.md"
392+
390393
component Extensions
391394
into [[ToolsFolder]]/Extensions place
392395
rfolder macosx:packaged_extensions/com.livecode.widget.browser

‎builder/release_notes_builder.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ private command PreviousCreate
993993
next repeat
994994

995995
else
996-
put OutputGetNotesUrl(tVersion) into tUrl
996+
put OutputGetNotesUrl("pdf", tVersion) into tUrl
997997
MarkdownAppend "notes", merge("* [LiveCode [[tVersion]] Release Notes]([[tUrl]])")
998998
end if
999999

‎config/mac.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
'ARCHS': 'i386',
189189
'GCC_OPTIMIZATION_LEVEL': '3',
190190
'GCC_ENABLE_FIX_AND_CONTINUE': 'NO',
191-
'LLVM_LTO': 'YES',
191+
#'LLVM_LTO': 'YES',
192192
'DEAD_CODE_STRIPPING': 'YES',
193193
'GCC_UNROLL_LOOPS': 'YES',
194194
},

0 commit comments

Comments
 (0)