A refactoring left cygwin busted....

A refactoring left cygwin busted.

Create an update_depot_tools.bat file to use for updated when on cygwin, and
properly call it from the update_depot_tools shell script and gclient batch
files.

BUG=none
TEST=gclient sync and git cl work again on cygwin.  Can also turn echo on in update_depot_tools.bat to verify updating working correctly.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=63234

[Scott Byer, 2010-10-19 00:57:28]

This gets cygwin working again.

[Mandeep Singh Baines, 2010-10-19 02:18:40]

On 2010/10/19 00:57:28, Scott Byer wrote:
> This gets cygwin working again.

Thanks! I should be more careful when re-factoring.

Don't we still need something like this in the gclient bash script:

# Use the batch file as an entry point if on cygwin.	
if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then
    ${base_dir}/gclient.bat "$@"
    exit
fi

[M-A Ruel, 2010-10-19 15:06:07]

On 2010/10/19 02:18:40, Mandeep Singh Baines wrote:
> On 2010/10/19 00:57:28, Scott Byer wrote:
> > This gets cygwin working again.
> 
> Thanks! I should be more careful when re-factoring.
> 
> Don't we still need something like this in the gclient bash script:
> 
> # Use the batch file as an entry point if on cygwin.	
> if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then
>     ${base_dir}/gclient.bat "$@"
>     exit
> fi

Yes this is needed.

[M-A Ruel, 2010-10-19 15:07:53]

And there's a related change at http://codereview.chromium.org/3783010/show

http://codereview.chromium.org/3856006/diff/1/2
File bootstrap/update_depot_tools.bat (right):

http://codereview.chromium.org/3856006/diff/1/2#newcode2
bootstrap/update_depot_tools.bat:2: :: Copyright (c) 2009 The Chromium Authors.
All rights reserved.
2010 :)

[Scott Byer, 2010-10-19 16:38:50]

Is the call out to gclient.bat needed just to get the bootstrap / upper
directory update dance going?  Or is it to try and avoid additional complexities
with the cygwin environment?  I've used cygwin for over a decade now and so have
probably grown a bit blind to it's faults.

http://codereview.chromium.org/3856006/diff/1/2
File bootstrap/update_depot_tools.bat (right):

http://codereview.chromium.org/3856006/diff/1/2#newcode2
bootstrap/update_depot_tools.bat:2: :: Copyright (c) 2009 The Chromium Authors.
All rights reserved.
On 2010/10/19 15:07:53, Marc-Antoine Ruel wrote:
> 2010 :)

Done.

[M-A Ruel, 2010-10-19 16:45:25]

gclient.bat should also call update_depot_tools.bat.

http://codereview.chromium.org/3856006/diff/7001/8001
File bootstrap/update_depot_tools.bat (right):

http://codereview.chromium.org/3856006/diff/7001/8001#newcode6
bootstrap/update_depot_tools.bat:6: :: This batch file will try to sync the root
directory and call back gclient.
it doesn't call back gclient.

[Scott Byer, 2010-10-19 16:46:28]

On 2010/10/19 02:18:40, Mandeep Singh Baines wrote:
> On 2010/10/19 00:57:28, Scott Byer wrote:
> > This gets cygwin working again.
> 
> Thanks! I should be more careful when re-factoring.
> 
> Don't we still need something like this in the gclient bash script:
> 
> # Use the batch file as an entry point if on cygwin.	
> if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then
>     ${base_dir}/gclient.bat "$@"
>     exit
> fi

Done, too.

[Scott Byer, 2010-10-19 17:01:15]

Alright, bootstrap/gclient.bat uses bootstrap/update_depot_tools.bat, the
gclient script at the root properly calls off to bootstrap/gclient.bat in the
cygwin case.  This is looking better.

Thanks for your patience!

http://codereview.chromium.org/3856006/diff/7001/8001
File bootstrap/update_depot_tools.bat (right):

http://codereview.chromium.org/3856006/diff/7001/8001#newcode6
bootstrap/update_depot_tools.bat:6: :: This batch file will try to sync the root
directory and call back gclient.
On 2010/10/19 16:45:25, Marc-Antoine Ruel wrote:
> it doesn't call back gclient.

Done.

http://codereview.chromium.org/3856006/diff/14001/15002#newcode8
bootstrap/update_depot_tools.bat:8: setlocal
This seems unneeded to me, should I eliminate it?

[Scott Byer, 2010-10-20 16:36:44]

Ping?

On 2010/10/19 17:01:15, Scott Byer wrote:
> Alright, bootstrap/gclient.bat uses bootstrap/update_depot_tools.bat, the
> gclient script at the root properly calls off to bootstrap/gclient.bat in the
> cygwin case.  This is looking better.
> 
> Thanks for your patience!
> 
> http://codereview.chromium.org/3856006/diff/7001/8001
> File bootstrap/update_depot_tools.bat (right):
> 
> http://codereview.chromium.org/3856006/diff/7001/8001#newcode6
> bootstrap/update_depot_tools.bat:6: :: This batch file will try to sync the
root
> directory and call back gclient.
> On 2010/10/19 16:45:25, Marc-Antoine Ruel wrote:
> > it doesn't call back gclient.
> 
> Done.
> 
> http://codereview.chromium.org/3856006/diff/14001/15002#newcode8
> bootstrap/update_depot_tools.bat:8: setlocal
> This seems unneeded to me, should I eliminate it?

[M-A Ruel, 2010-10-20 16:43:58]

lgtm, sorry for the delay!

http://codereview.chromium.org/3856006/diff/14001/15002
File bootstrap/update_depot_tools.bat (right):

http://codereview.chromium.org/3856006/diff/14001/15002#newcode8
bootstrap/update_depot_tools.bat:8: setlocal
On 2010/10/19 17:01:15, Scott Byer wrote:
> This seems unneeded to me, should I eliminate it?

it's fine to remove it now.