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

Commit b8d7174

Browse files
livecodealilivecodeali
authored
Merge pull request #6309 from livecodeali/bugfix-extension_build_scripts
Bugfix extension build scripts
2 parents a9c2df7 + 2a37058 commit b8d7174

File tree

18 files changed

+2155
-327
lines changed

18 files changed

+2155
-327
lines changed

‎extensions/extensions.gyp‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272

7373
'sources':
7474
[
75+
'script-libraries/extension-utils/extension-utils.livecodescript',
76+
7577
'script-libraries/oauth2/oauth2.livecodescript',
7678
'script-libraries/getopt/getopt.livecodescript',
7779
'script-libraries/mime/mime.livecodescript',
@@ -87,6 +89,8 @@
8789
[
8890
# Requires a working LiveCode engine
8991
'../engine/engine.gyp:server',
92+
'../revzip/revzip.gyp:external-revzip-server',
93+
'../revxml/revxml.gyp:external-revxml-server',
9094
],
9195

9296
'rules':
@@ -104,16 +108,16 @@
104108
'action':
105109
[
106110
'<(engine)',
107-
'../util/package_extension.livecodescript',
111+
'script-libraries/extension-utils/resources/extension-utils.lc',
112+
'$(not_a_real_variable)buildextension',
108113
'dummy1',
109114
'dummy2',
110115
'dummy3',
111-
'../util/extract-docs.livecodescript',
112116
'../ide-support/revdocsparser.livecodescript',
113117
'<(RULE_INPUT_DIRNAME)',
114118
'<(RULE_INPUT_ROOT).livecodescript',
115119
'<(PRODUCT_DIR)/packaged_extensions',
116-
'false',
120+
'$(not_a_real_variable)false',
117121
],
118122
},
119123
],
@@ -128,6 +132,8 @@
128132
'../toolchain/lc-compile/lc-compile.gyp:lc-compile',
129133
'../engine/lcb-modules.gyp:engine_lcb_modules',
130134
'../engine/engine.gyp:server',
135+
'../revzip/revzip.gyp:external-revzip-server',
136+
'../revxml/revxml.gyp:external-revxml-server',
131137
],
132138

133139
'sources':
@@ -183,7 +189,7 @@
183189

184190
'inputs':
185191
[
186-
'../util/build-extensions.sh',
192+
'script-libraries/extension-utils/resources/extension-utils.lc',
187193
'<@(_sources)',
188194
],
189195

@@ -195,36 +201,17 @@
195201

196202
'message': 'Building extensions',
197203

198-
'conditions':
199-
[
200-
[
201-
'OS == "win"',
202-
{
203-
'variables':
204-
{
205-
'build_command': [ '$(ProjectDir)../../../util/invoke-unix.bat', '$(ProjectDir)../../../util/build-extensions.sh' ],
206-
},
207-
},
208-
{
209-
'variables':
210-
{
211-
'build_command': [ '../util/build-extensions.sh' ],
212-
},
213-
},
214-
],
215-
],
216-
217204
'action':
218205
[
219-
'<@(build_command)',
220206
'<(engine)',
221-
'../util/package_extension.livecodescript',
222-
'../util/extract-docs.livecodescript',
223-
'../ide-support/revdocsparser.livecodescript',
207+
'script-libraries/extension-utils/resources/extension-utils.lc',
208+
'$(not_a_real_variable)buildlcbextensions',
209+
'../ide-support/revdocsparser.livecodescript',
224210
'<(PRODUCT_DIR)/packaged_extensions',
225-
'false',
211+
'$(not_a_real_variable)false',
226212
'>(lc-compile_host)',
227213
'<(PRODUCT_DIR)/modules/lci',
214+
'$(not_a_real_variable)',
228215
'<@(_sources)',
229216
],
230217
},

‎extensions/libraries/canvas/canvas.lcb‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ variable sCanvas as optional Canvas
5454

5555
/**
5656
Summary: Creates a canvas of the given size for the other handlers to use.
57+
58+
Parameters:
5759
pWidth: The width of the created canvas.
5860
pHeight: The height of the created canvas.
5961

@@ -82,6 +84,8 @@ end handler
8284

8385
/**
8486
Summary: Sets the current color of the canvas to the given RGBA value.
87+
88+
Parameters:
8589
pRed: The red component of the color to set.
8690
pGreen: The green component of the color to set.
8791
pBlue: The blue component of the color to set.
@@ -96,9 +100,12 @@ end handler
96100

97101
/**
98102
Summary: Draws a filled circle.
103+
104+
Parameters:
99105
pX: The x-coordinate of the centre of the circle.
100106
pY: The y-coordinate of the centre of the circle.
101107
pRadius: The radius of the circle.
108+
102109
Description:
103110
Fills a circle of the given radius at the given position in the canvas.
104111
*/
@@ -108,6 +115,8 @@ end handler
108115

109116
/**
110117
Summary: Copies the current contents of the canvas to the specified image object.
118+
119+
Parameters:
111120
pObjectId: A string which is an object chunk referring to an image.
112121

113122
Description:
@@ -129,9 +138,12 @@ public handler canvasApplyToImage(in pObjectId as String) returns nothing
129138
set property "imageData" of tObject to the pixel data of sCanvas
130139
end handler
131140

132-
/*
141+
/**
133142
Summary: Returns the bounding box of an SVG path.
134-
pPath: The SVG Path string to process
143+
144+
Parameters:
145+
pPathString: The SVG Path string to process
146+
135147
Description:
136148
Parses the SVG path string and computes the tight bounding box.
137149
*/

0 commit comments

Comments
 (0)