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

Commit 86f0856

Browse files
livecodefraserlivecodefraser
committed
Factor the debug symbol extraction out into a separate file
1 parent da86f08 commit 86f0856

2 files changed

Lines changed: 68 additions & 47 deletions

File tree

‎config/debug_syms.gypi‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
'conditions':
3+
[
4+
[
5+
'OS == "linux" or OS == "android"',
6+
{
7+
'variables':
8+
{
9+
'debug_syms_outputs':
10+
[
11+
'>!@(["sh", "-c", "echo $@ | xargs -n1 | sed -e \\\"s/$/>(debug_info_suffix)/g\\\"", "echo", \'>@(debug_syms_inputs)\'])',
12+
],
13+
14+
'extract-debug-symbols_path': '../tools/extract-debug-symbols.sh',
15+
},
16+
17+
'actions':
18+
[
19+
{
20+
'action_name': 'extract-debug-symbols',
21+
'message': 'Extracting debug symbols',
22+
23+
'inputs':
24+
[
25+
'>@(debug_syms_inputs)',
26+
'<(extract-debug-symbols_path)',
27+
],
28+
29+
'outputs':
30+
[
31+
'>@(debug_syms_outputs)',
32+
],
33+
34+
'action':
35+
[
36+
'<(extract-debug-symbols_path)',
37+
'>(debug_info_suffix)',
38+
'>@(debug_syms_inputs)',
39+
],
40+
},
41+
],
42+
}
43+
],
44+
],
45+
}

‎livecode.gyp‎

Lines changed: 23 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -99,55 +99,31 @@
9999
'LiveCode-all',
100100
],
101101

102-
'conditions':
103-
[
104-
[
105-
'OS == "linux" or OS == "android"',
106-
{
107-
'variables':
108-
{
109-
'debug_symbol_files':
110-
[
111-
'>!@(["sh", "-c", "echo $@ | xargs -n1 | sed -e \\\"s/$/>(debug_info_suffix)/g\\\"", "echo", \'>@(dist_files)\'])',
112-
],
113-
},
114-
115-
'actions':
116-
[
117-
{
118-
'action_name': 'extract-debug-symbols',
119-
'message': 'Extracting debug symbols',
120-
121-
'inputs':
122-
[
123-
'>@(dist_files)',
124-
'./tools/extract-debug-symbols.sh',
125-
],
126-
127-
'outputs':
128-
[
129-
'<@(debug_symbol_files)',
130-
],
131-
132-
'action':
133-
[
134-
'./tools/extract-debug-symbols.sh',
135-
'>(debug_info_suffix)',
136-
'<@(_inputs)',
137-
],
138-
},
139-
],
102+
'variables':
103+
{
104+
'debug_syms_inputs%': [ '<@(debug_syms_inputs)' ],
105+
'variables':
106+
{
107+
'debug_syms_inputs': [ '>@(dist_files)' ],
108+
},
109+
},
140110

141-
'all_dependent_settings':
142-
{
143-
'variables':
144-
{
145-
'dist_aux_files': [ '<@(debug_symbol_files)' ],
146-
},
147-
},
148-
}
149-
],
111+
'includes':
112+
[
113+
'config/debug_syms.gypi',
150114
],
115+
116+
'all_dependent_settings':
117+
{
118+
'variables':
119+
{
120+
'dist_aux_files': [ '<@(debug_syms_outputs)' ],
121+
'variables':
122+
{
123+
'debug_syms_inputs%': [ '<@(debug_syms_inputs)' ],
124+
},
125+
},
126+
},
151127
},
152128

153129
{

0 commit comments

Comments
 (0)