summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/all.gyp6
-rw-r--r--build/common.gypi8
-rw-r--r--chrome/tools/build/win/FILES.cfg28
-rw-r--r--chrome/tools/build/win/SYMBOLS3
-rw-r--r--remoting/remoting.gyp42
5 files changed, 63 insertions, 24 deletions
diff --git a/build/all.gyp b/build/all.gyp
index ef6c0e5..e97e0ab 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -533,6 +533,12 @@
'../pdf/pdf.gyp:pdf',
],
}], # internal_pdf
+ ['component != "shared_library" and wix_exists == "True" and \
+ platformsdk_exists == "True"', {
+ 'dependencies': [
+ '../remoting/remoting.gyp:remoting_host_installation',
+ ],
+ }], # component != "shared_library"
]
},
], # targets
diff --git a/build/common.gypi b/build/common.gypi
index 9dec996..1c17edd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -302,6 +302,9 @@
# Force rlz to use chrome's networking stack.
'force_rlz_use_chrome_net%': 1,
+ 'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files',
+ 'wix_path%': '<(DEPTH)/third_party/wix',
+
'conditions': [
# TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
# the 'conditions' clause. Initial attempts resulted in chromium and
@@ -523,6 +526,8 @@
'enable_automation%': '<(enable_automation)',
'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
'enable_task_manager%': '<(enable_task_manager)',
+ 'platformsdk_path%': '<(platformsdk_path)',
+ 'wix_path%': '<(wix_path)',
# Use system yasm instead of bundled one.
'use_system_yasm%': 0,
@@ -751,6 +756,9 @@
# Native Client is enabled by default.
'disable_nacl%': 0,
+ 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_path))',
+ 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
+
'conditions': [
['os_posix==1 and OS!="mac" and OS!="android"', {
# This will set gcc_version to XY if you are running gcc X.Y.*.
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 0e729c5..7663205 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -417,6 +417,13 @@ FILES = [
},
# Remoting files:
{
+ 'filename': 'chromoting.msi',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ 'archive': 'remoting-host.msi',
+ 'direct_archive': 1,
+ },
+ {
'filename': 'remoting-webapp.zip',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
@@ -579,6 +586,13 @@ FILES = [
'filegroup': ['symbols'],
},
{
+ 'filename': 'remoting_host_controller.pdb',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ 'archive': 'chrome-win32-syms.zip',
+ 'filegroup': ['symbols'],
+ },
+ {
'filename': 'remoting_host_plugin.pdb',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
@@ -586,6 +600,20 @@ FILES = [
'filegroup': ['symbols'],
},
{
+ 'filename': 'remoting_me2me_host.pdb',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ 'archive': 'chrome-win32-syms.zip',
+ 'filegroup': ['symbols'],
+ },
+ {
+ 'filename': 'remoting_service.pdb',
+ 'arch': ['32bit', '64bit'],
+ 'buildtype': ['dev', 'official'],
+ 'archive': 'chrome-win32-syms.zip',
+ 'filegroup': ['symbols'],
+ },
+ {
'filename': 'setup.pdb',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
diff --git a/chrome/tools/build/win/SYMBOLS b/chrome/tools/build/win/SYMBOLS
index b8214ed..37d30fb 100644
--- a/chrome/tools/build/win/SYMBOLS
+++ b/chrome/tools/build/win/SYMBOLS
@@ -5,7 +5,10 @@ libGLESv2.pdb
mini_installer.pdb
nacl64_exe.pdb
ppGoogleNaClPluginChrome.pdb
+remoting_host_controller.pdb
remoting_host_plugin.pdb
+remoting_me2me_host.pdb
+remoting_service.pdb
setup.pdb
gcp_portmon.pdb
gcp_portmon64.pdb
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 47a7381..8da30e8 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -24,10 +24,6 @@
'version_full':
'<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
- # Windows Installer XML (WiX) path can be set in ~/.gyp/include.gypi to
- # indicate that WiX is available.
- 'wix_path%': '',
-
'conditions': [
['OS=="mac"', {
'conditions': [
@@ -396,11 +392,12 @@
], # end of 'targets'
}], # 'OS=="win"'
- # 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"', {
+ # 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"', {
'targets': [
{
'target_name': 'remoting_host_installation',
@@ -416,9 +413,6 @@
'outputs': [
'<(PRODUCT_DIR)/chromoting.msi',
],
- 'variables': {
- 'sas_dll_path': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86/sas.dll'
- },
'conditions': [
['branding == "Chrome"', {
'variables': {
@@ -438,7 +432,7 @@
'<(PRODUCT_DIR)/remoting_host_controller.exe',
'<(PRODUCT_DIR)/remoting_me2me_host.exe',
'<(PRODUCT_DIR)/remoting_service.exe',
- '<(sas_dll_path)'
+ '<(platformsdk_path)/redist/x86/sas.dll'
],
'outputs': [
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
@@ -447,13 +441,13 @@
'msvs_cygwin_shell': 0,
'msvs_quote_cmd': 0,
'action': [
- '"<(wix_path)\\bin\\candle"',
- '-ext "<(wix_path)\\bin\\WixFirewallExtension.dll"',
- '-ext "<(wix_path)\\bin\\WixUIExtension.dll"',
- '-ext "<(wix_path)\\bin\\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)." '
- '"-dSasDllPath=<(sas_dll_path)" '
+ '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
'<(branding) '
'-out <@(_outputs)',
'"<(RULE_INPUT_PATH)"',
@@ -467,7 +461,7 @@
'<(PRODUCT_DIR)/remoting_host_controller.exe',
'<(PRODUCT_DIR)/remoting_me2me_host.exe',
'<(PRODUCT_DIR)/remoting_service.exe',
- '<(sas_dll_path)'
+ '<(platformsdk_path)/redist/x86/sas.dll'
],
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
@@ -476,14 +470,14 @@
'msvs_cygwin_shell': 0,
'msvs_quote_cmd': 0,
'action': [
- '"<(wix_path)\\bin\\light"',
- '-ext "<(wix_path)\\bin\\WixFirewallExtension.dll"',
- '-ext "<(wix_path)\\bin\\WixUIExtension.dll"',
- '-ext "<(wix_path)\\bin\\WixUtilExtension.dll"',
+ '"<(wix_path)\\light"',
+ '-ext "<(wix_path)\\WixFirewallExtension.dll"',
+ '-ext "<(wix_path)\\WixUIExtension.dll"',
+ '-ext "<(wix_path)\\WixUtilExtension.dll"',
'-cultures:en-us',
'-dVersion=<(version_full) '
'"-dFileSource=<(PRODUCT_DIR)." '
- '"-dSasDllPath=<(sas_dll_path)" '
+ '"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll" '
'<(branding) '
'-out "<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi"',
'"<(RULE_INPUT_PATH)"',
generated by cgit v1.1 at 2025-03-01 20:23:10 +0000