From a5e000ab05e1ba2df5644f672033c7cddce42a45 Mon Sep 17 00:00:00 2001 From: Monte Goulding Date: Fri, 3 Aug 2018 15:59:03 +1000 Subject: [PATCH 01/56] [[ Cleanup ]] Remove unused variable --- libgraphics/src/drawing.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libgraphics/src/drawing.cpp b/libgraphics/src/drawing.cpp index 02ef49acf4d..58043503c76 100644 --- a/libgraphics/src/drawing.cpp +++ b/libgraphics/src/drawing.cpp @@ -1724,13 +1724,13 @@ void MCGDrawingContext::ExecutePath(VisitorT& p_visitor) case kMCGDrawingPathOpcodeSmoothCubicTo: { - MCGPoint t_a, t_b, t_point; - if (!Point(t_b) || + MCGPoint t_a, t_point; + if (!Point(t_a) || !Point(t_point)) { break; } - p_visitor.PathSmoothCubicTo(t_b, + p_visitor.PathSmoothCubicTo(t_a, t_point); } break; From a3068a88449f31165faf29c78e5b9f9a27e0b2b2 Mon Sep 17 00:00:00 2001 From: Monte Goulding Date: Fri, 3 Aug 2018 20:45:03 +1000 Subject: [PATCH 02/56] [[ Xcode Config ]] Use legacy build system This patch copies into the Xcode projects a plist which makes Xcode use its legacy build system as the projects generated by our gyp version are not compatible with the new build system. --- config.py | 20 ++++++++++++++++++++ config/WorkspaceSettings.xcsettings | 8 ++++++++ 2 files changed, 28 insertions(+) create mode 100644 config/WorkspaceSettings.xcsettings diff --git a/config.py b/config.py index 2bf61724e90..127656f8bf1 100755 --- a/config.py +++ b/config.py @@ -20,6 +20,7 @@ import re import os import subprocess +import shutil # The set of platforms for which this branch supports automated builds BUILDBOT_PLATFORM_TRIPLES = ( @@ -789,6 +790,7 @@ def configure_mac(opts): validate_target_arch(opts) validate_xcode_sdks(opts) validate_java_tools(opts) + copy_workspace_settings(opts) args = core_gyp_args(opts) + ['-Dtarget_sdk=' + opts['XCODE_TARGET_SDK'], '-Dhost_sdk=' + opts['XCODE_HOST_SDK'], @@ -815,5 +817,23 @@ def configure(args): } configure_procs[opts['OS']](opts) +def copy_workspace_settings(opts): + validate_gyp_settings(opts) + if opts['BUILD_EDITION'] == 'commercial': + project = os.path.join(opts['GENERATOR_OUTPUT'], '..', 'livecode-commercial.xcodeproj') + else: + project = os.path.join(opts['GENERATOR_OUTPUT'], 'livecode.xcodeproj') + + xcshareddata = os.path.join(project, 'project.xcworkspace', 'xcshareddata') + + if not os.path.exists(xcshareddata): + os.makedirs(xcshareddata) + + workspacesettingsdest= os.path.join(xcshareddata, 'WorkspaceSettings.xcsettings') + workspacesettingssource = os.path.join('config', 'WorkspaceSettings.xcsettings') + + if not os.path.exists(workspacesettingsdest): + shutil.copyfile(workspacesettingssource, workspacesettingsdest) + if __name__ == '__main__': configure(sys.argv[1:]) diff --git a/config/WorkspaceSettings.xcsettings b/config/WorkspaceSettings.xcsettings new file mode 100644 index 00000000000..f60c042dcf9 --- /dev/null +++ b/config/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Original + + \ No newline at end of file From c28b826587008fff6b9345e06651715f511a9d36 Mon Sep 17 00:00:00 2001 From: livecodesam Date: Thu, 9 Aug 2018 12:24:10 +0100 Subject: [PATCH 03/56] [bugfix 21458] Added number of elements of array --- docs/dictionary/function/number.lcdoc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/dictionary/function/number.lcdoc b/docs/dictionary/function/number.lcdoc index fb4a79db051..50850fd4101 100644 --- a/docs/dictionary/function/number.lcdoc +++ b/docs/dictionary/function/number.lcdoc @@ -14,6 +14,8 @@ Syntax: the number of [marked] cards [{in | of} ] Syntax: the number of {char[acters] | items | words | lines} {in | of} +Syntax: the number of elements {in|of} + Summary: the number of of a certain kind, or the number of in a . @@ -57,6 +59,9 @@ Any stack reference. textString (string): Any string or expression that evaluates to a string. +array (array): +The name of an array + Returns(integer): The a . @@ -99,7 +104,7 @@ function (control structure), length (function), property (glossary), current card (glossary), return (glossary), group (glossary), nest (glossary), chunk (glossary), read-only (glossary), expression (glossary), non-negative (glossary), object (glossary), -string (keyword), control (keyword), integer (keyword), control (object), +string (keyword), control (keyword), integer (keyword), stack (object), backgroundBehavior (property), layer (property) Tags: text processing From f8a49899666c42c90d34a9116dee5c4398632a94 Mon Sep 17 00:00:00 2001 From: livecodesam Date: Thu, 9 Aug 2018 12:32:55 +0100 Subject: [PATCH 04/56] Create bugfix-21458.md --- docs/notes/bugfix-21458.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/notes/bugfix-21458.md diff --git a/docs/notes/bugfix-21458.md b/docs/notes/bugfix-21458.md new file mode 100644 index 00000000000..67ad9dbb4ce --- /dev/null +++ b/docs/notes/bugfix-21458.md @@ -0,0 +1 @@ +# Added "the number of elements of array" to the syntax in the entry for the number. From c6cd2f02a54b77110a0e8056165bacb2764a8693 Mon Sep 17 00:00:00 2001 From: livecodesam Date: Fri, 10 Aug 2018 13:05:00 +0100 Subject: [PATCH 05/56] Changes from mobileStorePr.. to nameChanged --- .../command/mobileStoreRestorePurchases.lcdoc | 2 +- docs/dictionary/command/modal.lcdoc | 14 +++++++------- docs/dictionary/command/modeless.lcdoc | 4 ++-- docs/dictionary/command/move.lcdoc | 2 +- .../function/mobileStoreProductProperty.lcdoc | 8 ++++---- docs/dictionary/function/mouseCharChunk.lcdoc | 8 ++++---- docs/dictionary/function/mouseChunk.lcdoc | 4 ++-- docs/dictionary/function/mouseText.lcdoc | 10 +++++----- docs/dictionary/keyword/modemcolon.lcdoc | 12 ++++++------ docs/dictionary/message/mouseLeave.lcdoc | 4 ++-- docs/dictionary/message/mouseMove.lcdoc | 8 ++++---- docs/dictionary/message/mouseStillDown.lcdoc | 4 ++-- docs/dictionary/message/mouseUpInBackdrop.lcdoc | 4 ++-- docs/dictionary/message/mouseWithin.lcdoc | 10 +++++----- docs/dictionary/message/nameChanged.lcdoc | 6 +++--- docs/dictionary/property/multipleHilites.lcdoc | 8 ++++---- docs/dictionary/property/name.lcdoc | 11 ++++++----- 17 files changed, 60 insertions(+), 59 deletions(-) diff --git a/docs/dictionary/command/mobileStoreRestorePurchases.lcdoc b/docs/dictionary/command/mobileStoreRestorePurchases.lcdoc index f6ac319cec9..1160ab230e2 100644 --- a/docs/dictionary/command/mobileStoreRestorePurchases.lcdoc +++ b/docs/dictionary/command/mobileStoreRestorePurchases.lcdoc @@ -42,7 +42,7 @@ pState = "restored" > interacting with the Google Play Store in-app purchasing API, where > consumables are treated exactly the same way as non-consumables. ->*Note:* : For iOS, non-renewing subscriptions cannot be restored, due +>*Note:* For iOS, non-renewing subscriptions cannot be restored, due > to technical restrictions imposed by Apple. This means that developers > are responsible for restoring non-renewing subscriptions and making > them available across all devices the users own. diff --git a/docs/dictionary/command/modal.lcdoc b/docs/dictionary/command/modal.lcdoc index 6a9c53fca98..93fee79d596 100644 --- a/docs/dictionary/command/modal.lcdoc +++ b/docs/dictionary/command/modal.lcdoc @@ -24,8 +24,8 @@ stack: Any stack reference. Description: -Use the to display a as a custom . +Use the to display a as a custom +. >*Important:* When a is opened as its is set > to the center of the if the is open and @@ -56,10 +56,10 @@ are sent regardless of the setting of the . If the stack is already displayed as a modal dialog box, the does not close and reopen it. -The pauses the running until the is dismissed (usually by clicking a button in the ). To information to the about which - was clicked, in the +The pauses the running until the + is dismissed (usually by clicking a button in the +). To information to the about +which was clicked, in the