diff options
Diffstat (limited to 'tools/scripts/init-repository.py')
-rwxr-xr-x | tools/scripts/init-repository.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py index 221f74a65..6209b4866 100755 --- a/tools/scripts/init-repository.py +++ b/tools/scripts/init-repository.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ############################################################################# ## @@ -66,7 +66,7 @@ if not chromium_src or not os.path.isdir(chromium_src): ninja_src = os.path.join(qtwebengine_root, 'src/3rdparty/ninja') gn_src = os.path.join(qtwebengine_root, 'src/3rdparty/gn') args.snapshot = True - print 'CHROMIUM_SRC_DIR not set, using Chromium in' + chromium_src + print('CHROMIUM_SRC_DIR not set, using Chromium in' + chromium_src) if not args.baseline_upstream: # Write our chromium sources directory into git config. @@ -79,7 +79,7 @@ def updateLastChange(): return currentDir = os.getcwd() os.chdir(chromium_src) - print 'updating LASTCHANGE files' + print('updating LASTCHANGE files') subprocess.call(['python', 'build/util/lastchange.py', '-o', 'build/util/LASTCHANGE']) subprocess.call(['python', 'build/util/lastchange.py', '-m', 'SKIA_COMMIT_HASH', '-s', 'third_party/skia', '--header', 'skia/ext/skia_commit_hash.h']) subprocess.call(['python', 'build/util/lastchange.py', '-m', 'GPU_LISTS_VERSION', '--revision-id-only', '--header', 'gpu/config/gpu_lists_version.h']) @@ -93,7 +93,7 @@ def initUpstreamSubmodules(): chromium_ref = 'refs/tags/' + resolver.currentVersion() os.chdir(qtwebengine_root) - current_submodules = subprocess.check_output(['git', 'submodule']) + current_submodules = subprocess.check_output(['git', 'submodule']).decode() if not 'src/3rdparty_upstream/gn' in current_submodules: subprocess.call(['git', 'submodule', 'add', gn_url, 'src/3rdparty_upstream/gn']) if not 'src/3rdparty_upstream/ninja' in current_submodules: @@ -123,6 +123,7 @@ def initUpstreamSubmodules(): chromiumSubmodule.os = 'all' chromiumSubmodule.initialize() chromiumSubmodule.initSubmodules() + subprocess.call(['src/3rdparty_upstream/chromium/third_party/node/update_npm_deps']) # Unstage repositories so we do not accidentally commit them. subprocess.call(['git', 'reset', '-q', 'HEAD', 'src/3rdparty_upstream/gn']) @@ -141,6 +142,6 @@ if args.upstream: initUpstreamSubmodules() updateLastChange() if not args.baseline_upstream and not use_external_chromium: - subprocess.call(['python', os.path.join(qtwebengine_root, 'tools', 'scripts', 'patch_upstream.py')]) + subprocess.call(['python3', os.path.join(qtwebengine_root, 'tools', 'scripts', 'patch_upstream.py')]) if args.snapshot: initSnapshot() |