diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 21:24:39 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 21:24:39 +0000 |
| commit | 2df9d7db6e69c55d5e86f0516b9ddae18723e1ea (patch) | |
| tree | a8d6f35cd5d08f78d37e26c64cbc782092f19e9f /remoting | |
| parent | c7eef2a3059efa09790aace3979b86cfa1f316a8 (diff) | |
| download | chromium_src-2df9d7db6e69c55d5e86f0516b9ddae18723e1ea.zip chromium_src-2df9d7db6e69c55d5e86f0516b9ddae18723e1ea.tar.gz chromium_src-2df9d7db6e69c55d5e86f0516b9ddae18723e1ea.tar.bz2 | |
Revert 131239 - The Chrome Remote Desktop installation for Windows can be build by bots now.
TBR=alexeypa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10028001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index b3e3dc0..ef927de 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -24,8 +24,9 @@ 'version_full': '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")', - 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/platformsdk_win7)', - 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/wix)', + # Windows Installer XML (WiX) path can be set in ~/.gyp/include.gypi to + # indicate that WiX is available. + 'wix_path%': '', 'conditions': [ ['OS=="mac"', { @@ -395,11 +396,11 @@ ], # end of 'targets' }], # 'OS=="win"' - # The host installation is generated only if WiX is available and when - # building a non-component build. WiX does not provide a easy way to - # include all DLLs imported by the installed binaries, so supporting - # the component build becomes a burden. - ['OS == "win" and component != "shared_library" and wix_exists == "True" and platformsdk_exists == "True"', { + # The host installation is generated only if WiX location is known and only + # as part of a non-component build. WiX does not provide a easy way to + # include all DLLs imported by the installed binaries depend on, so + # supporting the component build becomes a burden. + ['"<(wix_path)" != "" and component != "shared_library"', { 'targets': [ { 'target_name': 'remoting_host_installation', @@ -416,8 +417,7 @@ '<(PRODUCT_DIR)/chromoting.msi', ], 'variables': { - 'sas_dll_path': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86/sas.dll', - 'wix_path': '<(DEPTH)\\third_party\\wix', + 'sas_dll_path': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86/sas.dll' }, 'conditions': [ ['branding == "Chrome"', { @@ -447,10 +447,10 @@ '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)\\bin\\candle"', + '-ext "<(wix_path)\\bin\\WixFirewallExtension.dll"', + '-ext "<(wix_path)\\bin\\WixUIExtension.dll"', + '-ext "<(wix_path)\\bin\\WixUtilExtension.dll"', '-dVersion=<(version_full) ' '"-dFileSource=<(PRODUCT_DIR)." ' '"-dSasDllPath=<(sas_dll_path)" ' @@ -476,10 +476,10 @@ '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)\\bin\\light"', + '-ext "<(wix_path)\\bin\\WixFirewallExtension.dll"', + '-ext "<(wix_path)\\bin\\WixUIExtension.dll"', + '-ext "<(wix_path)\\bin\\WixUtilExtension.dll"', '-cultures:en-us', '-dVersion=<(version_full) ' '"-dFileSource=<(PRODUCT_DIR)." ' |