diff options
| author | Michael Forney <mforney@mforney.org> | 2019-12-19 16:36:36 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-01-22 23:54:34 -0800 |
| commit | 8412b9b3442345b17fe6618a56ed9ed08dfb7417 (patch) | |
| tree | 3d330fe9cc77f43c9216ad9dc32613e013d66f8d /src/buildtools | |
| parent | 46df03dc0f76628f569d63c08cc42f2e20062672 (diff) | |
Allow specifying ninja command to use with $NINJA
This was previously supported with $NINJA_PATH until 15a38cb0, when
the system-ninja test was added. However, since $NINJA seems to be the
more common environment variable for this purpose, use that instead.
This allows the builder to use a specific ninja version, or an
alternative implementation like samurai[0].
[0] https://github.com/michaelforney/samurai
Change-Id: Ib3206ce5032be1ccf2a98b45783e12afebb4949e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/configure.json | 8 | ||||
| -rw-r--r-- | src/buildtools/gn.pro | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index a36d05320..72405bd48 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -316,7 +316,8 @@ }, "webengine-ninja": { "label": "system ninja", - "type": "detectNinja" + "type": "detectNinja", + "log": "path" }, "webengine-python2": { "label": "python2", @@ -430,7 +431,10 @@ "webengine-system-ninja": { "label": "Use System Ninja", "condition": "tests.webengine-ninja", - "output": [ "privateFeature" ] + "output": [ + "privateFeature", + { "type": "varAssign", "name": "QMAKE_NINJA", "value": "tests.webengine-ninja.path" } + ] }, "webengine-system-fontconfig": { "label": "fontconfig", diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index 033202e6e..9e8cfe157 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -11,8 +11,6 @@ build_pass|!debug_and_release { buildgn.target = build_gn out = $$gnPath() out_path = $$dirname(out) - !qtConfig(webengine-system-ninja): ninja_path = $$ninjaPath() - else: ninja_path="ninja" # check if it is not already build !exists($$out) { src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") @@ -32,7 +30,7 @@ build_pass|!debug_and_release { !system("$$pythonPathForSystem() $$gn_configure") { error("GN generation error!") } - !system("cd $$system_quote($$system_path($$out_path)) && $$ninja_path $$basename(out)" ) { + !system("cd $$system_quote($$system_path($$out_path)) && $$system_quote($$system_path($$ninjaPath())) $$basename(out)" ) { error("GN build error!") } } |