diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-31 14:33:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:24 +0000 |
| commit | 06e3d201299ab803f4dc41f35201830c74242d19 (patch) | |
| tree | 2f2100c24b051876eca4849c72e13a45dd8a2c0b /src/buildtools | |
| parent | c0419ae89fbc4fbdc58aef5b8b01ab0b45f8ff98 (diff) | |
Adapt to new GN submodule
Change-Id: I3980634a1029479ab944b2e03f12a02d0c77d0c1
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/gn.pro | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro index d8f57aee1..559cdf183 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -9,24 +9,20 @@ QT_FOR_CONFIG += webenginecore-private build_pass|!debug_and_release { !qtConfig(webengine-system-gn): CONFIG(release, debug|release) { buildgn.target = build_gn - gn_args = $$gnArgs() out = $$gnPath() - !qtConfig(webengine-system-ninja): ninja_path = "--path $$ninjaPath()" + out_path = $$dirname(out) + !qtConfig(webengine-system-ninja): ninja_path = $$ninjaPath() + else: ninja_path="ninja" # check if it is not already build !exists($$out) { - mkpath($$dirname(out)) src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") - gn_bootstrap = $$system_path($$absolute_path(chromium/tools/gn/bootstrap/bootstrap.py, $$src_3rd_party_dir)) + gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) - gn_args = $$system_quote($$gn_args) - win32:isDeveloperBuild() { - # GN is always built in release mode, which conflicts with incremental linking when - # doing a developer build of WebEngine. - gn_args = $$replace(gn_args, "use_incremental_linking=true ", "") + gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path + !system("$$pythonPathForSystem() $$gn_configure") { + error("GN generation error!") } - - gn_configure = $$system_quote($$gn_bootstrap) --shadow --gn-gen-args=$$gn_args $$ninja_path - !system("cd $$system_quote($$system_path($$dirname(out))) && $$pythonPathForSystem() $$gn_configure") { + !system("cd $$system_quote($$system_path($$out_path)) && $$ninja_path $$basename(out)" ) { error("GN build error!") } } |