Commit 28e0e940 authored by bradnelson@google.com's avatar bradnelson@google.com

Changing entry points to use cygwin python (as gyp will now fall back on

hermetic python).


BUG=http://code.google.com/p/gyp/issues/detail?id=178
TEST=None

Review URL: http://codereview.chromium.org/6557004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@75768 0039d316-1c4b-4281-b951-d872f2087c98
parent f340d1d6
File mode changed from 100644 to 100755
...@@ -5,13 +5,6 @@ ...@@ -5,13 +5,6 @@
base_dir=$(dirname "$0") base_dir=$(dirname "$0")
# Use the batch file as an entry point if on cygwin. Needs to happen before
# the call to update the tools or the update will happen twice.
if [ "${OSTYPE}" = "cygwin" ]; then
${base_dir}/gclient.bat "$@"
exit
fi
"$base_dir"/update_depot_tools "$base_dir"/update_depot_tools
exec python "$base_dir/gclient.py" "$@" exec python "$base_dir/gclient.py" "$@"
...@@ -52,13 +52,7 @@ then ...@@ -52,13 +52,7 @@ then
cd - > /dev/null cd - > /dev/null
fi fi
# Use the batch file as an entry point if on cygwin. # We're on POSIX. We can now safely look for svn checkout.
if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then
${base_dir}/bootstrap/update_depot_tools.bat
exit
fi
# We're on POSIX (not cygwin). We can now safely look for svn checkout.
if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
then then
# Update the bootstrap directory to stay up-to-date with the latest # Update the bootstrap directory to stay up-to-date with the latest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment