aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "[.bat] Remove "depot_tools" override."

Browse Source 
This reverts commit 2f5f0b7a99.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> [.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>
> 

TBR=maruel@chromium.org,iannucci@chromium.org,vadimsh@chromium.org,dnj@chromium.org
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
BUG=chromium:714293, chromium:724902

Change-Id: I822abdd4e02abd32d2f4789fb16d5a7f78fdd02d
Reviewed-on: https://chromium-review.googlesource.com/521867
Reviewed-by: Daniel Jacques <dnj@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
changes/67/521867/2
Daniel Jacques 8 years ago
parent f1631cd003
commit 96fa295ab4
13 changed files with 32 additions and 90 deletions
Show Stats Download Patch File Download Diff File

6
apply_issue.bat
Unescape Escape View File

@ -4,9 +4,5 @@
:: 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\apply_issue.py" %*
%~dp0python "%~dp0\apply_issue.py" %*

20
cit.bat
Unescape Escape View File

@ -1,12 +1,8 @@
@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" %*
@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" %*

6
clang-format.bat
Unescape Escape View File

@ -4,9 +4,5 @@
:: 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.py" %*
%~dp0python "%~dp0\clang_format.py" %*

20
clang_format_merge_driver.bat
Unescape Escape View File

@ -1,12 +1,8 @@
@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" %*
@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" %*

6
commit_queue.bat
Unescape Escape View File

@ -4,9 +4,5 @@
:: 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\commit_queue.py" %*
%~dp0python "%~dp0\commit_queue.py" %*

7
cpplint.bat
Unescape Escape View File

@ -1,11 +1,4 @@
@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" %*

6
depot-tools-auth.bat
Unescape Escape View File

@ -4,9 +4,5 @@
:: 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\depot-tools-auth.py" %*
%~dp0python "%~dp0\depot-tools-auth.py" %*

7
download_from_google_storage.bat
Unescape Escape View File

@ -2,11 +2,6 @@
:: 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\download_from_google_storage.py" %*
%~dp0python "%~dp0\download_from_google_storage.py" %*

6
fetch.bat
Unescape Escape View File

@ -7,9 +7,5 @@ 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.
python "%~dp0\fetch.py" %*
%~dp0python "%~dp0\fetch.py" %*

6
gclient.bat
Unescape Escape View File

@ -7,9 +7,5 @@ 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.
"python" "%~dp0gclient.py" %*
"%~dp0python" "%~dp0gclient.py" %*

6
gn.bat
Unescape Escape View File

@ -4,9 +4,5 @@
:: 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\gn.py" %*
%~dp0python "%~dp0\gn.py" %*

19
roll-dep-svn.bat
Unescape Escape View File

@ -1,12 +1,7 @@
@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" %*
@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" %*

7
roll-dep.bat
Unescape Escape View File

@ -2,11 +2,6 @@
:: 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.py" %*
%~dp0python "%~dp0\roll_dep.py" %*

Write Preview
Loading…
Cancel
Save