Skip to content

Commit d6880c5

Browse files
livecodefraserlivecodefraser
committed
Merge branch 'develop' of https://github.com/runrev/livecode into HEAD
2 parents 638514e + 6590eac commit d6880c5

133 files changed

Lines changed: 2910 additions & 666 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.

‎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/description.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ LiveCode lets you create apps from one code base that run on every major device
22

33
In a recent survey, our customers told us that LiveCode enabled them to get their projects done in less than half the time, compared to the best alternative.
44

5-
You can achieve your project goals in a fraction of the time with our compile-free workflow. Make iterative, agile changes changes in real time. Plus, use LiveCode to write code that makes sense. LiveCode's natural programming language is far easier to learn and use than Java, Objective-C, and other traditional languages.
5+
You can achieve your project goals in a fraction of the time with our compile-free workflow. Make iterative, agile changes in real time. Plus, use LiveCode to write code that makes sense. LiveCode's natural programming language is far easier to learn and use than Java, Objective-C, and other traditional languages.
66

77
LiveCode allows you to write once and deploy everywhere: iOS, Android, Windows, Mac, Linux, Web and Server.

‎Installer/package.txt‎

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -628,22 +631,22 @@ component Runtime.iOS
628631
file ios:iphonesimulator8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
629632
file ios:iphonesimulator8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
630633
file ios:iphonesimulator8.4/fontmap as "fontmap"
631-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_1" place
632-
executable ios:iphonesimulator9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
633-
executable ios:iphonesimulator9.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
634-
executable ios:iphonesimulator9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
635-
executable ios:iphonesimulator9.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
636-
executable ios:iphonesimulator9.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
637-
executable ios:iphonesimulator9.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
638-
executable ios:iphonesimulator9.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
639-
executable ios:iphonesimulator9.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
640-
file ios:iphonesimulator9.1/mobile-template.plist as "Settings.plist"
641-
file ios:iphonesimulator9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
642-
file ios:iphonesimulator9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
643-
file ios:iphonesimulator9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
644-
file ios:iphonesimulator9.1/mobile-disable-ats-template.plist as "DisableATS.plist"
645-
file ios:iphonesimulator9.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
646-
file ios:iphonesimulator9.1/fontmap as "fontmap"
634+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_2" place
635+
executable ios:iphonesimulator9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
636+
executable ios:iphonesimulator9.2/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
637+
executable ios:iphonesimulator9.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
638+
executable ios:iphonesimulator9.2/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
639+
executable ios:iphonesimulator9.2/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
640+
executable ios:iphonesimulator9.2/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
641+
executable ios:iphonesimulator9.2/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
642+
executable ios:iphonesimulator9.2/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
643+
file ios:iphonesimulator9.2/mobile-template.plist as "Settings.plist"
644+
file ios:iphonesimulator9.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
645+
file ios:iphonesimulator9.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
646+
file ios:iphonesimulator9.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
647+
file ios:iphonesimulator9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
648+
file ios:iphonesimulator9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
649+
file ios:iphonesimulator9.2/fontmap as "fontmap"
647650
into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
648651
executable ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
649652
executable ios:iphoneos8.2/revsecurity.ios-extension as RevSecurity
@@ -686,27 +689,27 @@ component Runtime.iOS
686689
file ios:iphoneos8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
687690
file ios:iphoneos8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
688691
file ios:iphoneos8.4/fontmap as "fontmap"
689-
into "[[ToolsFolder]]/Runtime/iOS/Device-9_1" place
690-
executable ios:iphoneos9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
691-
executable ios:iphoneos9.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
692-
executable ios:iphoneos9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
693-
executable ios:iphoneos9.1/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
694-
executable ios:iphoneos9.1/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
695-
executable ios:iphoneos9.1/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
696-
executable ios:iphoneos9.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
697-
executable ios:iphoneos9.1/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
698-
file ios:iphoneos9.1/mobile-device-template.plist as "Settings.plist"
699-
file ios:iphoneos9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
700-
file ios:iphoneos9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
701-
file ios:iphoneos9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
702-
file ios:iphoneos9.1/template-entitlements.xcent as "Entitlements.xcent"
703-
file ios:iphoneos9.1/template-store-entitlements.xcent as "StoreEntitlements.xcent"
704-
file ios:iphoneos9.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
705-
file ios:iphoneos9.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
706-
file ios:iphoneos9.1/template-ResourceRules.plist as "ResourceRules.plist"
707-
file ios:iphoneos9.1/mobile-disable-ats-template.plist as "DisableATS.plist"
708-
file ios:iphoneos9.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
709-
file ios:iphoneos9.1/fontmap as "fontmap"
692+
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
693+
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
694+
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
695+
executable ios:iphoneos9.2/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
696+
executable ios:iphoneos9.2/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
697+
executable ios:iphoneos9.2/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
698+
executable ios:iphoneos9.2/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
699+
executable ios:iphoneos9.2/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
700+
executable ios:iphoneos9.2/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
701+
file ios:iphoneos9.2/mobile-device-template.plist as "Settings.plist"
702+
file ios:iphoneos9.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
703+
file ios:iphoneos9.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
704+
file ios:iphoneos9.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
705+
file ios:iphoneos9.2/template-entitlements.xcent as "Entitlements.xcent"
706+
file ios:iphoneos9.2/template-store-entitlements.xcent as "StoreEntitlements.xcent"
707+
file ios:iphoneos9.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
708+
file ios:iphoneos9.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
709+
file ios:iphoneos9.2/template-ResourceRules.plist as "ResourceRules.plist"
710+
file ios:iphoneos9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
711+
file ios:iphoneos9.2/[email protected] as "Default4InchSplash.png" base ios:[email protected]
712+
file ios:iphoneos9.2/fontmap as "fontmap"
710713

