From 28e0e9408d01688307cd8b092e762deb89a67c7d Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Wed, 23 Feb 2011 18:49:54 +0000 Subject: [PATCH] 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 --- bootstrap/update_depot_tools.bat | 0 gclient | 7 ------- update_depot_tools | 8 +------- 3 files changed, 1 insertion(+), 14 deletions(-) mode change 100644 => 100755 bootstrap/update_depot_tools.bat diff --git a/bootstrap/update_depot_tools.bat b/bootstrap/update_depot_tools.bat old mode 100644 new mode 100755 diff --git a/gclient b/gclient index 924905060..5d7422d86 100755 --- a/gclient +++ b/gclient @@ -5,13 +5,6 @@ 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 exec python "$base_dir/gclient.py" "$@" diff --git a/update_depot_tools b/update_depot_tools index 2202cdf2f..a9e16519a 100755 --- a/update_depot_tools +++ b/update_depot_tools @@ -52,13 +52,7 @@ then cd - > /dev/null fi -# Use the batch file as an entry point if on cygwin. -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. +# We're on POSIX. We can now safely look for svn checkout. if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] then # Update the bootstrap directory to stay up-to-date with the latest