diff options
| -rw-r--r-- | remoting/remoting.gyp | 68 |
1 files changed, 31 insertions, 37 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 7218e03..da81e1f 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -650,7 +650,7 @@ '<(PRODUCT_DIR)/chromoting.msi', ], 'wix_defines' : [ - '"-dBranding=<(branding)"', + '-dBranding=<(branding)', ], 'conditions': [ ['buildtype == "Official"', { @@ -675,19 +675,18 @@ ], 'process_outputs_as_sources': 1, 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, 'action': [ - '"<(wix_path)\\candle"', - '-ext "<(wix_path)\\WixFirewallExtension.dll"', - '-ext "<(wix_path)\\WixUIExtension.dll"', - '-ext "<(wix_path)\\WixUtilExtension.dll"', + '<(wix_path)\\candle', + '-ext', '<(wix_path)\\WixFirewallExtension.dll', + '-ext', '<(wix_path)\\WixUIExtension.dll', + '-ext', '<(wix_path)\\WixUtilExtension.dll', '-dVersion=<(version_full)', - '"-dFileSource=<(PRODUCT_DIR)."', - '"-dIconPath=resources/chromoting.ico"', - '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"', + '-dFileSource=<(PRODUCT_DIR).', + '-dIconPath=resources/chromoting.ico', + '-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll', '<@(_wix_defines)', - '-out <@(_outputs)', - '"<(RULE_INPUT_PATH)"', + '-out', '<@(_outputs)', + '<(RULE_INPUT_PATH)', ], 'message': 'Generating <@(_outputs)', }, @@ -706,21 +705,20 @@ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).wixpdb', ], 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, 'action': [ - '"<(wix_path)\\light"', - '-ext "<(wix_path)\\WixFirewallExtension.dll"', - '-ext "<(wix_path)\\WixUIExtension.dll"', - '-ext "<(wix_path)\\WixUtilExtension.dll"', + '<(wix_path)\\light', + '-ext', '<(wix_path)\\WixFirewallExtension.dll', + '-ext', '<(wix_path)\\WixUIExtension.dll', + '-ext', '<(wix_path)\\WixUtilExtension.dll', '-cultures:en-us', '-sw1076', '-dVersion=<(version_full)', - '"-dFileSource=<(PRODUCT_DIR)."', - '"-dIconPath=resources/chromoting.ico"', - '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"', + '-dFileSource=<(PRODUCT_DIR).', + '-dIconPath=resources/chromoting.ico', + '-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll', '<@(_wix_defines)', - '-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"', - '"<(RULE_INPUT_PATH)"', + '-out', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', + '<(RULE_INPUT_PATH)', ], 'message': 'Generating <(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', }, @@ -757,13 +755,11 @@ ], 'process_outputs_as_sources': 1, 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, 'action': [ - '"<(wix_path)\\dark"', - '"<(RULE_INPUT_PATH)"', - '-o <@(_outputs)', - '-o <@(_outputs)', - '-x <(INTERMEDIATE_DIR)', + '<(wix_path)\\dark', + '<(RULE_INPUT_PATH)', + '-o', '<@(_outputs)', + '-x', '<(INTERMEDIATE_DIR).', ], 'message': 'Dark: unpacking <(RULE_INPUT_PATH)', }, @@ -775,12 +771,11 @@ ], 'process_outputs_as_sources': 1, 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, 'action': [ - '"<(wix_path)\\candle"', - '"<(RULE_INPUT_PATH)"', - '-o <@(_outputs)', - '-ext "<(wix_path)\\WixFirewallExtension.dll"', + '<(wix_path)\\candle', + '<(RULE_INPUT_PATH)', + '-o', '<@(_outputs)', + '-ext', '<(wix_path)\\WixFirewallExtension.dll', ], 'message': 'Candle: compiling <(RULE_INPUT_PATH)', }, @@ -791,12 +786,11 @@ '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)-test.msi', ], 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, 'action': [ - '"<(wix_path)\\light"', - '"<(RULE_INPUT_PATH)"', - '-o <@(_outputs)', - '-ext "<(wix_path)\\WixFirewallExtension.dll"', + '<(wix_path)\\light', + '<(RULE_INPUT_PATH)', + '-o', '<@(_outputs)', + '-ext', '<(wix_path)\\WixFirewallExtension.dll', '-sw1076', ], 'message': 'Light: linking <(RULE_INPUT_PATH)', |