Second attempt at landing. Fix quotes around python in "gclient.bat".
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: I0fceb99c8adb96e72dac706819be032d400aad37
Reviewed-on: https://chromium-review.googlesource.com/521704
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
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>
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>
Several boilerplate batch files include a provision to prepend
"depot_tools" to PATH prior to running those tools. This undermines
the utility of PATH overrides, since these tools specifically force their
"depot_tools" sub-paths to be used regardless of environment.
The origin of this behavior is likely limited to a specific fix for a
specific problem, but was then perpetuated by the copy/paste of
boilerplate bootstrap code as more bootstraps were added.
This is important in upcoming configurations, where core tools such as
Python and Git will be overridden via PATH on the bots.
Cygwin users who depended on this behavior should just add "depot_tools"
to their PATH in the appropriate location (i.e. in their .bashrc).
BUG=chromium:714293, chromium:724902
TEST=None
Change-Id: Ie948a430847d20326d2411e9296cacd02f83a537
Reviewed-on: https://chromium-review.googlesource.com/510290
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Patch contributed by Leung Wing Chung <lwchkg@gmail.com>.
Committed on his behalf due to Commit Queue's mishandling of
CRLF files.
Here is my procedure for testing for a new install
1. Download and unzip
https://src.chromium.org/svn/trunk/tools/depot_tools.zip
Note that the path should include a space character,
e.g. "with a space"
2. Copy the three modified files to the unzipped folder
3. Convert the unzipped files into Windows CRLF.
4. REMOVE the following lines from update_depot_tools.bat
(Should I file a separate bug for this?)
:: Initialize/update virtualenv.
cd /d "%DEPOT_TOOLS_DIR%."
python -u bootstrap\bootstrap.py --deps_file bootstrap\deps.pyl --quiet ENV
if errorlevel 1 goto :EOF
5. Run gclient. Installation should be okay until
"git rebase" is run.
R=maruel@chromium.org
BUG=507301
Review URL: https://codereview.chromium.org/1232023004 .
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296275 0039d316-1c4b-4281-b951-d872f2087c98
Shell PATH was growing quite long in some cases.
R=gab@chromium.org, iannucci@chromium.org, johnw@chromium.org, maruel@chromium.org
Review URL: https://codereview.chromium.org/180303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253347 0039d316-1c4b-4281-b951-d872f2087c98
In Windows (already worked correctly in posix): gclient wouldn't correctly update depot_tools when called.
Refactored away the bootstrap depot_tools update flow which only still existed in Windows.
Patch contributed by gab@chromium.orgR=maruel@chromium.org
BUG=
TEST=Running `gclient sync` from src/ and see depot_tools being correctly updated under a git depot_tools checkout.
Review URL: https://chromiumcodereview.appspot.com/9751009
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132191 0039d316-1c4b-4281-b951-d872f2087c98
Set svn:eol-style=CRLF for all .bat files and everything in bootstrap/win/
Set svn:eol-style=LF for everything else.
Also delete depot_tools/git_cl/ since it's not used anymore.
Review URL: http://codereview.chromium.org/8055016
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@103051 0039d316-1c4b-4281-b951-d872f2087c98
Dan Jacques
maruel@chromium.org
agable@chromium.org
scottmg@chromium.org
johnw@google.com
maruel@chromium.org
maruel@google.com