Skip to content

Commit dc59f38

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.6' into iphone_get_device_model
2 parents 674e6b5 + 54745e3 commit dc59f38

File tree

177 files changed

+1426
-557
lines changed

Some content is hidden

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

177 files changed

+1426
-557
lines changed

‎Installer/package.txt‎

Lines changed: 121 additions & 121 deletions
Large diffs are not rendered by default.

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ 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 ?= 10.2 11.2 12.1 13.2 13.5
29-
IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2 13.5
30-
SKIP_IPHONEOS_VERSIONS ?= 9.2
31-
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2
28+
IPHONEOS_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
29+
IPHONESIMULATOR_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
30+
SKIP_IPHONEOS_VERSIONS ?= 9.2 10.2
31+
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
3232

3333

3434
IOS_SDKS ?= \

‎builder/builder_utilities.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2020-6-18"
4-
constant kTSNetVersion = "1.4.2"
3+
constant kMergExtVersion = "2021-2-2"
4+
constant kTSNetVersion = "1.4.4"
55

66
local sEngineDir
77
local sWorkDir

‎config.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
'x86-android-ndk16r15',
3232
'x86_64-android-ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34-
'universal-ios-iphoneos13.5',
34+
'universal-ios-iphoneos14.5',
35+
'universal-ios-iphoneos14.4',
3536
'universal-ios-iphoneos13.2',
3637
'universal-ios-iphoneos12.1',
3738
'universal-ios-iphoneos11.2',
38-
'universal-ios-iphoneos10.2',
39-
'universal-ios-iphonesimulator13.5',
39+
'universal-ios-iphonesimulator14.5',
40+
'universal-ios-iphonesimulator14.4',
4041
'universal-ios-iphonesimulator13.2',
4142
'universal-ios-iphonesimulator12.1',
4243
'universal-ios-iphonesimulator11.2',
43-
'universal-ios-iphonesimulator10.2',
4444
'x86-win32', # TODO[2017-03-23] More specific ABI
4545
'x86_64-win32',
4646
'js-emscripten-sdk1.35',

‎config/ios.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
'WARNING_CFLAGS':
217217
[
218218
'-Wno-return-type',
219+
'-Wno-implicit-function-declaration',
219220
],
220221
},
221222
},

‎config/mac.gypi‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'STRIP_INSTALLED_PRODUCT': 'NO',
3131
'CLANG_LINK_OBJC_RUNTIME': 'NO',
3232
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
33-
'CLANG_CXX_LIBRARY': 'libc++'
33+
'CLANG_CXX_LIBRARY': 'libc++'
3434
},
3535

3636
'target_defaults':
@@ -47,6 +47,7 @@
4747
'debug_info_suffix': '.dSYM',
4848

4949
'silence_warnings': 0,
50+
'travis': '<!(echo ${TRAVIS})',
5051
},
5152

5253
'target_conditions':
@@ -70,6 +71,21 @@
7071
],
7172
},
7273
],
74+
[
75+
'travis == ""',
76+
{
77+
'xcode_settings':
78+
{
79+
'OTHER_LDFLAGS':
80+
[
81+
'-Wl,-platform_version',
82+
'-Wl,macos',
83+
'-Wl,10.9',
84+
'-Wl,10.9',
85+
],
86+
},
87+
},
88+
],
7389
[
7490
# Non-bundle loadable module should have a .dylib suffix
7591
# and be linked as libraries, not bundles

‎docs/dictionary/command/answer-file.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ has no effect on macOS 10.11 (El Capitan) and above, so make sure that any impor
5252

5353
It:
5454
The <answer file> command places the absolute file path(s) of the
55-
selected file(s) as a return delimeted list in the it variable.
55+
selected file(s) as a return delimited list in the it variable.
5656

5757
The result:
5858
If the user cancels the dialog, the it variable is set to
@@ -91,4 +91,3 @@ revMacFromUnixPath (function), file dialog box (glossary), it (keyword),
9191
systemFileSelector (property), dontUseNS (property)
9292

9393
Tags: file system
94-

‎docs/dictionary/command/create-card.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Example:
2222
create card "Main"
2323

2424
Example:
25-
create card (field "ouput")
25+
create card (field "output")
2626

2727
Example:
2828
create card "Main" in stack "Stack"
@@ -59,4 +59,3 @@ command (glossary), card (keyword), templateCard (keyword), it (keyword),
5959
newCard (message), stack (object), ID (property), defaultStack (property)
6060

6161
Tags: objects
62-

‎docs/dictionary/command/decrypt.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ determined by the keyword before it. If you specify key then the key
7171
needs to be the same size (in bits, eight per byte) as the specified
7272
<cipher> key length. The key may optionally be accompanied by the
7373
<IVvalue> used by some ciphers. If you specify password or don't specify
74-
a key mode, then a password, tyically text, will be used. The password
74+
a key mode, then a password, typically text, will be used. The password
7575
may optionally be accompanied by a <saltvalue>. The bits specifies the
7676
key length in bits (for example, 64, 128, 192 or 256) and may be zero or
7777
empty for the default length (that is listed with the cipherNames
@@ -108,4 +108,3 @@ References: encrypt (command), cipherNames (function),
108108
Standalone Application Settings (glossary), command (glossary),
109109
LiveCode custom library (glossary), SSL & Encryption library (library),
110110
sslcertificates (property)
111-

‎docs/dictionary/command/edit.lcdoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ edit the script of player "Show Me"
2525

2626
Parameters:
2727
object:
28-
Any object reference. Usint the optional at syntax will pass the
28+
Any object reference. Using the optional at syntax will pass the
2929
subsequent items to the editScript handler as a second parameter. By
3030
convention the first two parameters should be a line number and a column
3131
character offset from the start of the line.
@@ -45,4 +45,3 @@ References: licensed (function), object (glossary),
4545
development environment (glossary), command (glossary),
4646
script editor (glossary), editScript (message), userLevel (property),
4747
editScripts (property), script (property)
48-

0 commit comments

Comments
 (0)