Skip to content

Commit 99ce4e1

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.0' into xcode10_support
2 parents 3506015 + 47c2953 commit 99ce4e1

Some content is hidden

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

56 files changed

+363
-152
lines changed

‎config.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import re
2121
import os
2222
import subprocess
23+
import shutil
2324

2425
# The set of platforms for which this branch supports automated builds
2526
BUILDBOT_PLATFORM_TRIPLES = (
@@ -789,6 +790,7 @@ def configure_mac(opts):
789790
validate_target_arch(opts)
790791
validate_xcode_sdks(opts)
791792
validate_java_tools(opts)
793+
copy_workspace_settings(opts)
792794

793795
args = core_gyp_args(opts) + ['-Dtarget_sdk=' + opts['XCODE_TARGET_SDK'],
794796
'-Dhost_sdk=' + opts['XCODE_HOST_SDK'],
@@ -815,5 +817,23 @@ def configure(args):
815817
}
816818
configure_procs[opts['OS']](opts)
817819

820+
def copy_workspace_settings(opts):
821+
validate_gyp_settings(opts)
822+
if opts['BUILD_EDITION'] == 'commercial':
823+
project = os.path.join(opts['GENERATOR_OUTPUT'], '..', 'livecode-commercial.xcodeproj')
824+
else:
825+
project = os.path.join(opts['GENERATOR_OUTPUT'], 'livecode.xcodeproj')
826+
827+
xcshareddata = os.path.join(project, 'project.xcworkspace', 'xcshareddata')
828+
829+
if not os.path.exists(xcshareddata):
830+
os.makedirs(xcshareddata)
831+
832+
workspacesettingsdest= os.path.join(xcshareddata, 'WorkspaceSettings.xcsettings')
833+
workspacesettingssource = os.path.join('config', 'WorkspaceSettings.xcsettings')
834+
835+
if not os.path.exists(workspacesettingsdest):
836+
shutil.copyfile(workspacesettingssource, workspacesettingsdest)
837+
818838
if __name__ == '__main__':
819839
configure(sys.argv[1:])

‎config/WorkspaceSettings.xcsettings‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>BuildSystemType</key>
6+
<string>Original</string>
7+
</dict>
8+
</plist>

‎docs/dictionary/command/mobileSetKeyboardType.lcdoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ Parameters:
2525
type (enum):
2626
The type of keyboard to use. One of:
2727

28-
- "default": the alphabetic keyboard
28+
- "default": the default keyboard
29+
- "alphabet": the alphabetic keyboard
2930
- "numeric": the numeric keyboard with punctuation
3031
- "url": the url entry keyboard (iOS only)
3132
- "number": the number pad keyboard
3233
- "phone": the phone number pad keyboard
3334
- "contact": the phone contact pad keyboard (iOS only)
3435
- "email": the email keyboard
36+
- "decimal": the decimal numeric pad keyboard
3537

3638

3739
Description:

‎docs/dictionary/command/mobileStoreRestorePurchases.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pState = "restored"
4242
> interacting with the Google Play Store in-app purchasing API, where
4343
> consumables are treated exactly the same way as non-consumables.
4444

45-
>*Note:* : For iOS, non-renewing subscriptions cannot be restored, due
45+
>*Note:* For iOS, non-renewing subscriptions cannot be restored, due
4646
> to technical restrictions imposed by Apple. This means that developers
4747
> are responsible for restoring non-renewing subscriptions and making
4848
> them available across all devices the users own.

‎docs/dictionary/command/modal.lcdoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ stack:
2424
Any stack reference.
2525

2626
Description:
27-
Use the <modal> <command> to display a <stack> as a custom <modal dialog
28-
box>.
27+
Use the <modal> <command> to display a <stack> as a custom
28+
<modal dialog box>.
2929

3030
>*Important:* When a <stack> is opened as <modal> its <location> is set
3131
> to the center of the <defaultStack> if the <defaultStack> is open and
@@ -56,10 +56,10 @@ are sent regardless of the setting of the <lockMessages> <property>.
5656
If the stack is already displayed as a modal dialog box, the <modal>
5757
<command> does not close and reopen it.
5858

59-
The <modal> <command> pauses the running <handler> until the <modal
60-
dialog box> is dismissed (usually by clicking a button in the <modal
61-
dialog box>). To <return> information to the <handler> about which
62-
<button(keyword)> was clicked, in the <button(object)|button's>
59+
The <modal> <command> pauses the running <handler> until the
60+
<modal dialog box> is dismissed (usually by clicking a button in the
61+
<modal dialog box>). To <return> information to the <handler> about
62+
which <button(keyword)> was clicked, in the <button(object)|button's>
6363
<script>, set a <global|global variable> or <custom property>. After the
6464
<dialog box> is dismissed, the <handler> can query this <variable> or
6565
<property> and act accordingly.
@@ -72,7 +72,7 @@ regardless of the current setting of the <tool> <property>.
7272
References: lock messages (command), ask (command),
7373
ask file with type (command), modeless (command), return (constant),
7474
tool (function), variable (glossary), editable window (glossary),
75-
property (glossary), dialog box (glossary), location (glossary),
75+
property (glossary), dialog box (glossary), location (property),
7676
execute (glossary), modal dialog box (glossary), command (glossary),
7777
global (glossary), Browse tool (glossary), custom property (glossary),
7878
message (glossary), current card (glossary), handler (glossary),

‎docs/dictionary/command/modeless.lcdoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ stack:
2424
Any stack reference.
2525

2626
Description:
27-
Use the <modeless> <command> to display a <stack> as a custom <modeless
28-
dialog box>.
27+
Use the <modeless> <command> to display a <stack> as a custom
28+
<modeless dialog box>.
2929

3030
A modeless dialog box behaves like an ordinary window, except that it
3131
cannot be edited. Use modeless dialog boxes to ask the user for

‎docs/dictionary/command/move.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ References: drag (command), grab (command), lock moves (command),
9797
stop moving (command), unlock moves (command), movingControls (function),
9898
object (glossary), property (glossary), handler (glossary),
9999
execute (glossary), message (glossary), statement (glossary),
100-
curve (glossary), command (glossary), without (keyword),
100+
command (glossary), curve (keyword), without (keyword),
101101
graphic (keyword), relative (keyword), moveStopped (message),
102102
control (object), lockMoves (property), syncRate (property),
103103
moveSpeed (property), location (property), points (property),

‎docs/dictionary/command/print.lcdoc‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Syntax: print {<stack> | <card> |{marked| <number> |all} cards} [into <pageRect>
88

99
Syntax: print {<stack> | <card> |{marked| <number> |all} cards} [from <topLeft> to <bottomRight>]
1010

11-
Syntax: print break&gt;
11+
Syntax: print break
1212

1313
Summary:
1414
Prints one or more <card|cards>.
@@ -99,12 +99,12 @@ the size of the cards and on whether you specify a <pageRect>.
9999
The print <marked> cards form prints all the cards in the current stack
100100
whose <mark> <property> is set to true.
101101

102-
The print all cards form is equivalent to print this stack.
102+
The print all cards form is equivalent to `print this stack`.
103103

104104
The print break form forces a page break.
105105

106-
>*Note:* If a <card(keyword)> is larger than a full page, the <print
107-
> command> prints only the first page of the <card(keyword)>, starting
106+
>*Note:* If a <card(keyword)> is larger than a full page, the <print>
107+
> command prints only the first page of the <card(keyword)>, starting
108108
> at the top left corner. To print the entire <card(keyword)>, use the
109109
> <print>...into pageRect form to scale the card to the page.
110110

@@ -122,8 +122,7 @@ set the <lockScreen> <property> to true before you print.
122122

123123
References: revPrintReport (command), answer page setup (command),
124124
mark (command), cancel printing (command), revBrowserPrint (command),
125-
open printing (command), print command (command),
126-
close printing (command), answer printer (command),
125+
open printing (command), close printing (command), answer printer (command),
127126
reset printing (command), object (glossary), property (glossary),
128127
Windows (glossary), Unix (glossary), command (glossary),
129128
PostScript (glossary), Mac OS (glossary), file (keyword),

‎docs/dictionary/control_st/repeat.lcdoc‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,18 @@ during the second, and so on:
242242
put myLine
243243
end repeat
244244

245+
>*Note:* The *counterVariable* *myLine* is 0 in the final iteration of
246+
the loop as it is only once the *counterVariable* is less than or equal
247+
to the *endValue* that the loop will perform its final iteration. To
248+
prevent the loop executing one more iteration than desired, one could
249+
compare the two and use <exit repeat> to end the iteration immediately.
250+
For example:
251+
252+
repeat with myLine = 20 to 1 step -2
253+
if myLine <= 1 then exit repeat
254+
put myLine
255+
end repeat
256+
245257

246258
>*Note:* It is possible to change the *counterVariable* in a statement
247259
in the loop. However, doing this is not recommended, because it makes
@@ -313,8 +325,9 @@ variable inside a for each loop without affecting the
313325
iterations of the loop.
314326

315327
References: wait (command), next repeat (control structure),
316-
round (function), iteration (glossary), array (glossary),
317-
chunk (glossary), conditional (glossary), container (glossary),
328+
exit repeat (control structure), round (function),
329+
iteration (glossary), array (glossary), chunk (glossary),
330+
conditional (glossary), container (glossary),
318331
control structure (glossary), delimit (glossary), element (glossary),
319332
execute (glossary), field (glossary), function (glossary),
320333
integer (glossary), keyword (glossary), statement (glossary),

‎docs/dictionary/function/mobileStoreProductProperty.lcdoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ of the purchased product. It should be handled in the
6060
For Samsung Store (Android), you can query the properties:
6161

6262
- title : title of the item purchased
63-
- <productId> : identifier of the purchased product
63+
- productId : identifier of the purchased product
6464
- price : price of purchased product
6565
- currencyUnit : currency unit of the product price
6666
- description : description of the item as specified in Samsung Seller
@@ -77,7 +77,7 @@ For Samsung Store (Android), you can query the properties:
7777

7878
For Google Play Store (Android), you can query the properties :
7979

80-
- <productId> : identifier of the purchased product
80+
- productId : identifier of the purchased product
8181
- packageName : application package for which the purchase originated
8282
- orderId : unique order identifier for the transaction. This
8383
corresponds to the Google Wallet Order ID
@@ -95,7 +95,7 @@ For Google Play Store (Android), you can query the properties :
9595

9696
For Amazon Store (Android) you can query the properties :
9797

98-
- <productId> : identifier of the purchased product
98+
- productId : identifier of the purchased product
9999
- itemType : type of the purchased item, CONSUMABLE, ENTITLED or
100100
SUBSCRIPTION
101101
- subscriptionPeriod : string indicating the start and end date for
@@ -108,7 +108,7 @@ For iTunes Store (iOS), you can query for the properties:
108108

109109
- quantity : amount of product purchased. You can specify a value for
110110
this in <mobileStoreMakePurchase>
111-
- <productId> : identifier of the purchased product
111+
- productId : identifier of the purchased product
112112
- receipt : block of data that can be used to confirm the purchase from
113113
a remote server with the itunes store
114114
- purchaseDate : date the purchase/restore request was sent

0 commit comments

Comments
 (0)