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

Commit 6c9fe59

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop-9.0_05.11.2018
2 parents 31658f2 + e304331 commit 6c9fe59

File tree

205 files changed

+937
-703
lines changed

Some content is hidden

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

205 files changed

+937
-703
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@ See the separate documentation for:
9595
- [C++ coding style](docs/development/C++-style.md) and
9696
[use of C++ language features](docs/development/C++-features.md)
9797

98-
- [LiveCode Builder coding style](docs/guides/LiveCode Builder Style Guide.md)
98+
- [LiveCode Builder coding style](docs/guides/LiveCode%20Builder%20Style%20Guide.md)

‎Installer/package.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -699,22 +699,22 @@ component Runtime.iOS
699699
file ios:iphonesimulator11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
700700
file ios:iphonesimulator11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
701701
file ios:iphonesimulator11.2/fontmap as "fontmap"
702-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-11_4" place
703-
executable ios:iphonesimulator11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
704-
executable ios:iphonesimulator11.4/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
705-
executable ios:iphonesimulator11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
706-
executable ios:iphonesimulator11.4/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
707-
executable ios:iphonesimulator11.4/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
708-
executable ios:iphonesimulator11.4/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
709-
executable ios:iphonesimulator11.4/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
710-
executable ios:iphonesimulator11.4/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
711-
file ios:iphonesimulator11.4/mobile-template.plist as "Settings.plist"
712-
file ios:iphonesimulator11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
713-
file ios:iphonesimulator11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
714-
file ios:iphonesimulator11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
715-
file ios:iphonesimulator11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
716-
file ios:iphonesimulator11.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
717-
file ios:iphonesimulator11.4/fontmap as "fontmap"
702+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-12_0" place
703+
executable ios:iphonesimulator12.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
704+
executable ios:iphonesimulator12.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
705+
executable ios:iphonesimulator12.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
706+
executable ios:iphonesimulator12.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
707+
executable ios:iphonesimulator12.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
708+
executable ios:iphonesimulator12.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
709+
executable ios:iphonesimulator12.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
710+
executable ios:iphonesimulator12.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
711+
file ios:iphonesimulator12.0/mobile-template.plist as "Settings.plist"
712+
file ios:iphonesimulator12.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
713+
file ios:iphonesimulator12.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
714+
file ios:iphonesimulator12.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
715+
file ios:iphonesimulator12.0/mobile-disable-ats-template.plist as "DisableATS.plist"
716+
file ios:iphonesimulator12.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
717+
file ios:iphonesimulator12.0/fontmap as "fontmap"
718718
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
719719
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
720720
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -775,26 +775,26 @@ component Runtime.iOS
775775
file ios:iphoneos11.2/mobile-disable-ats-template.plist as "DisableATS.plist"
776776
file ios:iphoneos11.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
777777
file ios:iphoneos11.2/fontmap as "fontmap"
778-
into "[[ToolsFolder]]/Runtime/iOS/Device-11_4" place
779-
executable ios:iphoneos11.4/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
780-
executable ios:iphoneos11.4/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
781-
executable ios:iphoneos11.4/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
782-
executable ios:iphoneos11.4/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
783-
executable ios:iphoneos11.4/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
784-
executable ios:iphoneos11.4/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
785-
executable ios:iphoneos11.4/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
786-
executable ios:iphoneos11.4/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
787-
file ios:iphoneos11.4/mobile-device-template.plist as "Settings.plist"
788-
file ios:iphoneos11.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
789-
file ios:iphoneos11.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
790-
file ios:iphoneos11.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
791-
file ios:iphoneos11.4/template-entitlements.xcent as "Entitlements.xcent"
792-
file ios:iphoneos11.4/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
793-
file ios:iphoneos11.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
794-
file ios:iphoneos11.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
795-
file ios:iphoneos11.4/mobile-disable-ats-template.plist as "DisableATS.plist"
796-
file ios:iphoneos11.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
797-
file ios:iphoneos11.4/fontmap as "fontmap"
778+
into "[[ToolsFolder]]/Runtime/iOS/Device-12_0" place
779+
executable ios:iphoneos12.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
780+
executable ios:iphoneos12.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
781+
executable ios:iphoneos12.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
782+
executable ios:iphoneos12.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
783+
executable ios:iphoneos12.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
784+
executable ios:iphoneos12.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
785+
executable ios:iphoneos12.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
786+
executable ios:iphoneos12.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
787+
file ios:iphoneos12.0/mobile-device-template.plist as "Settings.plist"
788+
file ios:iphoneos12.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
789+
file ios:iphoneos12.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
790+
file ios:iphoneos12.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
791+
file ios:iphoneos12.0/template-entitlements.xcent as "Entitlements.xcent"
792+
file ios:iphoneos12.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
793+
file ios:iphoneos12.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
794+
file ios:iphoneos12.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
795+
file ios:iphoneos12.0/mobile-disable-ats-template.plist as "DisableATS.plist"
796+
file ios:iphoneos12.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
797+
file ios:iphoneos12.0/fontmap as "fontmap"
798798

