Skip to content

Commit 3f6d0bb

Browse files
committed
Merge pull request nwjs#1883 from libm/v0.8
cherry-pick two patches (updated package generator, added symbol support)
2 parents b19036e + 61ffe9a commit 3f6d0bb

File tree

2 files changed

+343
-256
lines changed

2 files changed

+343
-256
lines changed

nw.gypi

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
{
66
'variables': {
77
'nw_product_name': 'node-webkit',
8-
'conditions': [
9-
['OS=="linux"', {
10-
'linux_dump_symbols%': 1,
11-
}],
12-
],
138
},
149
'targets': [
1510
{
@@ -565,6 +560,38 @@
565560
'nw',
566561
],
567562
},
563+
{
564+
'target_name': 'nw_symbols',
565+
'type': 'none',
566+
'conditions': [
567+
['OS=="linux"', {
568+
'actions': [
569+
{
570+
'action_name': 'dump_symbols',
571+
'inputs': [
572+
'<(DEPTH)/build/linux/dump_app_syms',
573+
'<(PRODUCT_DIR)/dump_syms',
574+
'<(PRODUCT_DIR)/nw',
575+
],
576+
'outputs': [
577+
'<(PRODUCT_DIR)/nw.breakpad.<(target_arch)',
578+
],
579+
'action': ['<(DEPTH)/build/linux/dump_app_syms',
580+
'<(PRODUCT_DIR)/dump_syms',
581+
'<(linux_strip_binary)',
582+
'<(PRODUCT_DIR)/nw',
583+
'<@(_outputs)'],
584+
'message': 'Dumping breakpad symbols to <(_outputs)',
585+
'process_outputs_as_sources': 1,
586+
},
587+
],
588+
'dependencies': [
589+
'nw',
590+
'../breakpad/breakpad.gyp:dump_syms',
591+
],
592+
}],
593+
],
594+
},
568595
{
569596
'target_name': 'dist',
570597
'type': 'none',
@@ -585,6 +612,7 @@
585612
],
586613
'dependencies': [
587614
'<(DEPTH)/chrome/chrome.gyp:chromedriver2_server',
615+
'nw_symbols',
588616
],
589617
'conditions': [
590618
['OS == "linux"', {
@@ -902,40 +930,5 @@
902930
}, # target nw_helper_app
903931
],
904932
}], # OS=="mac"
905-
['OS=="linux"',
906-
{ 'targets': [
907-
{
908-
'target_name': 'nw_symbols',
909-
'type': 'none',
910-
'conditions': [
911-
['linux_dump_symbols==1', {
912-
'actions': [
913-
{
914-
'action_name': 'dump_symbols',
915-
'inputs': [
916-
'<(DEPTH)/build/linux/dump_app_syms',
917-
'<(PRODUCT_DIR)/dump_syms',
918-
'<(PRODUCT_DIR)/nw',
919-
],
920-
'outputs': [
921-
'<(PRODUCT_DIR)/nw.breakpad.<(target_arch)',
922-
],
923-
'action': ['<(DEPTH)/build/linux/dump_app_syms',
924-
'<(PRODUCT_DIR)/dump_syms',
925-
'<(linux_strip_binary)',
926-
'<(PRODUCT_DIR)/nw',
927-
'<@(_outputs)'],
928-
'message': 'Dumping breakpad symbols to <(_outputs)',
929-
'process_outputs_as_sources': 1,
930-
},
931-
],
932-
'dependencies': [
933-
'nw',
934-
'../breakpad/breakpad.gyp:dump_syms',
935-
],
936-
}],
937-
],
938-
}],
939-
}], # OS=="linux"
940933
] # conditions
941934
}

0 commit comments

Comments
 (0)