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/mini_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/mini_installer')
| -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 |
2 files changed, 1 insertions, 21 deletions
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@ |