711714
////////////////////////////////////////////////////////////////////////////////
712715

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 8.2 8.4 9.1
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.1
28+
IPHONEOS_VERSIONS ?= 8.2 8.4 9.2
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4 9.2
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ LiveCode uses the [gyp (Generate Your Projects)](https://chromium.googlesource.c
6464

6565
### Quick start
6666

67+
**Note**: You can only compile LiveCode from a clone of the
68+
[LiveCode git repository](https://github.com/livecode/livecode) on
69+
GitHub. See also the GitHub documentation on
70+
[cloning a repository](https://help.github.com/articles/cloning-a-repository/).
71+
6772
On Linux or Mac, you can quickly build LiveCode by installing basic development tools, and then running `make all`.
6873

6974
### Detailed instructions

‎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.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ if test "${OS}" = "android" ; then
324324
ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
325325
ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
326326
ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as}
327-
ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as -fuse-ld=bfd}
327+
ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as}
328328
ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
329329
ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
330330
ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}

‎config/android-settings.gypi‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'-fno-exceptions',
1818
'-fno-rtti',
1919
],
20-
20+
2121
'target_conditions':
2222
[
2323
[
@@ -44,6 +44,26 @@
4444
],
4545
},
4646
],
47+
[
48+
'supports_lto != 0',
49+
{
50+
'ldflags':
51+
[
52+
'-fuse-ld=gold',
53+
],
54+
55+
'arflags':
56+
[
57+
'--plugin', '<!(echo $(dirname <(ar))/../lib/LLVMgold.so)',
58+
],
59+
},
60+
{
61+
'ldflags':
62+
[
63+
'-fuse-ld=bfd',
64+
],
65+
},
66+
],
4767
],
4868

4969
'configurations':
@@ -69,6 +89,28 @@
6989
'-O3',
7090
'-g3',
7191
],
92+
93+
'conditions':
94+
[
95+
[
96+
'supports_lto != 0',
97+
{
98+
'cflags':
99+
[
100+
'-flto',
101+
'-ffunction-sections',
102+
],
103+
104+
'ldflags':
105+
[
106+
'-Wl,--icf=all',
107+
'>@(_cflags)',
108+
'>@(_cflags_cc)',
109+
110+
],
111+
},
112+
],
113+
],
72114

73115
'defines':
74116
[

‎config/android.gypi‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
'objcopy': '<!(echo ${OBJCOPY:-objcopy})',
2828
'objdump': '<!(echo ${OBJDUMP:-objdump})',
2929
'strip': '<!(echo ${STRIP:-strip})',
30+
'ar': '<!(echo ${AR:-ar})',
3031
},
3132

3233
'target_defaults':
@@ -40,6 +41,8 @@
4041
'exe_suffix': '',
4142
'debug_info_suffix': '.dbg',
4243

44+
'supports_lto': '<!(if ${CC} -flto -fuse-ld=gold -c -o /dev/null /dev/null 2>/dev/null >/dev/null; then echo 1; else echo 0; fi)',
45+
4346
'silence_warnings': 0,
4447
},
4548

‎config/linux-settings.gypi‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
'debug_info_suffix': '.dbg',
1010

1111
'c++_std': '<!(echo ${CXX_STD:-c++03})',
12+
13+
'supports_lto': "<!(echo 'main(){}' | if ${CC:-cc} -flto -fuse-ld=gold -Wl,--sort-section=none -o /dev/null -x c++ - 2>/dev/null >/dev/null; then echo 1; else echo 0; fi)",
1214
},
1315

1416
'defines':
@@ -24,6 +26,20 @@
2426
'../thirdparty/libcairo/src', # Required by the GDK headers
2527
'../thirdparty/libfreetype/include', # Required by the Pango headers
2628
],
29+
30+
'conditions':
31+
[
32+
[
33+
# For consistency, we should use the same linker in both Debug and Release builds
34+
'supports_lto != 0',
35+
{
36+
'ldflags':
37+
[
38+
'-fuse-ld=gold',
39+
],
40+
},
41+
],
42+
],
2743

2844
# Static libraries that are to be included into dynamic libraries
2945
# need to be compiled with the correct compilation flags
@@ -131,6 +147,28 @@
131147
'-O3',
132148
'-g3',
133149
],
150+
151+
'conditions':
152+
[
153+
[
154+
'supports_lto != 0',
155+
{
156+
'cflags':
157+
[
158+
'-flto',
159+
'-ffunction-sections',
160+
],
161+
162+
'ldflags':
163+
[
164+
'-flto',
165+
'-Wl,--icf=all',
166+
'>@(_cflags)',
167+
'>@(_cflags_cc)',
168+
],
169+
},
170+
],
171+
],
134172

135173
'defines':
136174
[

0 commit comments

Comments
 (0)