diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 04:08:56 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 04:08:56 +0000 |
| commit | 58d9fe56a31875c85168c8b7264099900ea397b5 (patch) | |
| tree | 7e18a793e6692199e5338b54cf5c6f89bec18d17 /chrome/chrome_installer.gypi | |
| parent | fe4e649c161fc4e637fe963d15c904ee5e2e1bc7 (diff) | |
| download | chromium_src-58d9fe56a31875c85168c8b7264099900ea397b5.zip chromium_src-58d9fe56a31875c85168c8b7264099900ea397b5.tar.gz chromium_src-58d9fe56a31875c85168c8b7264099900ea397b5.tar.bz2 | |
1) Generate VisualElementsManifest.xml at install time from a pre-defined template.
This allows us to put images in the version directory (i.e. a path that changes each istall; rather than needing the images beside chrome.exe).
This also allows us to localize the Display Name of Google Chrome. This however does not fix bug #123376 (we have the same issue here).
2) Fixes create_installer_archive.py to not create empty directories for output directories specified in chrome.release for which the input is not present when packaging chrome.7z
3) Removes "Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries" from chrome.release which has not been packaged since Chrome 17 (and maybe even before that).
4) (2+3) have the side-effect that there is no longer an empty Dictionaries/ directory created at install.
BUG=123319,123376
TEST=Install Chrome on Win8 and watch VisualElementsManifest.xml land with the correct values.
Overinstall Chrome on a Win8 install with VisualElementsManifest.xml from an installer that doesn't have VisualElements --> ensure VisualElementsManifest.xml is deleted and icons go back to default-style.
Review URL: http://codereview.chromium.org/10160011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index ad3d1ea..45bfa50 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -364,6 +364,7 @@ # below into a separate lib and then link both setup.exe and # setup_unittests.exe against that. 'sources': [ + 'installer/mini_installer/chrome.release', # Move to lib 'installer/mini_installer/appid.h', 'installer/mini_installer/chrome_appid.cc', 'installer/mini_installer/configuration.cc', @@ -375,17 +376,47 @@ 'installer/mini_installer/mini_string.cc', 'installer/mini_installer/mini_string.h', 'installer/mini_installer/mini_string_test.cc', - 'installer/setup/install_worker.cc', # Move to lib - 'installer/setup/install_worker.h', # Move to lib + 'installer/setup/install.cc', # Move to lib + 'installer/setup/install.h', # Move to lib + 'installer/setup/install_unittest.cc', + 'installer/setup/install_worker.cc', # Move to lib + 'installer/setup/install_worker.h', # Move to lib 'installer/setup/install_worker_unittest.cc', 'installer/setup/run_all_unittests.cc', - 'installer/setup/setup_constants.cc', # Move to lib - 'installer/setup/setup_constants.h', # Move to lib + 'installer/setup/setup_constants.cc', # Move to lib + 'installer/setup/setup_constants.h', # Move to lib 'installer/setup/setup_unittests.rc', 'installer/setup/setup_unittests_resource.h', 'installer/setup/setup_util.cc', 'installer/setup/setup_util_unittest.cc', ], + 'rules': [ + { + 'rule_name': 'server_dlls', # Move to lib + 'extension': 'release', + 'variables': { + 'scan_server_dlls_py' : 'tools/build/win/scan_server_dlls.py', + 'template_file': 'mini_installer/chrome.release', + }, + 'inputs': [ + '<(scan_server_dlls_py)', + '<(template_file)' + ], + 'outputs': [ + '<(INTERMEDIATE_DIR)/registered_dlls.h', + ], + 'action': [ + 'python', + '<(scan_server_dlls_py)', + '--output_dir=<(PRODUCT_DIR)', + '--input_file=<(RULE_INPUT_PATH)', + '--header_output_dir=<(INTERMEDIATE_DIR)', + # TODO(sgk): may just use environment variables + #'--distribution=$(CHROMIUM_BUILD)', + '--distribution=_google_chrome', + ], + }, + ], }, ], }], |