From 3d7b02c7287d7e914f97d214a838833d437c0143 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Mon, 22 Feb 2016 12:59:53 -0800 Subject: Fix gyp-and-sync for windows GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1715423003 Review URL: https://codereview.chromium.org/1715423003 --- bin/sync-and-gyp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/sync-and-gyp b/bin/sync-and-gyp index 19fc1ed1c6..210e30c212 100755 --- a/bin/sync-and-gyp +++ b/bin/sync-and-gyp @@ -74,10 +74,16 @@ solutions = [ ] cache_dir = None ''' + +# Must use gclient.bat rather than gclient on windows (at least on mingw) +gclient = 'gclient' +if sys.platform == 'win32' or sys.platform == 'cygwin': + gclient = 'gclient.bat' + if current_deps_hash != deps_hash: # `gclient sync` is very slow, so skip whenever we can. try: - subprocess.call(['gclient', '--version']) + subprocess.call([gclient, '--version']) except: sys.stdout.write('gclient missing from $PATH, please install ' + 'depot_tools\n https://skia.org/user/quick/desktop\n') @@ -85,7 +91,7 @@ if current_deps_hash != deps_hash: if not os.path.isfile('.gclient'): with open('.gclient', 'w') as o: o.write(default_gclient_config) - gclient_sync_command = ['gclient', 'sync'] + skia_opt_deps + gclient_sync_command = [gclient, 'sync'] + skia_opt_deps try: sys.stdout.write('%r\n' % gclient_sync_command) subprocess.check_call(gclient_sync_command) -- cgit v1.2.3