diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 21:39:43 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 21:39:43 +0000 |
| commit | 8bcdcbe8e59f804e03f75e86744211210c64484a (patch) | |
| tree | 06a04450b42770a59ecab09998608c005fed391d /chrome/installer/setup/setup.vcproj | |
| parent | af784739ebdc4ca47d9d52e366587e4c7ba2313b (diff) | |
| download | chromium_src-8bcdcbe8e59f804e03f75e86744211210c64484a.zip chromium_src-8bcdcbe8e59f804e03f75e86744211210c64484a.tar.gz chromium_src-8bcdcbe8e59f804e03f75e86744211210c64484a.tar.bz2 | |
First set of changes to start separating Google specific branding from Chromium. This change mostly tries to modify installer to install Chromium or Google Chrome depending on a compile flag. The goal is to try to isolate all the differences in a single class that can be overridden for customization. There is also a lot of refactoring to make this happen.
Some changes are yet to be done but I didn't want to make this change even bigger than it already is. With all these changes the default build should still work as it is (Google Chrome should get installed/uninstalled). The changes yet to be done:
- Separating string resources (this is marked by TODO in one of the files)
- Generate different chrome.7z (Chromium will not include rlz.dll) for mini_installer
BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup.vcproj')
| -rw-r--r-- | chrome/installer/setup/setup.vcproj | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/installer/setup/setup.vcproj b/chrome/installer/setup/setup.vcproj index e6c6abf..5c468c8 100644 --- a/chrome/installer/setup/setup.vcproj +++ b/chrome/installer/setup/setup.vcproj @@ -21,7 +21,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\setup_debug.vsprops;..\util\using_util.vsprops;..\util\prebuild\util_prebuild.vsprops" + InheritedPropertySheets=".\setup_debug.vsprops;..\util\prebuild\util_prebuild.vsprops" > <Tool Name="Version" @@ -42,7 +42,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\setup_release.vsprops;..\util\using_util.vsprops;..\util\prebuild\util_prebuild.vsprops" + InheritedPropertySheets=".\setup_release.vsprops;..\util\prebuild\util_prebuild.vsprops" > <Tool Name="Version" @@ -68,10 +68,6 @@ Name="resources" > <File - RelativePath=".\setup_resource.h" - > - </File> - <File RelativePath=".\setup.ico" > </File> @@ -84,6 +80,10 @@ > </File> <File + RelativePath=".\setup_resource.h" + > + </File> + <File RelativePath="$(IntDir)\..\util_prebuild\setup_strings.h" > </File> |