diff options
| author | scottmg <scottmg@chromium.org> | 2015-01-30 14:56:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-30 22:57:27 +0000 |
| commit | f79c2e881fb94775cdac5679795ae3e6957fc487 (patch) | |
| tree | 99f9332be04ab6725fa6818bddf5372dd3a34fe2 /chrome/installer/mini_installer.gyp | |
| parent | c45e09b004eb4fe3f317052c072f6173c1e6986c (diff) | |
| download | chromium_src-f79c2e881fb94775cdac5679795ae3e6957fc487.zip chromium_src-f79c2e881fb94775cdac5679795ae3e6957fc487.tar.gz chromium_src-f79c2e881fb94775cdac5679795ae3e6957fc487.tar.bz2 | |
Add support for create_installer_archive.py to generate a depfile
Adds functionality to create_installer_archive.py to generate a .d file
that includes all of the files that it packages into chrome[.packed].7z.
This is done by tracking the source of all the files that are copied
into the staging dir that is given to 7za to package the .7z file.
The depfile is then used in a gyp 'depfile' to correctly specify the
implicit dependencies for the mini_installer target. Previously it used
a fake output of 'xxx2.out' to cause it to rebuild every time (which is
what we're trying to avoid in this change).
Additionally, switch from a rule to an action in gyp -- gyp currently
only supports 'depfile' on actions, and as there's only one file being
built here, they're equivalent.
BUG=342974,451499
Review URL: https://codereview.chromium.org/887673003
Cr-Commit-Position: refs/heads/master@{#314015}
Diffstat (limited to 'chrome/installer/mini_installer.gyp')
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index e6b0ca7..b1d7dd8 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -166,9 +166,10 @@ 'process_outputs_as_sources': 1, 'message': 'Generating version information' }, + ], + 'actions': [ { - 'rule_name': 'installer_archive', - 'extension': 'release', + 'action_name': 'installer_archive', 'variables': { 'create_installer_archive_py_path': '../tools/build/win/create_installer_archive.py', @@ -192,7 +193,7 @@ 'component_build_flag': '', }, 'outputs': [ - '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', + '<(PRODUCT_DIR)/chrome.packed.7z', ], }], ['disable_nacl==1', { @@ -239,22 +240,24 @@ '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', '<(PRODUCT_DIR)/locales/en-US.pak', + 'mini_installer/chrome.release', ], 'outputs': [ # Also note that chrome.packed.7z is defined as an output in a # conditional above. - 'xxx2.out', - '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', + '<(PRODUCT_DIR)/chrome.7z', '<(PRODUCT_DIR)/setup.ex_', '<(INTERMEDIATE_DIR)/packed_files.rc', ], + 'depfile': '<(INTERMEDIATE_DIR)/installer_archive.d', 'action': [ 'python', '<(create_installer_archive_py_path)', '--build_dir', '<(PRODUCT_DIR)', '--staging_dir', '<(INTERMEDIATE_DIR)', - '--input_file', '<(RULE_INPUT_PATH)', + '--input_file', 'mini_installer/chrome.release', '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', + '--depfile', '<(INTERMEDIATE_DIR)/installer_archive.d', '<(enable_hidpi_flag)', '<(component_build_flag)', '<(target_arch_flag)', |