diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 06:43:40 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 06:43:40 +0000 |
| commit | cfe6d397bd14c6448052337fbb0ae267f2362081 (patch) | |
| tree | ef1b047928c2b505aa50e6b65c55236e1c9dd02c /remoting/remoting.gyp | |
| parent | 63942f254fe21a93e8a0183e2107ea428f7cd7a1 (diff) | |
| download | chromium_src-cfe6d397bd14c6448052337fbb0ae267f2362081.zip chromium_src-cfe6d397bd14c6448052337fbb0ae267f2362081.tar.gz chromium_src-cfe6d397bd14c6448052337fbb0ae267f2362081.tar.bz2 | |
[Chromoting] Fix remoting_host_installation wix actions.
Add commas between array elements and remove extra spaces at end.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/10264022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 060c46a..ada7e81 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -577,15 +577,14 @@ 'outputs': [ '<(PRODUCT_DIR)/chromoting.msi', ], + 'wix_defines' : [ + '"-dBranding=<(branding)"', + ], 'conditions': [ ['buildtype == "Official"', { - 'variables': { - 'official_build': '-dOfficialBuild=1', - }, - }, { # else branding!="Chrome" - 'variables': { - 'official_build': '', - }, + 'wix_defines': [ + '-dOfficialBuild=1', + ], }], ], 'rules': [ @@ -596,7 +595,7 @@ '<(PRODUCT_DIR)/remoting_host_controller.exe', '<(PRODUCT_DIR)/remoting_me2me_host.exe', '<(PRODUCT_DIR)/remoting_service.exe', - '<(platformsdk_path)/redist/x86/sas.dll' + '<(platformsdk_path)/redist/x86/sas.dll', ], 'outputs': [ '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj', @@ -609,11 +608,10 @@ '-ext "<(wix_path)\\WixFirewallExtension.dll"', '-ext "<(wix_path)\\WixUIExtension.dll"', '-ext "<(wix_path)\\WixUtilExtension.dll"', - '-dVersion=<(version_full) ' - '"-dFileSource=<(PRODUCT_DIR)." ' - '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" ' - '<(official_build) ' - '"-dBranding=<(branding)" ' + '-dVersion=<(version_full)', + '"-dFileSource=<(PRODUCT_DIR)."', + '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"', + '<@(_wix_defines)', '-out <@(_outputs)', '"<(RULE_INPUT_PATH)"', ], @@ -626,7 +624,7 @@ '<(PRODUCT_DIR)/remoting_host_controller.exe', '<(PRODUCT_DIR)/remoting_me2me_host.exe', '<(PRODUCT_DIR)/remoting_service.exe', - '<(platformsdk_path)/redist/x86/sas.dll' + '<(platformsdk_path)/redist/x86/sas.dll', ], 'outputs': [ '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi', @@ -640,11 +638,10 @@ '-ext "<(wix_path)\\WixUIExtension.dll"', '-ext "<(wix_path)\\WixUtilExtension.dll"', '-cultures:en-us', - '-dVersion=<(version_full) ' - '"-dFileSource=<(PRODUCT_DIR)." ' - '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" ' - '<(official_build) ' - '"-dBranding=<(branding)" ' + '-dVersion=<(version_full)', + '"-dFileSource=<(PRODUCT_DIR)."', + '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"', + '<@(_wix_defines)', '-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"', '"<(RULE_INPUT_PATH)"', ], |