summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-11-18 14:23:25 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-28 16:16:28 +0100
commit1c5e30928bd3ec31747276ff60940ec144a2cc16 (patch)
tree7ccc07f0687bae9b2fd6b6eb494d8e3b8663690b /tools
parentfd61d752e313bf91a09c85020b3fb50067c610c8 (diff)
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 <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildscripts/build_resources.py8
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine15
-rw-r--r--tools/qmake/mkspecs/features/default_pre.prf4
-rw-r--r--tools/qmake/mkspecs/features/functions.prf6
-rw-r--r--tools/qmake/mkspecs/features/gyp_generator.prf6
-rwxr-xr-xtools/scripts/take_snapshot.py8
6 files changed, 24 insertions, 23 deletions
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)])
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf
index 1e751b740..cec9be1bd 100644
--- a/tools/qmake/mkspecs/features/default_pre.prf
+++ b/tools/qmake/mkspecs/features/default_pre.prf
@@ -1,12 +1,12 @@
# Resolve root directories for sources
-QTWEBENGINE_ROOT = $$replace(PWD, /build/qmake/mkspecs/features$,)
+QTWEBENGINE_ROOT = $$replace(PWD, /tools/qmake/mkspecs/features$,)
QTWEBENGINEPROCESS_NAME = QtWebEngineProcess
git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
# Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used)
-isEmpty(git_chromium_src_dir): git_chromium_src_dir = "3rdparty/chromium"
+isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium"
CHROMIUM_SRC_DIR = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir")
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 9d90d67bd..0d0d37954 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -28,7 +28,7 @@ defineReplace(findMocables) {
input = $$1
for (file, input): \
infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
- mocables = $$system("python $$QTWEBENGINE_ROOT/build/scripts/find-mocables $$infiles")
+ mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles")
mocables = $$replace(mocables, $$_PRO_FILE_PWD_$${QMAKE_DIR_SEP}, '')
return($$mocables)
}
@@ -37,7 +37,7 @@ defineReplace(findIncludedMocFiles) {
input = $$1
for (file, input): \
infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
- return($$system("python $$QTWEBENGINE_ROOT/build/scripts/find-included-moc-files $$infiles"))
+ return($$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-included-moc-files $$infiles"))
}
defineReplace(mocOutput) {
@@ -93,7 +93,7 @@ defineReplace(findOrBuildNinja) {
!exists($$out) {
git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir")
# Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used)
- isEmpty(git_chromium_src_dir): git_chromium_src_dir = "3rdparty/chromium"
+ isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium"
win32: out = $$system_path($$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja.exe"))
else: out = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja")
# If we still did not find ninja, then we bootstrap it.
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index d15b864c9..ad87f5673 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -55,7 +55,7 @@ defineReplace(rccAction) {
return($$contents)
}
-GYPI_FILE = $$replace(_PRO_FILE_, .pro$, .gyp)
+isEmpty(GYPFILE): GYPFILE = $$replace(_PRO_FILE_, .pro$, .gyp)
TARGET_TYPE = $$toGypTargetType()
MOCABLE_HEADERS = $$findMocables($$HEADERS)
@@ -196,10 +196,10 @@ GYP_CONTENTS += " ]," \
GYP_CONTENTS += " ]," \
"}"
-!build_pass: write_file($$GYPI_FILE, GYP_CONTENTS)
+!build_pass: write_file($$GYPFILE, GYP_CONTENTS)
# Overwriting the generated gyp file seems like a good reason to re-gyp
-unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/build/build.pro")
+unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/src/core/gyp_run.pro")
# The generated Makefile shouldn't build anything by itself, just re-run qmake if necessary
TEMPLATE = aux
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 1a6976902..2a91923ca 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -51,8 +51,8 @@ import shutil
import git_submodule as GitSubmodule
-qtwebengine_src = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-os.chdir(qtwebengine_src)
+qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+os.chdir(qtwebengine_root)
def isInGitBlacklist(file_path):
# We do need all the gyp files.
@@ -129,8 +129,8 @@ def createHardLinkForFile(src, dst):
raise
-third_party_upstream = os.path.join(qtwebengine_src, '3rdparty_upstream')
-third_party = os.path.join(qtwebengine_src, '3rdparty')
+third_party_upstream = os.path.join(qtwebengine_root, 'src/3rdparty_upstream')
+third_party = os.path.join(qtwebengine_root, 'src/3rdparty')
def clearDirectory(directory):
currentDir = os.getcwd()