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

Commit ea7ff45

Browse files
livecodesebastienlivecodesebastien
committed
Revert "[[ Bug 15743 ]] binzip-copy target cannot copy dSYM files in Debug mode, since the debug symbols are not extracted."
This reverts commit b07d02f, which breaks commercial compilation - and does not fix the issue in the best way
1 parent 78865a5 commit ea7ff45

3 files changed

Lines changed: 91 additions & 145 deletions

File tree

‎config/debug_syms.gypi‎

Lines changed: 44 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,65 @@
11
{
2-
'targets':
2+
'conditions':
33
[
4-
{
5-
'target_name': 'debug-symbols',
6-
'type': 'none',
7-
8-
'dependencies':
9-
[
10-
'LiveCode-all',
11-
],
12-
13-
'variables':
4+
[
5+
'OS != "win"',
146
{
15-
'debug_syms_inputs%': [ '<@(debug_syms_inputs)' ],
167
'variables':
178
{
18-
'debug_syms_inputs': [ '>@(dist_files)' ],
19-
},
20-
},
21-
22-
'conditions':
23-
[
24-
[
25-
'OS != "win"',
26-
{
27-
'variables':
28-
{
29-
'debug_syms_outputs':
30-
[
31-
'>!@(["sh", "-c", "echo $@ | xargs -n1 | sed -e \\\"s/$/>(debug_info_suffix)/g\\\"", "echo", \'>@(debug_syms_inputs)\'])',
32-
],
9+
'debug_syms_outputs':
10+
[
11+
'>!@(["sh", "-c", "echo $@ | xargs -n1 | sed -e \\\"s/$/>(debug_info_suffix)/g\\\"", "echo", \'>@(debug_syms_inputs)\'])',
12+
],
3313

34-
'extract-debug-symbols_path': '../tools/extract-debug-symbols.sh',
14+
'extract-debug-symbols_path': '../tools/extract-debug-symbols.sh',
3515

36-
# These tools are only used for Linux and Android targets
37-
'objcopy%': '',
38-
'objdump%': '',
39-
'strip%': '',
40-
},
16+
# These tools are only used for Linux and Android targets
17+
'objcopy%': '',
18+
'objdump%': '',
19+
'strip%': '',
20+
},
4121

42-
'actions':
43-
[
44-
{
45-
'action_name': 'extract-debug-symbols',
46-
'message': 'Extracting debug symbols',
22+
'actions':
23+
[
24+
{
25+
'action_name': 'extract-debug-symbols',
26+
'message': 'Extracting debug symbols',
4727

48-
'inputs':
49-
[
50-
'>@(debug_syms_inputs)',
51-
'<(extract-debug-symbols_path)',
52-
],
28+
'inputs':
29+
[
30+
'>@(debug_syms_inputs)',
31+
'<(extract-debug-symbols_path)',
32+
],
5333

54-
'outputs':
55-
[
56-
'>@(debug_syms_outputs)',
57-
],
34+
'outputs':
35+
[
36+
'>@(debug_syms_outputs)',
37+
],
5838

59-
'action':
60-
[
61-
'env',
62-
'OBJCOPY=<(objcopy)',
63-
'OBJDUMP=<(objdump)',
64-
'STRIP=<(strip)',
65-
'<(extract-debug-symbols_path)',
66-
'<(OS)',
67-
'>(debug_info_suffix)',
68-
'>@(debug_syms_inputs)',
69-
],
70-
},
39+
'action':
40+
[
41+
'env',
42+
'OBJCOPY=<(objcopy)',
43+
'OBJDUMP=<(objdump)',
44+
'STRIP=<(strip)',
45+
'<(extract-debug-symbols_path)',
46+
'<(OS)',
47+
'>(debug_info_suffix)',
48+
'>@(debug_syms_inputs)',
7149
],
72-
}
73-
],
74-
[
75-
'OS == "win"',
76-
{
77-
# Not yet implemented...
78-
'variables':
79-
{
80-
'debug_syms_outputs': [],
81-
},
8250
},
8351
],
84-
],
85-
86-
87-
'all_dependent_settings':
52+
}
53+
],
54+
[
55+
'OS == "win"',
8856
{
57+
# Not yet implemented...
8958
'variables':
9059
{
91-
'dist_aux_files': [ '<@(debug_syms_outputs)' ],
92-
'variables':
93-
{
94-
'debug_syms_inputs%': [ '<@(debug_syms_inputs)' ],
95-
},
60+
'debug_syms_outputs': [],
9661
},
9762
},
98-
},
99-
{
100-
'target_name': 'binzip-copy',
101-
'type': 'none',
102-
103-
'variables':
104-
{
105-
'dist_files': [],
106-
'dist_aux_files': [],
107-
},
108-
109-
'dependencies':
110-
[
111-
'LiveCode-all',
112-
'debug-symbols',
113-
],
114-
115-
'copies':
116-
[{
117-
'destination': '<(output_dir)',
118-
'files': [ '>@(dist_files)', '>@(dist_aux_files)', ],
119-
}],
120-
},
63+
],
12164
],
12265
}

‎docs/notes/bugfix-15743.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎livecode.gyp‎

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -98,60 +98,64 @@
9898
],
9999
],
100100
},
101-
],
102-
103-
'configurations':
104-
{
105-
'Debug':
101+
106102
{
107-
'targets':
103+
'target_name': 'debug-symbols',
104+
'type': 'none',
105+
106+
'dependencies':
108107
[
108+
'LiveCode-all',
109+
],
110+
111+
'variables':
112+
{
113+
'debug_syms_inputs%': [ '<@(debug_syms_inputs)' ],
114+
'variables':
109115
{
110-
'target_name': 'binzip-copy',
111-
'type': 'none',
116+
'debug_syms_inputs': [ '>@(dist_files)' ],
117+
},
118+
},
112119

120+
'includes':
121+
[
122+
'config/debug_syms.gypi',
123+
],
124+
125+
'all_dependent_settings':
126+
{
127+
'variables':
128+
{
129+
'dist_aux_files': [ '<@(debug_syms_outputs)' ],
113130
'variables':
114131
{
115-
'dist_files': [],
116-
'dist_aux_files': [],
132+
'debug_syms_inputs%': [ '<@(debug_syms_inputs)' ],
117133
},
118-
119-
'dependencies':
120-
[
121-
'LiveCode-all',
122-
],
123-
124-
'copies':
125-
[{
126-
'destination': '<(output_dir)',
127-
'files': [ '>@(dist_files)', '>@(dist_aux_files)', ],
128-
}],
129134
},
130-
],
135+
},
131136
},
132-
'Release':
137+
133138
{
134-
'targets':
135-
[
136-
{
137-
'includes':
138-
[
139-
'config/debug_syms.gypi',
140-
],
141-
},
142-
],
143-
},
144-
'Fast':
145-
{
146-
'targets':
139+
'target_name': 'binzip-copy',
140+
'type': 'none',
141+
142+
'variables':
143+
{
144+
'dist_files': [],
145+
'dist_aux_files': [],
146+
},
147+
148+
'dependencies':
147149
[
148-
{
149-
'includes':
150-
[
151-
'config/debug_syms.gypi',
152-
],
153-
},
150+
'LiveCode-all',
151+
'debug-symbols',
154152
],
153+
154+
'copies':
155+
[{
156+
'destination': '<(output_dir)',
157+
'files': [ '>@(dist_files)', '>@(dist_aux_files)', ],
158+
}],
155159
},
156-
}
160+
],
157161
}

0 commit comments

Comments
 (0)