Chromium Code Reviews| Index: bootstrap/win/win_tools.bat |
| diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat |
| index 43f38a47b093beeaee20e9b3427acba6ecf65ffd..0fc6ae08182985b765a3e1ea60dacd6479bc5268 100644 |
| --- a/bootstrap/win/win_tools.bat |
| +++ b/bootstrap/win/win_tools.bat |
| @@ -64,16 +64,24 @@ goto :GIT_190_CHECK |
| :GIT_190_CHECK |
| +if "%DEPOT_TOOLS_GIT_BLEEDING%" == "1" goto :GIT_190_BLEEDING |
| +set GIT_ERASE_TOP=2 |
| +set GIT_VERSION=1.9.0.chromium.3 |
| +goto :GIT_190_CHECK_REST |
|
mmoss
2014/04/12 03:01:10
Should this stuff just go into :GIT_CHECK? I'm not
iannucci
2014/04/12 03:48:56
It's setting the version and the erase_top variabl
mmoss
2014/04/12 04:00:05
I just meant we have:
:GIT_CHECK
goto :GIT_190_CHE
|
| +:GIT_190_BLEEDING |
|
mmoss
2014/04/12 03:01:10
Nit: blank space above this makes it a little easi
iannucci
2014/04/12 03:48:56
Done.
|
| +set GIT_ERASE_TOP=3 |
| +set GIT_VERSION=1.9.0.chromium.4 |
| + |
| +:GIT_190_CHECK_REST |
| if "%DEPOT_TOOLS_GIT_190%" == "0" goto :GIT_1852_CHECK |
| :: Clean up a couple of known broken releases |
| -for /l %%i in (1,1,2) do if exist "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" ( |
| +for /l %%i in (1,1,%GIT_ERASE_TOP%) do if exist "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" ( |
| rmdir /s /q "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" |
| ) |
| -set GIT_VERSION=1.9.0.chromium.3 |
| for /f "tokens=2 delims=[]" %%i in ('ver') do set VERSTR=%%i |
| for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set VERMINOR=%%j) |
| -if %VERMAJOR% lss 5 set GIT_VERSION=1.9.0.chromium.3-xp |
| -if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=1.9.0.chromium.3-xp |
| +if %VERMAJOR% lss 5 set GIT_VERSION=%GIT_VERSION%-xp |
| +if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=%GIT_VERSION%-xp |
| set GIT_BIN_DIR=git-%GIT_VERSION%_bin |
| set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip |
| set GIT_ZIP_URL=https://commondatastorage.googleapis.com/chrome-infra/%GIT_ZIP_FILE% |