Fix Win32 debug symbol extraction under MSVS

livecodefraser · livecodefraser · commit ffee30b73a7f · 2016-05-24T10:37:48.000+01:00
diff --git a/config/debug_syms.gypi b/config/debug_syms.gypi
@@ -57,11 +57,37 @@
 				# MSVS generates the debug databases automatically; we just need to copy them
 				'variables':
 				{
+					'command':
+					[
+						'<@(perl)',
+						'>(DEPTH)/tools/windows_debug_syms.pl',
+						'<@(debug_syms_inputs)',
+					],
+					
 					'debug_syms_outputs':
 					[
-						'>!@(["<@(perl)", "tools/windows_debug_syms.pl", \'>@(debug_syms_inputs)\'])',
+						'>!@(<(command))',
 					],
 				},
+				
+				'actions':
+				[
+					{
+						'action_name': 'windows_debug_syms',
+						'message': 'Extracting debug symbols',
+						
+						'inputs': [ '>@(debug_syms_inputs)', ],
+						'outputs': [ '>@(debug_syms_outputs)', ],
+						
+						# Dummy action
+						# This action is needed so that dependencies work correctly
+						'action':
+						[
+							'echo',
+							'Nothing to be done',
+						],
+					},
+				],
 			},
 		],
 		[
diff --git a/tools/windows_debug_syms.pl b/tools/windows_debug_syms.pl
@@ -3,7 +3,7 @@
 # Replace the .exe suffix for each executable with .pdb
 for (@ARGV)
 {
-	s/\.exe$/\.pdb/;
+	s/\.(exe|dll)/\.pdb/g;
 }
 
-print join("\n", @ARGV);
+print join("\n", @ARGV);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Replace the .exe suffix for each executable with .pdb`
`4`	`4`	`for (@ARGV)`
`5`	`5`	`{`
`6`		`- s/\.exe$/\.pdb/;`
	`6`	`+ s/\.(exe\|dll)/\.pdb/g;`
`7`	`7`	`}`
`8`	`8`
`9`		`-print join("\n", @ARGV);`
	`9`	`+print join("\n", @ARGV);`