799799
////////////////////////////////////////////////////////////////////////////////
800800

‎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 ?= 9.2 10.2 11.2 11.4
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 11.4
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 12.0
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 12.0
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
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 = "2018-6-22"
4-
constant kTSNetVersion = "1.3.7"
3+
constant kMergExtVersion = "2018-10-11"
4+
constant kTSNetVersion = "1.3.8"
55

66
local sEngineDir
77
local sWorkDir

‎config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
'x86-android-sdk26_ndk16r15',
3333
'x86_64-android-sdk26_ndk16r15',
3434
'universal-mac-macosx10.9', # Minimum deployment target
35-
'universal-ios-iphoneos11.4',
35+
'universal-ios-iphoneos12.0',
3636
'universal-ios-iphoneos11.2',
3737
'universal-ios-iphoneos10.2',
3838
'universal-ios-iphoneos9.2',
39-
'universal-ios-iphonesimulator11.4',
39+
'universal-ios-iphonesimulator12.0',
4040
'universal-ios-iphonesimulator11.2',
4141
'universal-ios-iphonesimulator10.2',
4242
'universal-ios-iphonesimulator9.2',

‎docs/contributing_to_docs.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ currently explained? Please consider submitting your proposed changes
1111
directly to the LiveCode repo on GitHub.
1212

1313
Please consult the [documentation style guide](development/docs_style_guide.md)
14-
and the [documentation format specification](guides/LiveCode Documentation Format Reference.md)
14+
and the [documentation format specification](guides/LiveCode%20Documentation%20Format%20Reference.md)
1515
for information on the standards and structure we aim to maintain in our
1616
documentation.
1717

@@ -29,7 +29,7 @@ documentation of all LiveCode syntax. The most basic form of
2929
incompleteness is a completely missing dictionary entry. If you intend
3030
to write a missing dictionary entry, please bear these documentation
3131
objectives in mind and consult the
32-
[documentation format specification](guides/LiveCode Documentation Format Reference.md),
32+
[documentation format specification](guides/LiveCode%20Documentation%20Format%20Reference.md).
3333

3434
The dictionary ought to contain *all* the relevant information about a
3535
particular piece of LiveCode syntax. Every syntax variant should be
@@ -50,7 +50,7 @@ prior to major developments in both our software and the hardware it
5050
runs on.
5151

5252
Secondly, dictionary Syntax elements must be correct. The
53-
[documentation format specification](guides/LiveCode Documentation Format Reference.md)
53+
[documentation format specification](guides/LiveCode%20Documentation%20Format%20Reference.md)
5454
contains a description of the Syntax element.
5555

5656
Thirdly, the dictionary files must be formatted correctly. This means
@@ -155,19 +155,19 @@ website, without having to download any software or use the command line.
155155

156156
### Making your dictionary change
157157

