Do not run unnecessary gyp hooks.
This commit is contained in:
Родитель
19d11db59c
Коммит
80e45c41f3
|
@ -45,7 +45,7 @@ def main():
|
|||
os.chdir(CHROMIUM_DIR)
|
||||
fetch = os.path.join(DEPOT_TOOLS_DIR, 'fetch.py')
|
||||
result = subprocess.call([sys.executable, fetch, 'chromium',
|
||||
'--nosvn=True'])
|
||||
'--nohooks', '--nosvn=True'])
|
||||
if result:
|
||||
return result;
|
||||
|
||||
|
|
|
@ -17,11 +17,11 @@ CHROMIUMCONTENT_DESTINATION_DIR = os.path.join(SRC_DIR, 'chromiumcontent')
|
|||
|
||||
def main():
|
||||
return (# Make sure we get all of the branches locally.
|
||||
gclient_sync() or
|
||||
gclient_sync(True) or
|
||||
# Update top-level checkout to the release tag.
|
||||
checkout_version() or
|
||||
# Update deps for current checkout.
|
||||
gclient_sync() or
|
||||
gclient_sync(False) or
|
||||
apply_patches() or
|
||||
copy_chromiumcontent_files() or
|
||||
run_gyp() or
|
||||
|
@ -39,14 +39,14 @@ def checkout_version():
|
|||
'refs/tags/{0}'.format(chromium_version())])
|
||||
|
||||
|
||||
def gclient_sync():
|
||||
def gclient_sync(nohooks):
|
||||
os.chdir(SRC_DIR)
|
||||
gclient = os.path.join(DEPOT_TOOLS_DIR, 'gclient.py')
|
||||
if subprocess.call([sys.executable, gclient, 'sync', '--with_branch_heads'],
|
||||
env=gyp_env()) == 0:
|
||||
return
|
||||
return subprocess.call([sys.executable, gclient, 'sync', '--force',
|
||||
'--with_branch_heads'], env=gyp_env())
|
||||
args = [sys.executable, gclient, 'sync', '--with_branch_heads']
|
||||
if nohooks:
|
||||
args += ['--nohooks']
|
||||
if subprocess.call(args, env=gyp_env()):
|
||||
return subprocess.call(args + ['--force'], env=gyp_env())
|
||||
|
||||
|
||||
def gyp_env():
|
||||
|
|
Загрузка…
Ссылка в новой задаче