diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:15:06 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:15:06 +0200 |
commit | 028bd20e41fc1995c34ca4c19e5342ff3efe0c6a (patch) | |
tree | 71aa1e77a262ba2d2a72dc6ac8f5c5c3a26567f2 /src/core/gn_run.pro | |
parent | 4ea591e7efdb63c26372af4af9507c5f57b42fcc (diff) | |
parent | b24a6419869c14e32e87cb97e529cc25c246b5e0 (diff) |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: If450c073521057241f34ed9b9a7f9965c6752a15
Diffstat (limited to 'src/core/gn_run.pro')
-rw-r--r-- | src/core/gn_run.pro | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro index 07635d04c..ee4e7892e 100644 --- a/src/core/gn_run.pro +++ b/src/core/gn_run.pro @@ -5,13 +5,6 @@ isQtMinimum(5, 8) { TEMPLATE = aux -defineReplace(runGn) { - message("Running: $$1") - !system($$1) { - error("GN run error!") - } -} - qtConfig(debug_and_release): CONFIG += debug_and_release build_all qtConfig(system-ninja) { @@ -42,16 +35,22 @@ build_pass|!debug_and_release { gn_args += is_debug=false } - gn_args += "qtwebengine_target=\"$$shell_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\"" + gn_args += "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\"" !qtConfig(system-gn) { - gn_binary = $$shell_quote($$shell_path($$gnPath())) + gn_binary = $$system_quote($$system_path($$gnPath())) } - gn_args = $$shell_quote($$gn_args) - gn_src_root = $$shell_quote($$shell_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir())) - gn_build_root = $$shell_quote($$shell_path($$OUT_PWD/$$getConfigDir())) - $$runGn($$gn_binary gen $$gn_build_root --args=$$gn_args --root=$$gn_src_root) + gn_args = $$system_quote($$gn_args) + gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir())) + gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir())) + gn_python = "--script-executable=$$pythonPathForSystem()" + gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root + + message("Running: $$gn_run ") + !system($$gn_run) { + error("GN run error!") + } runninja.commands = $$NINJA \$\(NINJAFLAGS\) -C $$gn_build_root QtWebEngineCore QMAKE_EXTRA_TARGETS += runninja |