diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 15:56:41 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 15:56:41 +0000 |
| commit | b0d8c81d03a2fa7b6d644776111ee8852ad07bf6 (patch) | |
| tree | a052fdc8cf6b4831b0fe1b579421600bb2d311a1 /chrome/installer | |
| parent | ac6036294505a27868adbab87df95183039c1b1a (diff) | |
| download | chromium_src-b0d8c81d03a2fa7b6d644776111ee8852ad07bf6.zip chromium_src-b0d8c81d03a2fa7b6d644776111ee8852ad07bf6.tar.gz chromium_src-b0d8c81d03a2fa7b6d644776111ee8852ad07bf6.tar.bz2 | |
Start of mini_installer build config refactoring.
Baby step one:
- All intermediate files go into the intermediate directory.
- The packed_files.txt file is gone, and instead the mini_installer
is baked from a resource file output into the intermediate dir.
- Cleanup use of implict global "options" in the python script.
- Use subprocess.call with a list instead of os.system.
R=robertshield@chromium.org,grt@chromium.org
BUG=102115
Review URL: http://codereview.chromium.org/8589029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 9 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.rc | 21 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer_exe_version.rc.version | 1 |
3 files changed, 6 insertions, 25 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 4f73b98..9c99503 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -22,7 +22,6 @@ ], 'include_dirs': [ '../..', - '<(PRODUCT_DIR)', '<(INTERMEDIATE_DIR)', '<(SHARED_INTERMEDIATE_DIR)/chrome', ], @@ -209,13 +208,15 @@ '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', '<(PRODUCT_DIR)/setup.ex_', - '<(PRODUCT_DIR)/packed_files.txt', + '<(INTERMEDIATE_DIR)/packed_files.rc', ], 'action': [ 'python', '<(create_installer_archive_py_path)', - '--output_dir=<(PRODUCT_DIR)', - '--input_file=<(RULE_INPUT_PATH)', + '--build_dir', '<(PRODUCT_DIR)', + '--staging_dir', '<(INTERMEDIATE_DIR)', + '--input_file', '<(RULE_INPUT_PATH)', + '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', # TODO(sgk): may just use environment variables #'--distribution=$(CHROMIUM_BUILD)', '--distribution=_google_chrome', diff --git a/chrome/installer/mini_installer/mini_installer.rc b/chrome/installer/mini_installer/mini_installer.rc index 420dea9..fff6a53 100644 --- a/chrome/installer/mini_installer/mini_installer.rc +++ b/chrome/installer/mini_installer/mini_installer.rc @@ -49,28 +49,7 @@ BEGIN "#undef APSTUDIO_HIDDEN_SYMBOL\0" END -3 TEXTINCLUDE -BEGIN - "#include ""mini_installer_exe_version.rc""\r\0" -END - #endif // APSTUDIO_INVOKED -// This file lists the resources that are going to be packed with the exe. -#include "packed_files.txt" - #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#include "mini_installer_exe_version.rc" - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/chrome/installer/mini_installer/mini_installer_exe_version.rc.version b/chrome/installer/mini_installer/mini_installer_exe_version.rc.version index 3b024d1..c15cfc3 100644 --- a/chrome/installer/mini_installer/mini_installer_exe_version.rc.version +++ b/chrome/installer/mini_installer/mini_installer_exe_version.rc.version @@ -2,6 +2,7 @@ // // Version // +#include "verrsrc.h" VS_VERSION_INFO VERSIONINFO FILEVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@ |