Skip to content

Commit f5203c5

Browse files
livecodefraserlivecodefraser
committed
Merge branch 'develop' of https://github.com/runrev/livecode into vm-refactor
Conflicts: libscript/src/script-instance.cpp
2 parents 92a8539 + e5c2649 commit f5203c5

145 files changed

Lines changed: 2622 additions & 956 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.

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -608,22 +608,22 @@ component Runtime.iOS
608608
file ios:iphonesimulator9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
609609
file ios:iphonesimulator9.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
610610
file ios:iphonesimulator9.2/fontmap as "fontmap"
611-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_3" place
612-
executable ios:iphonesimulator9.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
613-
executable ios:iphonesimulator9.3/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
614-
executable ios:iphonesimulator9.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
615-
executable ios:iphonesimulator9.3/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
616-
executable ios:iphonesimulator9.3/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
617-
executable ios:iphonesimulator9.3/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
618-
executable ios:iphonesimulator9.3/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
619-
executable ios:iphonesimulator9.3/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
620-
file ios:iphonesimulator9.3/mobile-template.plist as "Settings.plist"
621-
file ios:iphonesimulator9.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
622-
file ios:iphonesimulator9.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
623-
file ios:iphonesimulator9.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
624-
file ios:iphonesimulator9.3/mobile-disable-ats-template.plist as "DisableATS.plist"
625-
file ios:iphonesimulator9.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
626-
file ios:iphonesimulator9.3/fontmap as "fontmap"
611+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-10_0" place
612+
executable ios:iphonesimulator10.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
613+
executable ios:iphonesimulator10.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
614+
executable ios:iphonesimulator10.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
615+
executable ios:iphonesimulator10.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
616+
executable ios:iphonesimulator10.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
617+
executable ios:iphonesimulator10.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
618+
executable ios:iphonesimulator10.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
619+
executable ios:iphonesimulator10.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
620+
file ios:iphonesimulator10.0/mobile-template.plist as "Settings.plist"
621+
file ios:iphonesimulator10.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
622+
file ios:iphonesimulator10.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
623+
file ios:iphonesimulator10.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
624+
file ios:iphonesimulator10.0/mobile-disable-ats-template.plist as "DisableATS.plist"
625+
file ios:iphonesimulator10.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
626+
file ios:iphonesimulator10.0/fontmap as "fontmap"
627627
into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
628628
executable ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
629629
executable ios:iphoneos8.2/revsecurity.ios-extension as RevSecurity
@@ -664,26 +664,26 @@ component Runtime.iOS
664664
file ios:iphoneos9.2/mobile-disable-ats-template.plist as "DisableATS.plist"
665665
file ios:iphoneos9.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
666666
file ios:iphoneos9.2/fontmap as "fontmap"
667-
into "[[ToolsFolder]]/Runtime/iOS/Device-9_3" place
668-
executable ios:iphoneos9.3/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
669-
executable ios:iphoneos9.3/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
670-
executable ios:iphoneos9.3/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
671-
executable ios:iphoneos9.3/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
672-
executable ios:iphoneos9.3/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
673-
executable ios:iphoneos9.3/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
674-
executable ios:iphoneos9.3/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
675-
executable ios:iphoneos9.3/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
676-
file ios:iphoneos9.3/mobile-device-template.plist as "Settings.plist"
677-
file ios:iphoneos9.3/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
678-
file ios:iphoneos9.3/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
679-
file ios:iphoneos9.3/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
680-
file ios:iphoneos9.3/template-entitlements.xcent as "Entitlements.xcent"
681-
file ios:iphoneos9.3/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
682-
file ios:iphoneos9.3/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
683-
file ios:iphoneos9.3/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
684-
file ios:iphoneos9.3/mobile-disable-ats-template.plist as "DisableATS.plist"
685-
file ios:iphoneos9.3/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
686-
file ios:iphoneos9.3/fontmap as "fontmap"
667+
into "[[ToolsFolder]]/Runtime/iOS/Device-10_0" place
668+
executable ios:iphoneos10.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
669+
executable ios:iphoneos10.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
670+
executable ios:iphoneos10.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
671+
executable ios:iphoneos10.0/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
672+
executable ios:iphoneos10.0/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
673+
executable ios:iphoneos10.0/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
674+
executable ios:iphoneos10.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
675+
executable ios:iphoneos10.0/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
676+
file ios:iphoneos10.0/mobile-device-template.plist as "Settings.plist"
677+
file ios:iphoneos10.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
678+
file ios:iphoneos10.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
679+
file ios:iphoneos10.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
680+
file ios:iphoneos10.0/template-entitlements.xcent as "Entitlements.xcent"
681+
file ios:iphoneos10.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
682+
file ios:iphoneos10.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
683+
file ios:iphoneos10.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
684+
file ios:iphoneos10.0/mobile-disable-ats-template.plist as "DisableATS.plist"
685+
file ios:iphoneos10.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
686+
file ios:iphoneos10.0/fontmap as "fontmap"
687687

688688
////////////////////////////////////////////////////////////////////////////////
689689

‎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 9.2 9.3
29-
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 9.3
28+
IPHONEOS_VERSIONS ?= 8.2 9.2 10.0
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.0
3030

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

