diff --git a/.gitignore b/.gitignore index 9dd6561b29..7ff6072660 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ # Ignore locations where third-party tools are placed during bootstrapping. /python_bin -/python_274 +/python275_bin /git_bin /git-1.8.0_bin /svn_bin diff --git a/PRESUBMIT.py b/PRESUBMIT.py index a8e90f3542..f75b8e11ec 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -15,7 +15,7 @@ def CommonChecks(input_api, output_api, tests_to_black_list): black_list = list(input_api.DEFAULT_BLACK_LIST) + [ r'^cpplint\.py$', r'^cpplint_chromium\.py$', - r'^python_274[\/\\].+', + r'^python275_bin[\/\\].+', r'^python_bin[\/\\].+', r'^site-packages-py[0-9]\.[0-9][\/\\].+', r'^svn_bin[\/\\].+', diff --git a/git-cl b/git-cl index 0fc4354d57..df4bec0b39 100755 --- a/git-cl +++ b/git-cl @@ -20,8 +20,8 @@ fi # Uncomment this line if you never use gclient. # "$base_dir"/update_depot_tools -if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then - PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_cl.py "$@" +if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then + PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/git_cl.py $@" else PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_cl.py" "$@" fi diff --git a/git-try b/git-try index 166f66938d..f71acb45ce 100755 --- a/git-try +++ b/git-try @@ -14,8 +14,8 @@ else base_dir=$(dirname "$0") fi -if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then - PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_try.py "$@" +if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then + PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/git_try.py $@" else PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_try.py" "$@" fi diff --git a/pylint b/pylint index 02cd5a4e0e..b0452a17c2 100755 --- a/pylint +++ b/pylint @@ -12,8 +12,8 @@ base_dir=$(dirname "$0") OUTPUT="$(uname | grep 'MINGW')" MINGW=$? -if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then - PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/pylint.py "$@" +if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then + PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/pylint.py $@" else PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/pylint.py" "$@" fi