diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 18:44:00 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 18:44:00 +0000 |
| commit | fef260d8b1aae5063c71b5938ff4a7de3b553a5e (patch) | |
| tree | 5206104c0fad6d6826cfd28e97422e6c2292b741 /tools/win/copy-installer.bat | |
| parent | 270c283c75e211d5f9db4efb193a4ba68b003302 (diff) | |
| download | chromium_src-fef260d8b1aae5063c71b5938ff4a7de3b553a5e.zip chromium_src-fef260d8b1aae5063c71b5938ff4a7de3b553a5e.tar.gz chromium_src-fef260d8b1aae5063c71b5938ff4a7de3b553a5e.tar.bz2 | |
Do not compress chrome.7z into chrome.packed.7z for developer (component) builds.
Note that setup is already configured to use chrome.7z directly if chrome.packed.7z is absent.
Change setup to have it copy chrome.7z to the <version>\Installer folder (instead of moving it) for component builds (to allow developers to test installs more than once with the same archive).
BUG=None
TEST=Install/uninstall chrome after copying setup.exe to another machine using tools\win\copy-installer.bat
Test non-component build and make sure archive is still moved (i.e.not copied).
Review URL: https://chromiumcodereview.appspot.com/10825342
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/win/copy-installer.bat')
| -rwxr-xr-x | tools/win/copy-installer.bat | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/win/copy-installer.bat b/tools/win/copy-installer.bat index 0e563de5..63cc69c 100755 --- a/tools/win/copy-installer.bat +++ b/tools/win/copy-installer.bat @@ -9,7 +9,7 @@ REM into the directory \[out|build]\[Debug|Release] on the current drive. REM
REM Usage:
REM \\build.share\<path_to_checkout>\src\tools\win\copy-installer.bat
-REM
+REM
REM By default, the script will copy the Debug build in the tree, falling back
REM to the Release build if one is not found. Similarly, the ninja output
REM directory is preferred over the devenv output directory. Specify
@@ -50,7 +50,8 @@ SET TO=\%OUTPUT%\%BUILDTYPE% REM Figure out what files to copy based on the component type (shared/static).
IF EXIST "%FROM%\base.dll" (
-SET TOCOPY=*.pdb setup.exe setup.exe.manifest chrome.packed.7z *.dll
+SET TOCOPY=*.pdb setup.exe setup.exe.manifest chrome.7z *.dll
+SET ARCHIVETODELETE=chrome.packed.7z
SET INSTALLER=setup.exe
) ELSE (
SET TOCOPY=*.pdb mini_installer.exe
@@ -66,6 +67,16 @@ SET TOCOPY=*.pdb CALL :_copyfiles
)
+REM Keeping the old chrome.packed.7z around could cause the new setup.exe to
+REM use it instead of the new chrome.7z, delete it to save developers from
+REM debugging nightmares!
+IF NOT "%ARCHIVETODELETE%"=="" (
+IF EXIST "%TO%\%ARCHIVETODELETE%" (
+ECHO Deleting old/deprecated %ARCHIVETODELETE%
+del /Q "%TO%\%ARCHIVETODELETE%"
+)
+)
+
ECHO Ready to run/debug %TO%\%INSTALLER%.
GOTO :EOF
|