From b1d9d6efa2ac138a15aac6b9f330a36a9d4a7390 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Wed, 30 Jan 2013 20:48:35 +0100
Subject: [PATCH] Make things more compliant with a regular Qt module

Move the v4 tool into basedir/tools/v4
Small fix to sync.profile
Install v4 into QT_INSTALL_BINS
adjust test262.py to simply call 'v4' by default

Change-Id: If78f40632c226bc26f64b0eea06fe93d7770af3e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/src.pro                      |  2 +-
 src/tools/tools.pro              | 18 ------------------
 src/v4/v4.pro                    |  2 +-
 sync.profile                     |  4 ++--
 tests/test262.py                 |  2 +-
 tools/tools.pro                  |  2 ++
 {src/tools => tools/v4}/main.cpp |  0
 tools/v4/v4.pro                  | 18 ++++++++++++++++++
 8 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 src/tools/tools.pro
 create mode 100644 tools/tools.pro
 rename {src/tools => tools/v4}/main.cpp (100%)
 create mode 100644 tools/v4/v4.pro

diff --git a/src/src.pro b/src/src.pro
index 7062854..75f8fb8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = v4 tools
+SUBDIRS = v4
 CONFIG += ordered
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
deleted file mode 100644
index b08f224..0000000
--- a/src/tools/tools.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = app
-QT = core v4 v4-private core-private qmldevtools-private
-SOURCES = main.cpp
-
-TARGET = v4
-
-INCLUDEPATH += ../v4
-INCLUDEPATH += ../3rdparty/masm
-INCLUDEPATH += ../3rdparty/masm/wtf
-INCLUDEPATH += ../3rdparty/masm/stubs
-INCLUDEPATH += ../3rdparty/masm/stubs/wtf
-INCLUDEPATH += ../3rdparty/masm/jit
-INCLUDEPATH += ../3rdparty/masm/assembler
-INCLUDEPATH += ../3rdparty/masm/disassembler
-
-DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
-DEFINES += QMLJS_NO_LLVM
-DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
diff --git a/src/v4/v4.pro b/src/v4/v4.pro
index 6f409ea..e2987da 100644
--- a/src/v4/v4.pro
+++ b/src/v4/v4.pro
@@ -138,7 +138,7 @@ linux-g++*:isEqual(QT_ARCH,i386) {
 }
 
 TESTSCRIPT=$$PWD/../../tests/test262.py
-V4CMD = $$OUT_PWD/../tools/v4
+V4CMD = v4
 
 checktarget.target = check
 checktarget.commands = python $$TESTSCRIPT --command=$$V4CMD --parallel --with-test-expectations --update-expectations
diff --git a/sync.profile b/sync.profile
index 4e6f5f7..d392e01 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,8 +1,8 @@
 %modules = ( # path to module name map
-    "QtV4" => "$basedir/src",
+    "QtV4" => "$basedir/src/v4",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
-    #"QtV4" => "3rdparty/masm;v4;",
+#    "QtV4" => "../3rdparty/;../v4;",
 );
 @allmoduleheadersprivate = (
     "QtV4"
diff --git a/tests/test262.py b/tests/test262.py
index 607fca7..25cfec3 100755
--- a/tests/test262.py
+++ b/tests/test262.py
@@ -113,7 +113,7 @@ EXCLUDE_LIST = [x.getAttribute("id") for x in EXCLUDE_LIST]
 
 def BuildOptions():
   result = optparse.OptionParser()
-  result.add_option("--command", default=path.abspath(rootDir + "/../v4"), help="The command-line to run")
+  result.add_option("--command", default="v4", help="The command-line to run")
   result.add_option("--tests", default=path.abspath(rootDir + '/test262'),
                     help="Path to the tests")
   result.add_option("--cat", default=False, action="store_true",
diff --git a/tools/tools.pro b/tools/tools.pro
new file mode 100644
index 0000000..f783b65
--- /dev/null
+++ b/tools/tools.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += v4
diff --git a/src/tools/main.cpp b/tools/v4/main.cpp
similarity index 100%
rename from src/tools/main.cpp
rename to tools/v4/main.cpp
diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro
new file mode 100644
index 0000000..db18753
--- /dev/null
+++ b/tools/v4/v4.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+QT = v4-private core-private qmldevtools-private
+SOURCES = main.cpp
+
+INCLUDEPATH += ../../src/v4
+INCLUDEPATH += ../../src/3rdparty/masm
+INCLUDEPATH += ../../src/3rdparty/masm/wtf
+INCLUDEPATH += ../../src/3rdparty/masm/stubs
+INCLUDEPATH += ../../src/3rdparty/masm/stubs/wtf
+INCLUDEPATH += ../../src/3rdparty/masm/jit
+INCLUDEPATH += ../../src/3rdparty/masm/assembler
+INCLUDEPATH += ../../src/3rdparty/masm/disassembler
+
+DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
+DEFINES += QMLJS_NO_LLVM
+DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
+
+load(qt_tool)
-- 
2.7.4