diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 03:02:41 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 03:02:41 +0000 |
| commit | f451b82314423ee1711188913345ceb0fe00f58b (patch) | |
| tree | 040f0c0d2268ca5a24bc67c3526668675f376aa8 | |
| parent | dd8a8690b96bdfce0e90e538ed78290c8642d15f (diff) | |
| download | chromium_src-f451b82314423ee1711188913345ceb0fe00f58b.zip chromium_src-f451b82314423ee1711188913345ceb0fe00f58b.tar.gz chromium_src-f451b82314423ee1711188913345ceb0fe00f58b.tar.bz2 | |
Chromoting Host installation should take into account both buildtype% and branding%.
Review URL: http://codereview.chromium.org/10081026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132317 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/host/installer/chromoting.wxs | 2 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/remoting/host/installer/chromoting.wxs b/remoting/host/installer/chromoting.wxs index 4fc1c89..8766586 100644 --- a/remoting/host/installer/chromoting.wxs +++ b/remoting/host/installer/chromoting.wxs @@ -4,7 +4,7 @@ <?define EventSourceName = "chromoting" ?> <?define ServiceName = "chromoting" ?> - <?ifdef OfficialBuild ?> + <?if $(var.Branding) ~= Chrome ?> <?define ChromotingHost = "Chrome Remote Desktop Host" ?> <?define FirewallName = "Chrome Remote Desktop Host" ?> <?define Manufacturer = "Google Inc." ?> diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index ff2b262..3675562 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -417,13 +417,13 @@ '<(PRODUCT_DIR)/chromoting.msi', ], 'conditions': [ - ['branding == "Chrome"', { + ['buildtype == "Official"', { 'variables': { - 'branding': '-dOfficialBuild=1', + 'official_build': '-dOfficialBuild=1', }, }, { # else branding!="Chrome" 'variables': { - 'branding': '', + 'official_build': '', }, }], ], @@ -451,7 +451,8 @@ '-dVersion=<(version_full) ' '"-dFileSource=<(PRODUCT_DIR)." ' '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" ' - '<(branding) ' + '<(official_build) ' + '"-dBranding=<(branding)" ' '-out <@(_outputs)', '"<(RULE_INPUT_PATH)"', ], @@ -481,7 +482,8 @@ '-dVersion=<(version_full) ' '"-dFileSource=<(PRODUCT_DIR)." ' '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" ' - '<(branding) ' + '<(official_build) ' + '"-dBranding=<(branding)" ' '-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"', '"<(RULE_INPUT_PATH)"', ], |