Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
152043005:
Add custom Windows git 1.8.5.2, disabled by default. (Closed)
|
Created:
6 years, 10 months ago by Michael Moss Modified:
6 years, 10 months ago CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org Visibility:
Public. |
DescriptionAdd custom Windows git 1.8.5.2, disabled by default.
The new git will only be installed when DEPOT_TOOLS_GIT_1852=1, otherwise the
previous version will be installed.
BUG=322954
R=iannucci@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249609
Patch Set 1 #Patch Set 2 : #
Total comments: 2
Patch Set 3 : #Messages
Total messages: 11 (0 generated)
lgtm https://codereview.chromium.org/152043005/diff/30001/bootstrap/win/win_tools.bat File bootstrap/win/win_tools.bat (right): https://codereview.chromium.org/152043005/diff/30001/bootstrap/win/win_tools.... bootstrap/win/win_tools.bat:37: :: TODO(mmoss): submit the zip to the old location? nope, GCS is the way of the future. https://codereview.chromium.org/152043005/diff/30001/bootstrap/win/win_tools.... bootstrap/win/win_tools.bat:96: echo You can also get the "prebaked" version used at %GIT_ZIP_URL% lol, cool typo :D
The CQ bit was checked by mmoss@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mmoss@chromium.org/152043005/50001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for depot_tools/bootstrap/win/win_tools.bat: While running patch -p0 --forward --force --no-backup-if-mismatch; patching file depot_tools/bootstrap/win/win_tools.bat Hunk #1 FAILED at 10. Hunk #2 FAILED at 27. Hunk #3 FAILED at 43. Hunk #4 FAILED at 71. 4 out of 4 hunks FAILED -- saving rejects to file depot_tools/bootstrap/win/win_tools.bat.rej Patch: depot_tools/bootstrap/win/win_tools.bat Index: bootstrap/win/win_tools.bat =================================================================== --- depot_tools/bootstrap/win/win_tools.bat (revision 249598) +++ depot_tools/bootstrap/win/win_tools.bat (working copy) @@ -10,7 +10,6 @@ :: returned. set WIN_TOOLS_ROOT_URL=https://src.chromium.org/svn/trunk/tools -set GIT_BIN_DIR=git-1.8.0_bin :: It used to be %~dp0 but ADODB.Stream may fail to write to this directory if :: the directory DACL is set to elevated integrity level. set ZIP_DIR=%TEMP% @@ -27,6 +26,27 @@ :GIT_CHECK +if "%DEPOT_TOOLS_GIT_1852%" == "1" goto :GIT_1852_CHECK +goto :GIT_180_CHECK + + +:GIT_1852_CHECK +set GIT_VERSION=1.8.5.2.chromium.1 +set GIT_BIN_DIR=git-%GIT_VERSION%_bin +set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip +set GIT_ZIP_URL=http://commondatastorage.googleapis.com/chrome-infra/%GIT_ZIP_FILE% +goto :GIT_COMMON + + +:GIT_180_CHECK +set GIT_VERSION=1.8.0 +set GIT_BIN_DIR=git-%GIT_VERSION%_bin +set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip +set GIT_ZIP_URL=%WIN_TOOLS_ROOT_URL%/third_party/%GIT_ZIP_FILE% +goto :GIT_COMMON + + +:GIT_COMMON :: If the batch file exists, skip the git check. if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" goto :MSYS_PATH_CHECK if "%CHROME_HEADLESS%" == "1" goto :SVN_CHECK @@ -43,11 +63,11 @@ :GIT_INSTALL -echo Installing git (avg 1-2 min download) ... +echo Installing git %GIT_VERSION% (avg 1-2 min download) ... :: git is not accessible; check it out and create 'proxy' files. if exist "%ZIP_DIR%\git.zip" del "%ZIP_DIR%\git.zip" -echo Fetching from %WIN_TOOLS_ROOT_URL%/third_party/git-1.8.0_bin.zip -cscript //nologo //e:jscript "%~dp0get_file.js" %WIN_TOOLS_ROOT_URL%/third_party/git-1.8.0_bin.zip "%ZIP_DIR%\git.zip" +echo Fetching from %GIT_ZIP_URL% +cscript //nologo //e:jscript "%~dp0get_file.js" %GIT_ZIP_URL% "%ZIP_DIR%\git.zip" if errorlevel 1 goto :GIT_FAIL :: Cleanup svn directory if it was existing. if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" @@ -71,7 +91,7 @@ echo ... Failed to checkout git automatically. echo Please visit http://code.google.com/p/msysgit to download the latest git echo client before continuing. -echo You can also get the "prebacked" version used at %WIN_TOOLS_ROOT_URL%/ +echo You can also get the "prebaked" version used at %GIT_ZIP_URL% set ERRORLEVEL=1 goto :END
The CQ bit was checked by mmoss@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mmoss@chromium.org/152043005/50001
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for depot_tools/bootstrap/win/win_tools.bat: While running patch -p0 --forward --force --no-backup-if-mismatch; patching file depot_tools/bootstrap/win/win_tools.bat Hunk #1 FAILED at 10. Hunk #2 FAILED at 27. Hunk #3 FAILED at 43. Hunk #4 FAILED at 71. 4 out of 4 hunks FAILED -- saving rejects to file depot_tools/bootstrap/win/win_tools.bat.rej Patch: depot_tools/bootstrap/win/win_tools.bat Index: bootstrap/win/win_tools.bat =================================================================== --- depot_tools/bootstrap/win/win_tools.bat (revision 249598) +++ depot_tools/bootstrap/win/win_tools.bat (working copy) @@ -10,7 +10,6 @@ :: returned. set WIN_TOOLS_ROOT_URL=https://src.chromium.org/svn/trunk/tools -set GIT_BIN_DIR=git-1.8.0_bin :: It used to be %~dp0 but ADODB.Stream may fail to write to this directory if :: the directory DACL is set to elevated integrity level. set ZIP_DIR=%TEMP% @@ -27,6 +26,27 @@ :GIT_CHECK +if "%DEPOT_TOOLS_GIT_1852%" == "1" goto :GIT_1852_CHECK +goto :GIT_180_CHECK + + +:GIT_1852_CHECK +set GIT_VERSION=1.8.5.2.chromium.1 +set GIT_BIN_DIR=git-%GIT_VERSION%_bin +set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip +set GIT_ZIP_URL=http://commondatastorage.googleapis.com/chrome-infra/%GIT_ZIP_FILE% +goto :GIT_COMMON + + +:GIT_180_CHECK +set GIT_VERSION=1.8.0 +set GIT_BIN_DIR=git-%GIT_VERSION%_bin +set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip +set GIT_ZIP_URL=%WIN_TOOLS_ROOT_URL%/third_party/%GIT_ZIP_FILE% +goto :GIT_COMMON + + +:GIT_COMMON :: If the batch file exists, skip the git check. if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" goto :MSYS_PATH_CHECK if "%CHROME_HEADLESS%" == "1" goto :SVN_CHECK @@ -43,11 +63,11 @@ :GIT_INSTALL -echo Installing git (avg 1-2 min download) ... +echo Installing git %GIT_VERSION% (avg 1-2 min download) ... :: git is not accessible; check it out and create 'proxy' files. if exist "%ZIP_DIR%\git.zip" del "%ZIP_DIR%\git.zip" -echo Fetching from %WIN_TOOLS_ROOT_URL%/third_party/git-1.8.0_bin.zip -cscript //nologo //e:jscript "%~dp0get_file.js" %WIN_TOOLS_ROOT_URL%/third_party/git-1.8.0_bin.zip "%ZIP_DIR%\git.zip" +echo Fetching from %GIT_ZIP_URL% +cscript //nologo //e:jscript "%~dp0get_file.js" %GIT_ZIP_URL% "%ZIP_DIR%\git.zip" if errorlevel 1 goto :GIT_FAIL :: Cleanup svn directory if it was existing. if exist "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%" @@ -71,7 +91,7 @@ echo ... Failed to checkout git automatically. echo Please visit http://code.google.com/p/msysgit to download the latest git echo client before continuing. -echo You can also get the "prebacked" version used at %WIN_TOOLS_ROOT_URL%/ +echo You can also get the "prebaked" version used at %GIT_ZIP_URL% set ERRORLEVEL=1 goto :END
Message was sent while issue was closed.
Committed patchset #3 manually as r249609. |