158-
**Navigate to the file you want to modify in the [dictionary folder of the develop-8.2 branch](https://github.com/livecode/livecode/blob/develop-8.2/docs/dictionary).**
158+
**Navigate to the file you want to modify in the [dictionary folder of the develop-9.0 branch](https://github.com/livecode/livecode/blob/develop-9.0/docs/dictionary).**
159159

160160
For example, the accept command is at:
161-
https://github.com/livecode/livecode/blob/develop-8.2/docs/dictionary/command/accept.lcdoc
161+
https://github.com/livecode/livecode/blob/develop-9.0/docs/dictionary/command/accept.lcdoc
162162

163163
Either go directly to the community docs branch URL
164-
(https://github.com/livecode/livecode/tree/develop-8.2) or if you are
165-
on the main LiveCode repository page, select 'develop-8.2' from the
164+
(https://github.com/livecode/livecode/tree/develop-9.0) or if you are
165+
on the main LiveCode repository page, select 'develop-9.0' from the
166166
branch dropdown menu:
167167

168168
![](images/branch-dropdown.png)
169169

170-
You should see that the develop-8.2 branch is selected both in the
170+
You should see that the develop-9.0 branch is selected both in the
171171
label of the dropdown and the url of your browser.
172172

173173
![](images/develop-branch.png)
@@ -240,7 +240,7 @@ and description
240240

241241
>*Note:* Please ensure the pull request has the correct base branch and
242242
comparison branch. The base fork should be `livecode/livecode`, with
243-
base branch `develop-8.2`, and the head fork should be
243+
base branch `develop-9.0`, and the head fork should be
244244
`<your user name>/livecode` with compare branch something like `patch-1`
245245
(unless you have renamed it).
246246

@@ -408,7 +408,7 @@ Click commit to <branch>
408408

409409
Then click "Submit pull request"
410410

411-
Make sure the target branch is livecode/develop-8.2
411+
Make sure the target branch is livecode/develop-9.0
412412

413413
Check the pull request has appeared in
414414
https://github.com/livecode/livecode/pulls
@@ -437,13 +437,13 @@ make sure your name and email address are set up
437437

438438
`git config --global user.email "<your email address>"`
439439

440-
checkout the `develop-8.2` branch
440+
checkout the `develop-9.0` branch
441441

442-
`git checkout develop-8.2`
442+
`git checkout develop-9.0`
443443

444444
ensure it is up to date
445445

446-
`git pull upstream develop-8.2`
446+
`git pull upstream develop-9.0`
447447

448448
create a new branch for your docs changes, for example
449449

@@ -481,7 +481,7 @@ Navigate to your fork on the Git website, `https://github.com/<your user name>/l
481481
You should see a link to the recently pushed branch, and an invitation to submit a pull request.
482482
Click this.
483483

484-
Ensure the base fork is livecode/livecode, and the base is develop-8.2.
484+
Ensure the base fork is livecode/livecode, and the base is develop-9.0.
485485

486486
Click create pull request.
487487

‎docs/development/build-win.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ You will need to install [git for Windows](https://git-scm.com/download/win) in
1616

1717
You need a set of Visual Studio build tools and SDKS. You can use either:
1818

19-
- [Microsoft Visual Studio 2015 Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools),
19+
- [Microsoft Visual Studio 2015 Build Tools](https://www.microsoft.com/en-us/download/details.aspx?id=48159),
2020
which contains _only_ the compilers and libraries, without any user
2121
interface; select everything in the installer
2222

2323

2424
- An appropriate edition of the
25-
[Microsoft Visual Studio 2015](https://visualstudio.com/downloads/) IDE
25+
[Microsoft Visual Studio 2015](https://visualstudio.microsoft.com/vs/older-downloads/) IDE
2626

2727
In addition, you should install
2828
[Microsoft Speech SDK 5.1](https://www.microsoft.com/en-gb/download/details.aspx?id=10121)

‎docs/dictionary/command/copy.lcdoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ the <clipboard> (including text styles).
6969
> crosses <line> boundaries, the <copy> <command> copies the entire
7070
> <line> or <line|lines> containing the <chunk>.
7171

72+
>*Note:* Copy operations that result in an object being placed on the
73+
> clipboard are not supported on mobile devices.
74+
7275
References: select (command), doMenu (command), undo (command),
7376
cut (command), paste (command), clone (command), group (command),
7477
place (command), clipboard (function), copyResource (function),

‎docs/dictionary/command/decrypt-using-rsa.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ use the form:
5555
> private_key.pem and the public key in public_key.pem.
5656

5757
For more information on these utilities see
58-
http://www.openssl.org/docs/apps/rsa.html and
59-
http://www.openssl.org/docs/apps/genrsa.html.
58+
https://www.openssl.org/docs/manmaster/man1/rsa.html and
59+
https://www.openssl.org/docs/manmaster/man1/genrsa.html.
6060

6161
References: decrypt (command), encrypt (command),
6262
encrypt using rsa (command)

‎docs/dictionary/command/encrypt-using-rsa.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ Will generate a key pair of size 512-bits, placing the private key in
5353
private_key.pem and the public key in public_key.pem.
5454

5555
For more information on these utilities see
56-
http://www.openssl.org/docs/apps/rsa.html and
57-
http://www.openssl.org/docs/apps/genrsa.html.
56+
https://www.openssl.org/docs/manmaster/man1/rsa.html and
57+
https://www.openssl.org/docs/manmaster/man1/genrsa.html.
5858

5959
>*Note:* The maximum length of a message that can be encrypted using
6060
> RSA is the size of the key in bytes -11. So, for a 512-bit key pair,

0 commit comments

Comments
 (0)