From 1c5e30928bd3ec31747276ff60940ec144a2cc16 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 18 Nov 2013 14:23:25 +0100 Subject: Moving sources to src part 2: Adjust paths. NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser Reviewed-by: Pierre Rossi --- tools/buildscripts/build_resources.py | 8 ++++---- tools/buildscripts/gyp_qtwebengine | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'tools/buildscripts') diff --git a/tools/buildscripts/build_resources.py b/tools/buildscripts/build_resources.py index 7b20aa9ad..56d8ed404 100755 --- a/tools/buildscripts/build_resources.py +++ b/tools/buildscripts/build_resources.py @@ -48,18 +48,18 @@ import sys import string import time -qtwebengine_src = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) +qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) chrome_src = subprocess.check_output("git config qtwebengine.chromiumsrcdir || true", shell=True).strip() if chrome_src: - chrome_src = os.path.join(qtwebengine_src, chrome_src) + chrome_src = os.path.join(qtwebengine_root, chrome_src) if not chrome_src or not os.path.isdir(chrome_src): - chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium') + chrome_src = os.path.join(qtwebengine_root, 'src/3rdparty/chromium') print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src grit_tool = os.path.join(chrome_src, 'tools/grit/grit.py') -resources_subdir = os.path.join(qtwebengine_src, 'resources') +resources_subdir = os.path.join(qtwebengine_root, 'src/core/resources') def checkNeedForRebuild(grd_file): grit_files = subprocess.check_output(['python', grit_tool, '-i', grd_file, 'buildinfo']).splitlines() diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index e715cb821..48491e600 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -7,19 +7,20 @@ import sys print 'using python: ' + sys.executable + ' version: ' + sys.version -qtwebengine_src = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) +qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')) +qtwebengine_src = os.path.join(qtwebengine_root, 'src') chrome_src = subprocess.check_output("git config qtwebengine.chromiumsrcdir || true", shell=True).strip() if chrome_src: - chrome_src = os.path.join(qtwebengine_src, chrome_src) + chrome_src = os.path.join(qtwebengine_root, chrome_src) if not chrome_src or not os.path.isdir(chrome_src): - chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium') + chrome_src = os.path.join(qtwebengine_root, 'src/3rdparty/chromium') print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src script_dir = os.path.abspath(os.path.join(chrome_src, 'build')) if not os.path.isdir(script_dir): print script_dir + " is not a valid directory" sys.exit(1) -root_dir = os.path.abspath(os.path.join(os.getcwd(), os.pardir)) +root_dir = os.path.abspath(os.path.join(os.getcwd(), os.pardir, os.pardir)) sys.path.insert(0, script_dir) import gyp_helper @@ -64,10 +65,10 @@ def additional_include_files(args=[]): AddInclude(os.path.join(script_dir, 'common.gypi')) # Used for additional build tweaks such as file exclusions - AddInclude(os.path.join(qtwebengine_src, 'build', 'qtwebengine_extras.gypi')) + AddInclude(os.path.join(qtwebengine_root, 'src', 'core', 'qtwebengine_extras.gypi')) # Common stuff we generate and extract from qmake - AddInclude(os.path.join(qtwebengine_src, 'build', 'qmake_extras.gypi')) + AddInclude(os.path.join(qtwebengine_root, 'src', 'core', 'qmake_extras.gypi')) # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) @@ -104,7 +105,7 @@ if __name__ == '__main__': break if not gyp_file_specified: - args.append(os.path.join(root_dir, 'qtwebengine.gyp')) + args.append(os.path.join(root_dir, 'src/core/core.gyp')) args.extend(['-I' + i for i in additional_include_files(args)]) -- cgit v1.2.3