From 117672db3f6affd60a4a30c5110f54ca6b095aa5 Mon Sep 17 00:00:00 2001 From: halcanary Date: Wed, 17 Feb 2016 08:39:23 -0800 Subject: bin/sync-and-gyp: pass --deps='...' to `gclient sync`. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1705063002 Review URL: https://codereview.chromium.org/1705063002 --- bin/sync-and-gyp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/sync-and-gyp b/bin/sync-and-gyp index 906b7671ba..ac6b8392b2 100755 --- a/bin/sync-and-gyp +++ b/bin/sync-and-gyp @@ -23,14 +23,21 @@ # # python bin/sync-and-gyp +# To retreive and use all optional deps: +# +# python bin/sync-and-gyp --deps=all +# ninja -C out/Debug && out/Debug/dm + import fnmatch import hashlib -import subprocess import os +import subprocess import sys skia_dir = os.path.join(os.path.dirname(__file__), os.pardir) +skia_opt_deps = [arg for arg in sys.argv[1:] if arg.startswith('--deps=')] + skia_out = os.environ.get("SKIA_OUT") if skia_out: skia_out = os.path.abspath(skia_out) @@ -47,6 +54,7 @@ if not os.path.isfile('DEPS'): deps_hasher = hashlib.sha1() with open('DEPS', 'r') as f: deps_hasher.update(f.read()) +deps_hasher.update(repr(skia_opt_deps)) deps_hash = deps_hasher.hexdigest() current_deps_hash = None if os.path.isfile('.deps_sha1'): @@ -71,8 +79,10 @@ 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 try: - subprocess.check_call(['gclient', 'sync']) + sys.stdout.write('%r\n' % gclient_sync_command) + subprocess.check_call(gclient_sync_command) except: sys.stderr.write('\n`gclient sync` failed.\n') os.remove('.deps_sha1') # Unknown state. -- cgit v1.2.3