diff --git a/config.py b/config.py
index 70a191d1c31..62278b0f6d6 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 = (
@@ -788,6 +789,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'],
@@ -814,5 +816,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
diff --git a/docs/dictionary/command/mobileSetKeyboardType.lcdoc b/docs/dictionary/command/mobileSetKeyboardType.lcdoc
index 296d2a8abbc..3773b6b930e 100644
--- a/docs/dictionary/command/mobileSetKeyboardType.lcdoc
+++ b/docs/dictionary/command/mobileSetKeyboardType.lcdoc
@@ -25,13 +25,15 @@ Parameters:
type (enum):
The type of keyboard to use. One of:
-- "default": the alphabetic keyboard
+- "default": the default keyboard
+- "alphabet": the alphabetic keyboard
- "numeric": the numeric keyboard with punctuation
- "url": the url entry keyboard (iOS only)
- "number": the number pad keyboard
- "phone": the phone number pad keyboard
- "contact": the phone contact pad keyboard (iOS only)
- "email": the email keyboard
+- "decimal": the decimal numeric pad keyboard
Description:
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
-