Commit 9e6dd687 authored by maruel@chromium.org's avatar maruel@chromium.org

Switch depot_tools python to 2.7.4.

TBR=joi@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@200799 0039d316-1c4b-4281-b951-d872f2087c98
parent 9c60ab23
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
# Ignore locations where third-party tools are placed during bootstrapping. # Ignore locations where third-party tools are placed during bootstrapping.
/python_bin /python_bin
/python_274
/git_bin /git_bin
/git-1.8.0_bin
/svn_bin /svn_bin
# Ignore ctags/cscope index files # Ignore ctags/cscope index files
......
...@@ -15,6 +15,7 @@ def CommonChecks(input_api, output_api, tests_to_black_list): ...@@ -15,6 +15,7 @@ def CommonChecks(input_api, output_api, tests_to_black_list):
black_list = list(input_api.DEFAULT_BLACK_LIST) + [ black_list = list(input_api.DEFAULT_BLACK_LIST) + [
r'^cpplint\.py$', r'^cpplint\.py$',
r'^cpplint_chromium\.py$', r'^cpplint_chromium\.py$',
r'^python_274[\/\\].+',
r'^python_bin[\/\\].+', r'^python_bin[\/\\].+',
r'^site-packages-py[0-9]\.[0-9][\/\\].+', r'^site-packages-py[0-9]\.[0-9][\/\\].+',
r'^svn_bin[\/\\].+', r'^svn_bin[\/\\].+',
......
@echo off @echo off
:: Copyright (c) 2012 The Chromium Authors. All rights reserved. :: Copyright (c) 2013 The Chromium Authors. All rights reserved.
:: Use of this source code is governed by a BSD-style license that can be :: Use of this source code is governed by a BSD-style license that can be
:: found in the LICENSE file. :: found in the LICENSE file.
setlocal setlocal
set PATH=%~dp0python_bin;%PATH%
call python "%~dp0pylint.py" %* call python "%~dp0pylint.py" %*
@echo off @echo off
:: Copyright (c) 2013 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.
setlocal setlocal
set PATH=%~dp0python_bin;%PATH% set PATH=%~dp0python_274;%PATH%
"%~dp0python_bin\python.exe" %* "%~dp0python_274\python.exe" %*
...@@ -126,8 +126,8 @@ goto :END ...@@ -126,8 +126,8 @@ goto :END
:PYTHON_INSTALL :PYTHON_INSTALL
echo Installing python ... echo Installing python ...
:: Cleanup python directory if it was existing. :: Cleanup python directory if it was existing.
if exist "%WIN_TOOLS_ROOT_DIR%\python_bin\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python_bin" if exist "%WIN_TOOLS_ROOT_DIR%\python_274\." rd /q /s "%WIN_TOOLS_ROOT_DIR%\python_274"
call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python_26 "%WIN_TOOLS_ROOT_DIR%\python_bin" call svn co -q %WIN_TOOLS_ROOT_URL%/third_party/python_274 "%WIN_TOOLS_ROOT_DIR%\python_274"
if errorlevel 1 goto :PYTHON_FAIL if errorlevel 1 goto :PYTHON_FAIL
:: Create the batch files. :: Create the batch files.
call copy /y "%~dp0python.new.bat" "%WIN_TOOLS_ROOT_DIR%\python.bat" 1>nul call copy /y "%~dp0python.new.bat" "%WIN_TOOLS_ROOT_DIR%\python.bat" 1>nul
...@@ -138,7 +138,7 @@ goto :END ...@@ -138,7 +138,7 @@ goto :END
:PYTHON_FAIL :PYTHON_FAIL
echo ... Failed to checkout python automatically. echo ... Failed to checkout python automatically.
echo Please visit http://python.org to download the latest python 2.x client before echo Please visit http://python.org to download the latest python 2.7.x client before
echo continuing. echo continuing.
echo You can also get the "prebacked" version used at %WIN_TOOLS_ROOT_URL%/third_party/ echo You can also get the "prebacked" version used at %WIN_TOOLS_ROOT_URL%/third_party/
set ERRORLEVEL=1 set ERRORLEVEL=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment