Revert 252633 "Switch to opt-out for toolchain"
> Switch to opt-out for toolchain > > R=maruel@chromium.org > BUG=323300 > > Review URL: https://codereview.chromium.org/174663005 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/175743002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252634 0039d316-1c4b-4281-b951-d872f2087c98experimental/szager/collated-output
scottmg@chromium.org
11 years ago
parent
e604eafd83
commit
805133df83
@ -1,76 +1,77 @@
|
||||
@echo off
|
||||
:: Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
:: Use of this source code is governed by a BSD-style license that can be
|
||||
:: found in the LICENSE file.
|
||||
|
||||
:: This batch file will try to sync the root directory.
|
||||
|
||||
setlocal
|
||||
|
||||
:: Windows freaks out if a file is overwritten while it's being executed. Copy
|
||||
:: this script off to a temporary location and reinvoke from there before
|
||||
:: running any svn or git commands.
|
||||
IF %~nx0==update_depot_tools.bat (
|
||||
COPY /Y %~dp0update_depot_tools.bat %TEMP%\update_depot_tools_tmp.bat >nul
|
||||
if errorlevel 1 goto :EOF
|
||||
%TEMP%\update_depot_tools_tmp.bat %~dp0 %*
|
||||
)
|
||||
|
||||
set DEPOT_TOOLS_DIR=%1
|
||||
SHIFT
|
||||
|
||||
set GIT_URL=https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
||||
|
||||
:: Will download svn and python.
|
||||
:: If you don't want to install the depot_tools version of these tools, remove
|
||||
:: the 'force' option on the next command. The tools will be installed only if
|
||||
:: not already in the PATH environment variable.
|
||||
call "%DEPOT_TOOLS_DIR%bootstrap\win\win_tools.bat" force
|
||||
if errorlevel 1 goto :EOF
|
||||
:: Now clear errorlevel so it can be set by other programs later.
|
||||
set errorlevel=
|
||||
|
||||
IF "%DEPOT_TOOLS_WIN_TOOLCHAIN%" == "0" GOTO :NOTOOLCHAIN
|
||||
call python %~dp0win_toolchain\get_toolchain_if_necessary.py
|
||||
if errorlevel 1 goto :EOF
|
||||
set errorlevel=
|
||||
:NOTOOLCHAIN
|
||||
|
||||
:: Shall skip automatic update?
|
||||
IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :EOF
|
||||
|
||||
:: We need either .\.svn\. or .\.git\. to be able to sync.
|
||||
IF EXIST "%DEPOT_TOOLS_DIR%.svn\." GOTO :SVN_UPDATE
|
||||
IF EXIST "%DEPOT_TOOLS_DIR%.git\." GOTO :GIT_UPDATE
|
||||
echo Error updating depot_tools, no revision tool found.
|
||||
goto :EOF
|
||||
|
||||
|
||||
:SVN_UPDATE
|
||||
call svn up -q "%DEPOT_TOOLS_DIR%."
|
||||
goto :EOF
|
||||
|
||||
|
||||
:GIT_UPDATE
|
||||
cd /d "%DEPOT_TOOLS_DIR%."
|
||||
call git config remote.origin.fetch > NUL
|
||||
if errorlevel 1 goto :GIT_SVN_UPDATE
|
||||
for /F %%x in ('git config --get remote.origin.url') DO (
|
||||
IF not "%%x" == "%GIT_URL%" (
|
||||
echo Your depot_tools checkout is configured to fetch from an obsolete URL
|
||||
choice /N /T 60 /D N /M "Would you like to update it? [y/N]: "
|
||||
IF not errorlevel 2 (
|
||||
call git config remote.origin.url "%GIT_URL%"
|
||||
)
|
||||
)
|
||||
)
|
||||
call git fetch -q origin > NUL
|
||||
call git rebase -q origin/master > NUL
|
||||
if errorlevel 1 echo Failed to update depot_tools.
|
||||
|
||||
goto :EOF
|
||||
|
||||
:GIT_SVN_UPDATE
|
||||
cd /d "%DEPOT_TOOLS_DIR%."
|
||||
call git svn rebase -q -q
|
||||
goto :EOF
|
||||
@echo off
|
||||
:: Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
:: Use of this source code is governed by a BSD-style license that can be
|
||||
:: found in the LICENSE file.
|
||||
|
||||
:: This batch file will try to sync the root directory.
|
||||
|
||||
setlocal
|
||||
|
||||
:: Windows freaks out if a file is overwritten while it's being executed. Copy
|
||||
:: this script off to a temporary location and reinvoke from there before
|
||||
:: running any svn or git commands.
|
||||
IF %~nx0==update_depot_tools.bat (
|
||||
COPY /Y %~dp0update_depot_tools.bat %TEMP%\update_depot_tools_tmp.bat >nul
|
||||
if errorlevel 1 goto :EOF
|
||||
%TEMP%\update_depot_tools_tmp.bat %~dp0 %*
|
||||
)
|
||||
|
||||
set DEPOT_TOOLS_DIR=%1
|
||||
SHIFT
|
||||
|
||||
set GIT_URL=https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
||||
|
||||
:: Will download svn and python.
|
||||
:: If you don't want to install the depot_tools version of these tools, remove
|
||||
:: the 'force' option on the next command. The tools will be installed only if
|
||||
:: not already in the PATH environment variable.
|
||||
call "%DEPOT_TOOLS_DIR%bootstrap\win\win_tools.bat" force
|
||||
if errorlevel 1 goto :EOF
|
||||
:: Now clear errorlevel so it can be set by other programs later.
|
||||
set errorlevel=
|
||||
|
||||
:: Opt-in for now.
|
||||
IF "%DEPOT_TOOLS_WIN_TOOLCHAIN%" == "" GOTO :NOTOOLCHAIN
|
||||
call python %~dp0win_toolchain\get_toolchain_if_necessary.py
|
||||
if errorlevel 1 goto :EOF
|
||||
set errorlevel=
|
||||
:NOTOOLCHAIN
|
||||
|
||||
:: Shall skip automatic update?
|
||||
IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :EOF
|
||||
|
||||
:: We need either .\.svn\. or .\.git\. to be able to sync.
|
||||
IF EXIST "%DEPOT_TOOLS_DIR%.svn\." GOTO :SVN_UPDATE
|
||||
IF EXIST "%DEPOT_TOOLS_DIR%.git\." GOTO :GIT_UPDATE
|
||||
echo Error updating depot_tools, no revision tool found.
|
||||
goto :EOF
|
||||
|
||||
|
||||
:SVN_UPDATE
|
||||
call svn up -q "%DEPOT_TOOLS_DIR%."
|
||||
goto :EOF
|
||||
|
||||
|
||||
:GIT_UPDATE
|
||||
cd /d "%DEPOT_TOOLS_DIR%."
|
||||
call git config remote.origin.fetch > NUL
|
||||
if errorlevel 1 goto :GIT_SVN_UPDATE
|
||||
for /F %%x in ('git config --get remote.origin.url') DO (
|
||||
IF not "%%x" == "%GIT_URL%" (
|
||||
echo Your depot_tools checkout is configured to fetch from an obsolete URL
|
||||
choice /N /T 60 /D N /M "Would you like to update it? [y/N]: "
|
||||
IF not errorlevel 2 (
|
||||
call git config remote.origin.url "%GIT_URL%"
|
||||
)
|
||||
)
|
||||
)
|
||||
call git fetch -q origin > NUL
|
||||
call git rebase -q origin/master > NUL
|
||||
if errorlevel 1 echo Failed to update depot_tools.
|
||||
|
||||
goto :EOF
|
||||
|
||||
:GIT_SVN_UPDATE
|
||||
cd /d "%DEPOT_TOOLS_DIR%."
|
||||
call git svn rebase -q -q
|
||||
goto :EOF
|
||||
Loading…
Reference in New Issue