‎builder/builder_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2016-8-17"
3+
constant kMergExtVersion = "2016-9-13"
44
constant kTSNetVersion = "1.2.2"
55

66
local sEngineDir

‎config/android-settings.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'-Wall',
3434
'-Wextra',
3535
'-Wno-unused-parameter', # Just contributes build noise
36+
'-Werror=conversion-null',
3637
],
3738

3839
'cflags_c':

‎config/emscripten-settings.gypi‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
'-fno-exceptions',
4343
'-fno-rtti',
4444
'-std=<(c++_std)',
45-
46-
'-Werror=mismatched-tags',
47-
'-Werror=overloaded-virtual',
4845
],
4946

5047
'target_conditions':
@@ -58,6 +55,18 @@
5855
'-Wextra',
5956
'-Wno-unused-parameter',
6057
'-Wno-ignored-attributes',
58+
59+
'-Werror=conversion-null',
60+
'-Werror=logical-not-parentheses',
61+
'-Werror=return-type',
62+
'-Werror=tautological-compare',
63+
'-Werror=uninitialized',
64+
],
65+
'cflags_cc':
66+
[
67+
'-Werror=mismatched-tags',
68+
'-Werror=overloaded-virtual',
69+
'-Werror=delete-non-virtual-dtor',
6170
],
6271
},
6372
{

‎config/ios.gypi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
'SHARED_PRECOMPS_DIR': '$(OBJROOT)/Precompiled/$(CURRENT_ARCH)',
2929
'GCC_VERSION': '',
3030
'ALWAYS_SEARCH_USER_PATHS': 'NO',
31-
'IPHONEOS_DEPLOYMENT_TARGET[arch=armv7]': '5.1.1',
32-
'IPHONEOS_DEPLOYMENT_TARGET[arch=i386]': '5.1.1',
31+
'IPHONEOS_DEPLOYMENT_TARGET[arch=armv7]': '6.0.0',
32+
'IPHONEOS_DEPLOYMENT_TARGET[arch=i386]': '6.0.0',
3333
'IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]': '7.0.0',
3434
'IPHONEOS_DEPLOYMENT_TARGET[arch=x86_64]': '7.0.0',
3535
'ENABLE_BITCODE': 'No',
@@ -43,6 +43,7 @@
4343
'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x',
4444

4545
'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
46+
'DEVELOPMENT_TEAM': 'SA2BUJR53Y',
4647
},
4748

4849
'target_defaults':
@@ -197,6 +198,7 @@
197198
'-Werror=return-type',
198199
'-Werror=tautological-compare',
199200
'-Werror=logical-not-parentheses',
201+
'-Werror=conversion-null',
200202
],
201203
},
202204
},

‎config/linux-settings.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
'-Werror=return-type',
7272
'-Werror=uninitialized',
7373
'-Wno-error=maybe-uninitialized',
74+
'-Werror=conversion-null',
7475
],
7576

7677
'cflags_cc':

‎config/mac.gypi‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,13 @@
127127
'-Werror=return-type',
128128
'-Werror=tautological-compare',
129129
'-Werror=logical-not-parentheses',
130+
'-Werror=conversion-null',
131+
'-Werror=missing-declarations',
132+
'-Werror=mismatched-new-delete',
133+
'-Werror=constant-logical-operand',
134+
'-Werror=unknown-pragmas',
135+
'-Werror=missing-field-initializers',
136+
'-Werror=objc-literal-compare',
130137
],
131138
},
132139
},
@@ -136,7 +143,7 @@
136143
'GCC_INHIBIT_ALL_WARNINGS': 'YES',
137144
'WARNING_CFLAGS':
138145
[
139-
'-Wno-return-type',
146+
'-w',
140147
],
141148
},
142149
},

‎docs/dictionary/command/filter.lcdoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Type: command
55
Syntax: filter [{lines | items | keys | elements} of] <filterSource> {with | without | [not] matching} [{wildcard pattern | regex pattern}] <filterPattern> [into <targetContainer>]
66

77
Summary:
8-
Filters each line or item in a source container or expression, removing
9-
the lines, items, keys or elements that do or don't match a pattern.
8+
Filters each line, item, key or element in a source container or
9+
expression, removing the lines, items, keys or elements that do or don't
10+
match a pattern.
1011

1112
Introduced: 1.0
1213

@@ -28,8 +29,7 @@ filter items of "apple,banana,cherry" with regex pattern "b.*"
2829
Example:
2930
local tSource, tBackscriptObjects
3031
put the backscripts into tSource
31-
filter lines \
32-
of tSource without regex pattern "^stack.*" into tBackscriptObjects
32+
filter lines of tSource without regex pattern "^stack.*" into tBackscriptObjects
3333
-- tBackscriptObjects contains a list of non-stack backscripts
3434

3535
Example:
@@ -42,7 +42,7 @@ Example:
4242
local tArray
4343
put true into tArray["foo"]
4444
put false into tArray["bar"]
45-
filter tArray with "f*"
45+
filter keys of tArray with "f*"
4646
put the keys of tArray is "foo"
4747

4848
Example:

‎docs/dictionary/object/videoClip.lcdoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ bit builds of LiveCode.
6464
References: object type (glossary), templateVideoClip (keyword),
6565
stack (object), videoClipPlayer (property)
6666

67+
Tags: multimedia

0 commit comments

Comments
 (0)