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

Commit 79403ef

Browse files
livecodefraserlivecodefraser
committed
Add zipping support for Mac and Linux targets
1 parent 554991b commit 79403ef

File tree

12 files changed

+237
-50
lines changed

12 files changed

+237
-50
lines changed

‎config/linux.gypi‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
{
2+
'variables':
3+
{
4+
'output_dir': '../linux-<(target_arch)-bin',
5+
},
6+
27
'target_defaults':
38
{
9+
'variables':
10+
{
11+
'app_bundle_suffix': '',
12+
'ext_bundle_suffix': '.so',
13+
'lib_suffix': '.so',
14+
'ext_suffix': '.so',
15+
'exe_suffix': '',
16+
},
17+
418
'defines':
519
[
620
'HAVE___THREAD',

‎config/mac.gypi‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
{
44
'target_sdk%': 'macosx10.8',
55
'host_sdk%': 'macosx',
6+
7+
'output_dir': '../mac-bin',
68
},
79

810
'xcode_config_file': '../version',
@@ -27,6 +29,15 @@
2729

2830
'target_defaults':
2931
{
32+
'variables':
33+
{
34+
'app_bundle_suffix': '.app',
35+
'ext_bundle_suffix': '.bundle',
36+
'exe_suffix': '',
37+
'lib_suffix': '.dylib',
38+
'ext_suffix': '.so',
39+
},
40+
3041
'target_conditions':
3142
[
3243
[

‎engine/engine.gyp‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
{
133133
'target_name': 'server',
134134
'type': 'executable',
135+
'product_name': 'server-community',
135136

136137
'dependencies':
137138
[
@@ -170,10 +171,22 @@
170171
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
171172
},
172173
},
174+
175+
'all_dependent_settings':
176+
{
177+
'variables':
178+
{
179+
'dist_files':
180+
[
181+
'<(PRODUCT_DIR)/<(_product_name)>(exe_suffix)',
182+
],
183+
},
184+
},
173185
},
174186

175187
{
176188
'target_name': 'standalone',
189+
'product_name': 'standalone-community',
177190

178191
'includes':
179192
[
@@ -241,10 +254,19 @@
241254
},
242255
],
243256
],
257+
258+
'all_dependent_settings':
259+
{
260+
'variables':
261+
{
262+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(app_bundle_suffix)' ],
263+
},
264+
},
244265
},
245266

246267
{
247268
'target_name': 'installer',
269+
'product_name': 'installer',
248270

249271
'includes':
250272
[
@@ -302,10 +324,19 @@
302324
'AdditionalManifestFiles': '$(SolutionDir)..\\engine\\src\\installer.manifest',
303325
},
304326
},
327+
328+
'all_dependent_settings':
329+
{
330+
'variables':
331+
{
332+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(app_bundle_suffix)' ],
333+
},
334+
},
305335
},
306336

307337
{
308338
'target_name': 'development',
339+
'product_name': 'livecode-community',
309340

310341
'includes':
311342
[
@@ -367,6 +398,14 @@
367398
'AdditionalManifestFiles': '$(SolutionDir)..\\engine\\src\\engine.manifest',
368399
},
369400
},
401+
402+
'all_dependent_settings':
403+
{
404+
'variables':
405+
{
406+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(app_bundle_suffix)' ],
407+
},
408+
},
370409
},
371410

372411
{

‎livecode.gyp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,21 @@
6666
],
6767
],
6868
},
69+
70+
{
71+
'target_name': 'binzip-copy',
72+
'type': 'none',
73+
74+
'dependencies':
75+
[
76+
'LiveCode-all',
77+
],
78+
79+
'copies':
80+
[{
81+
'destination': '<(output_dir)',
82+
'files': [ '>@(dist_files)' ],
83+
}],
84+
},
6985
],
7086
}

‎revdb/revdb.gyp‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
'type': 'loadable_module',
4040
'mac_bundle': 1,
4141
'product_prefix': '',
42+
'product_name': 'dbmysql',
4243

4344
'dependencies':
4445
[
@@ -76,12 +77,21 @@
7677
'_releasedbconnectionref',
7778
],
7879
},
80+
81+
'all_dependent_settings':
82+
{
83+
'variables':
84+
{
85+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(ext_bundle_suffix)' ],
86+
},
87+
},
7988
},
8089
{
8190
'target_name': 'dbodbc',
8291
'type': 'loadable_module',
8392
'mac_bundle': 1,
8493
'product_prefix': '',
94+
'product_name': 'dbodbc',
8595

8696
# Not for Windows
8797
'conditions':
@@ -128,12 +138,21 @@
128138
'_releasedbconnectionref',
129139
],
130140
},
141+
142+
'all_dependent_settings':
143+
{
144+
'variables':
145+
{
146+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(ext_bundle_suffix)' ],
147+
},
148+
},
131149
},
132150
{
133151
'target_name': 'dbpostgresql',
134152
'type': 'loadable_module',
135153
'mac_bundle': 1,
136154
'product_prefix': '',
155+
'product_name': 'dbpostgresql',
137156

138157
'dependencies':
139158
[
@@ -169,12 +188,21 @@
169188
'_releasedbconnectionref',
170189
],
171190
},
191+
192+
'all_dependent_settings':
193+
{
194+
'variables':
195+
{
196+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(ext_bundle_suffix)' ],
197+
},
198+
},
172199
},
173200
{
174201
'target_name': 'dbsqlite',
175202
'type': 'loadable_module',
176203
'mac_bundle': 1,
177204
'product_prefix': '',
205+
'product_name': 'dbsqlite',
178206

179207
'dependencies':
180208
[
@@ -232,12 +260,21 @@
232260
},
233261
],
234262
],
263+
264+
'all_dependent_settings':
265+
{
266+
'variables':
267+
{
268+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(ext_bundle_suffix)' ],
269+
},
270+
},
235271
},
236272
{
237273
'target_name': 'revdb',
238274
'type': 'loadable_module',
239275
'mac_bundle': 1,
240276
'product_prefix': '',
277+
'product_name': 'revdb',
241278

242279
'dependencies':
243280
[
@@ -264,11 +301,20 @@
264301
{
265302
'ios_external_symbols': [ '_getXtable' ],
266303
},
304+
305+
'all_dependent_settings':
306+
{
307+
'variables':
308+
{
309+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(ext_bundle_suffix)' ],
310+
},
311+
},
267312
},
268313
{
269314
'target_name': 'revdb-server',
270315
'type': 'loadable_module',
271316
'product_prefix': '',
317+
'product_name': 'revdb-server',
272318

273319
'variables':
274320
{
@@ -291,6 +337,14 @@
291337
[
292338
'<@(revdb_sources)',
293339
],
340+
341+
'all_dependent_settings':
342+
{
343+
'variables':
344+
{
345+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(ext_suffix)' ],
346+
},
347+
},
294348
},
295349
],
296350
}

‎revfont/revfont.gyp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
'type': 'loadable_module',
1212
'mac_bundle': 1,
1313
'product_prefix': '',
14+
'product_name': 'revfont',
1415

1516
'dependencies':
1617
[
@@ -53,6 +54,14 @@
5354
'INFOPLIST_FILE': 'rsrc/revfont-Info.plist',
5455
'EXPORTED_SYMBOLS_FILE': 'revfont.exports',
5556
},
57+
58+
'all_dependent_settings':
59+
{
60+
'variables':
61+
{
62+
'dist_files': [ '<(PRODUCT_DIR)/<(_product_name)>(ext_bundle_suffix)' ],
63+
},
64+
},
5665
},
5766
],
5867
}

0 commit comments

Comments
 (0)