Fix Windows gyp-ing on Unix-y hosts

livecodefraser · livecodefraser · commit 6b69dd2058de · 2016-05-24T15:09:23.000+01:00
This is required as Vulcan currently does the configure step for
Windows from a Linux environment so the supplied Perl executable
isn't available (we now use the host one instead, where required).
diff --git a/config.sh b/config.sh
@@ -399,6 +399,7 @@ case ${OS} in
     ;;
   win)
     invoke_gyp $basic_args "-Gmsvs_version=${WIN_MSVS_VERSION}" \
+                           "-Dunix_configure=1" \
                            "-Dperl=${WIN_PERL}" "$@"
     ;;
   mac|ios)
diff --git a/config/debug_syms.gypi b/config/debug_syms.gypi
@@ -57,16 +57,34 @@
 				# MSVS generates the debug databases automatically; we just need to copy them
 				'variables':
 				{
+					'variables':
+					{
+						'conditions':
+						[
+							[
+								# If configuring from a Unix-like environment, use its perl
+								# otherwise use the detected Windows perl.
+								'unix_configure != 0',
+								{
+									'perl_command': [ 'perl' ],
+								},
+								{
+									'perl_command': [ '<@(perl)' ],
+								},
+							],
+						],
+					},
+					
 					'command':
 					[
-						'<@(perl)',
+						'<@(perl_command)',
 						'>(DEPTH)/tools/windows_debug_syms.pl',
-						'<@(debug_syms_inputs)',
+						"<@(debug_syms_inputs)",
 					],
 					
 					'debug_syms_outputs':
 					[
-						'>!@(<(command))',
+						">!@(<(command))",
 					],
 				},
 				
diff --git a/config/win32.gypi b/config/win32.gypi
@@ -8,6 +8,9 @@
 		'ms_speech_sdk4%': '$(foo)C:/Program Files/Microsoft Speech SDK',
 		'ms_speech_sdk5%': '$(foo)C:/Program Files/Microsoft Speech SDK 5.1',
 		
+		# Set if the Gyp step is being run on a Unix-like host (i.e not Windows)
+		'unix_configure%': '0',
+		
 		'output_dir': '../win-<(target_arch)-bin',
 	},
 	
