ソースを参照

Fetch Windows tools on Cygwin and use that Python for some scripts

Tested by running gclient sync a couple of times from a Cygwin shell.

R=dpranke@chromium.org
CC=scottmg@chromium.org,thakis@chromium.org,maruel@chromium.org
BUG=335180

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245315 0039d316-1c4b-4281-b951-d872f2087c98
rnk@chromium.org 11 年 前
コミット
a957e27dc1
3 ファイル変更25 行追加2 行削除
  1. 9 1
      fetch
  2. 9 1
      gclient
  3. 7 0
      update_depot_tools

+ 9 - 1
fetch

@@ -9,4 +9,12 @@ if [[ "#grep#fetch#cleanup#diff#" != *"#$1#"* ]]; then
   "$base_dir"/update_depot_tools
 fi
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/fetch.py" "$@"
+PYTHON=python
+
+OUTPUT="$(uname | grep 'CYGWIN')"
+CYGWIN=$?
+if [ $CYGWIN = 0 ]; then
+  PYTHON="$base_dir/python.bat"
+fi
+
+PYTHONDONTWRITEBYTECODE=1 exec "$PYTHON" "$base_dir/fetch.py" "$@"

+ 9 - 1
gclient

@@ -9,4 +9,12 @@ if [[ "#grep#fetch#cleanup#diff#" != *"#$1#"* ]]; then
   "$base_dir"/update_depot_tools
 fi
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"
+PYTHON=python
+
+OUTPUT="$(uname | grep 'CYGWIN')"
+CYGWIN=$?
+if [ $CYGWIN = 0 ]; then
+  PYTHON="$base_dir/python.bat"
+fi
+
+PYTHONDONTWRITEBYTECODE=1 exec "$PYTHON" "$base_dir/gclient.py" "$@"

+ 7 - 0
update_depot_tools

@@ -17,6 +17,13 @@ then
     base_dir=`cd "$base_dir" && pwd -P`
 fi
 
+# Don't try to use Cygwin tools.  Get real win32 tools using the batch script.
+OUTPUT="$(uname | grep 'CYGWIN')"
+CYGWIN=$?
+if [ $CYGWIN = 0 ]; then
+  exec cmd /c "$base_dir/bootstrap/win/win_tools.bat" force
+fi
+
 # Test if this script is running under a MSys install.  If it is, we will
 # hardcode the paths to SVN and Git where possible.
 OUTPUT="$(uname | grep 'MINGW')"