summaryrefslogtreecommitdiffstats
path: root/tools/scripts
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/scripts
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/scripts')
-rwxr-xr-xtools/scripts/take_snapshot.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 1a697690..2a91923c 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()