Commit Graph

12 Commits (1101645d533f44d3fe650d1635fa4bbe2b6eb716)

Author SHA1 Message Date
Dan Jacques 1b9a43aab3 Remove special Cygwin PATH manipulation from .bat.
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>
8 years ago
maruel@chromium.org 851c8291a3 Fix gclient to work on a path containing space characters
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
10 years ago
agable@chromium.org 69b67588c4 Run "svn revert" in update_depot_tools --force
R=iannucci@chromium.org, szager@chromium.org, pdr@chromium.org
BUG=435729

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293112 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
scottmg@chromium.org 28974af759 Add some missing setlocals from various .bat files
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
11 years ago
johnw@google.com 5255b2d116 Attempting to fix a C:\cygwin\bin\python.exe stack trace
Review URL: https://chromiumcodereview.appspot.com/10206030

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135377 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org e6c00f3f6f Fix git depot_tools update flow.
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.org

R=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
13 years ago
maruel@chromium.org 70444a0907 Fix EOL issues.
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
14 years ago
maruel@chromium.org cf69b45920 Fix using depot_tools from a git checkout on Windows.
Review URL: http://codereview.chromium.org/437042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32969 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org fdafe3e2d1 Force depot_tools to be in the PATH before /usr/bin in cygwin.
Review URL: http://codereview.chromium.org/113208

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@15767 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org b33bbcc0aa Force the installation of python and svn on windows.
Review URL: http://codereview.chromium.org/115063

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@15501 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@google.com 3380c1a484 Fix the windows auto update scripts.
TBR=nsylvain
Review URL: http://codereview.chromium.org/93106

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@14400 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@google.com fb2b8eb2e2 Create the Next Generation of depot_tools. Eh.
Review URL: http://codereview.chromium.org/92087

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@14349 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago