Do not use viewvc to grab python/svn.

R=benhenry@google.com, agable@chromium.org, benhenry@chromium.org
BUG=609891

Review URL: https://codereview.chromium.org/1981143002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300608 0039d316-1c4b-4281-b951-d872f2087c98

bootstrap/win/README.md

@@ -53,14 +53,14 @@ than the rest of this README.
 
 ### Python
 
-Python installs are sourced from https://src.chromium.org/viewvc/chrome/trunk/tools/ .
+Python installs are sourced from gs://chrome-infra/python276_bin.zip .
 
 The process to create them is sort-of-documented in the README of the python
 zip file.
 
 ### Subversion
 
-Subversion installs are sourced from https://src.chromium.org/viewvc/chrome/trunk/tools/ .
+Subversion installs are sourced from gs://chrome-infra/svn_bin.zip .
 
 There will likely never be an update to SVN in `depot_tools` from the current
 version.

bootstrap/win/win_tools.bat

@@ -9,7 +9,7 @@
 :: Sadly, we can't use SETLOCAL here otherwise it ERRORLEVEL is not correctly
 :: returned.
 
-set WIN_TOOLS_ROOT_URL=https://src.chromium.org/svn/trunk/tools
+set CHROME_INFRA_URL=https://storage.googleapis.com/chrome-infra/
 :: 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%
@@ -35,10 +35,11 @@ goto :GIT_CHECK
 :PY27_INSTALL
 echo Installing python 2.7.6...
 :: Cleanup python directory if it was existing.
+set PYTHON_URL=%CHROME_INFRA_URL%python276_bin.zip
 if exist "%WIN_TOOLS_ROOT_DIR%\python276_bin\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python276_bin"
 if exist "%ZIP_DIR%\python276.zip" del "%ZIP_DIR%\python276.zip"
-echo Fetching from %WIN_TOOLS_ROOT_URL%/third_party/python276_bin.zip
-cscript //nologo //e:jscript "%~dp0get_file.js" %WIN_TOOLS_ROOT_URL%/third_party/python276_bin.zip "%ZIP_DIR%\python276_bin.zip"
+echo Fetching from %PYTHON_URL%
+cscript //nologo //e:jscript "%~dp0get_file.js" %PYTHON_URL% "%ZIP_DIR%\python276_bin.zip"
 if errorlevel 1 goto :PYTHON_FAIL
 :: Will create python276_bin\...
 cscript //nologo //e:jscript "%~dp0unzip.js" "%ZIP_DIR%\python276_bin.zip" "%WIN_TOOLS_ROOT_DIR%"
@@ -52,7 +53,7 @@ goto :GIT_CHECK
 
 :PYTHON_FAIL
 echo ... Failed to checkout python automatically.
-echo You should get the "prebaked" version at %WIN_TOOLS_ROOT_URL%/third_party/
+echo You should get the "prebaked" version at %PYTHON_URL%
 set ERRORLEVEL=1
 goto :END
 
@@ -73,7 +74,7 @@ if not exist "%WIN_TOOLS_ROOT_DIR%\.git_bleeding_edge" (
 )
 set GIT_VERSION=%GIT_VERSION%-%OS_BITS%
 
-set GIT_FETCH_URL=https://storage.googleapis.com/chrome-infra/PortableGit-%GIT_VERSION%-bit.7z.exe
+set GIT_FETCH_URL=%CHROME_INFRA_URL%PortableGit-%GIT_VERSION%-bit.7z.exe
 set GIT_DOWNLOAD_PATH=%ZIP_DIR%\git.7z.exe
 set GIT_BIN_DIR=git-%GIT_VERSION%_bin
 set GIT_INST_DIR=%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%
@@ -190,9 +191,10 @@ goto :END
 :SVN_INSTALL
 echo Installing subversion ...
 :: svn is not accessible; check it out and create 'proxy' files.
+set SVN_URL=%CHROME_INFRA_URL%svn_bin.zip
 if exist "%ZIP_DIR%\svn.zip" del "%ZIP_DIR%\svn.zip"
-echo Fetching from %WIN_TOOLS_ROOT_URL%/third_party/svn_bin.zip
-cscript //nologo //e:jscript "%~dp0get_file.js" %WIN_TOOLS_ROOT_URL%/third_party/svn_bin.zip "%ZIP_DIR%\svn.zip"
+echo Fetching from %SVN_URL%
+cscript //nologo //e:jscript "%~dp0get_file.js" %SVN_URL% "%ZIP_DIR%\svn.zip"
 if errorlevel 1 goto :SVN_FAIL
 :: Cleanup svn directory if it was existing.
 if exist "%WIN_TOOLS_ROOT_DIR%\svn\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\svn"
@@ -210,13 +212,12 @@ goto :END
 
 :SVN_FAIL
 echo ... Failed to checkout svn automatically.
-echo You should get the "prebaked" version at %WIN_TOOLS_ROOT_URL%/third_party/
+echo You should get the "prebaked" version at %SVN_URL%
 set ERRORLEVEL=1
 goto :END
 
 
 :returncode
-set WIN_TOOLS_ROOT_URL=
 set WIN_TOOLS_ROOT_DIR=
 exit /b %ERRORLEVEL%