[.bat] Remove "depot_tools" override.

Currently, all ".bat" entry points use "~dp0python" to ensure that the
Python that is used to execute the tool is the one in depot_tools. This
prevents any sort of system override.

Remove this override so that PATH solely determines which Python is
used. To accommodate users who invoked these tools without Python on the
PATH, we still still add "depot_tools" as a catch-all PATH suffix.

Some tools were also not using DOS-style line endings. This CL fixes
this.

BUG=chromium:714293, chromium:724902
TEST=None

Change-Id: I06e9583a668c767196a2a335547aded868f2a2b5
Reviewed-on: https://chromium-review.googlesource.com/517236
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
changes/36/517236/5
Dan Jacques 8 years ago committed by Commit Bot
parent 56038f517d
commit 2f5f0b7a99

@ -4,5 +4,9 @@
:: found in the LICENSE file.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\apply_issue.py" %*
python "%~dp0\apply_issue.py" %*

@ -1,8 +1,12 @@
@echo off
:: Copyright (c) 2015 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
:: Defer control.
%~dp0python "%~dp0\cit.py" %*
@echo off
:: Copyright (c) 2015 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
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
python "%~dp0\cit.py" %*

@ -4,5 +4,9 @@
:: found in the LICENSE file.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\clang_format.py" %*
python "%~dp0\clang_format.py" %*

@ -1,8 +1,12 @@
@echo off
:: Copyright 2016 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
:: Defer control.
%~dp0python "%~dp0\clang_format_merge_driver.py" %*
@echo off
:: Copyright 2016 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
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
python "%~dp0\clang_format_merge_driver.py" %*

@ -4,5 +4,9 @@
:: found in the LICENSE file.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\commit_queue.py" %*
python "%~dp0\commit_queue.py" %*

@ -1,4 +1,11 @@
@echo off
:: Copyright 2016 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
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
call python "%~dp0cpplint.py" %*

@ -4,5 +4,9 @@
:: found in the LICENSE file.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\depot-tools-auth.py" %*
python "%~dp0\depot-tools-auth.py" %*

@ -2,6 +2,11 @@
:: 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.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\download_from_google_storage.py" %*
python "%~dp0\download_from_google_storage.py" %*

@ -7,5 +7,9 @@ setlocal
:: Synchronize the root directory before deferring control back to gclient.py.
call "%~dp0\update_depot_tools.bat"
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\fetch.py" %*
python "%~dp0\fetch.py" %*

@ -7,5 +7,9 @@ setlocal
:: Synchronize the root directory before deferring control back to gclient.py.
call "%~dp0update_depot_tools.bat" %*
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
"%~dp0python" "%~dp0gclient.py" %*
"python" "%~dp0gclient.py" %*

@ -4,5 +4,9 @@
:: found in the LICENSE file.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\gn.py" %*
python "%~dp0\gn.py" %*

@ -1,7 +1,12 @@
@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.
:: Defer control.
%~dp0python "%~dp0\roll_dep_svn.py" %*
@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.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
python "%~dp0\roll_dep_svn.py" %*

@ -2,6 +2,11 @@
:: 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.
setlocal
:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
:: standalone, but allow other PATH manipulations to take priority.
set PATH=%PATH%;%~dp0
:: Defer control.
%~dp0python "%~dp0\roll_dep.py" %*
python "%~dp0\roll_dep.py" %*

Loading…
Cancel
Save