From 2449e7fc567f8151736949032a001cf2aa2d5bb9 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Tue, 11 Aug 2009 21:05:17 +0200
Subject: QtScript building system change

Make new dependency: QScripttools on Webkit. This change is needed to
implement QScriptEngineAgent as child of JSC::Debugger.

Exclude common part from scripttool.pri and script.pri and move it to
webkit.pri
---
 src/script/script.pri           | 32 --------------------------------
 src/script/script.pro           |  2 ++
 src/script/webkit.pri           | 32 ++++++++++++++++++++++++++++++++
 src/scripttools/scripttools.pro |  1 +
 4 files changed, 35 insertions(+), 32 deletions(-)
 create mode 100644 src/script/webkit.pri

diff --git a/src/script/script.pri b/src/script/script.pri
index cb4b2bd..c5963ac 100644
--- a/src/script/script.pri
+++ b/src/script/script.pri
@@ -1,37 +1,5 @@
-# disable JIT for now
-DEFINES += ENABLE_JIT=0
-# FIXME: shared the statically built JavaScriptCore
-include($$PWD/../3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri)
-
 include($$PWD/api/api.pri)
 include($$PWD/bridge/bridge.pri)
 include($$PWD/parser/parser.pri)
 include($$PWD/visitors/visitors.pri)
 include($$PWD/utils/utils.pri)
-
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/parser
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/bytecompiler
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/debugger
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/runtime
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/wtf
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/unicode
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/interpreter
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/jit
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/profiler
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/wrec
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/API
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/bytecode
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/assembler
-INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/generated
-
-# FIXME: not needed once JSCBISON works
-# TODO: or leave it like this since the generated file is available anyway?
-SOURCES += $$PWD/../3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
-
-DEFINES += BUILDING_QT__=1
-DEFINES += USE_SYSTEM_MALLOC
-DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
-DEFINES += WTF_CHANGES=1
-DEFINES += NDEBUG
-
diff --git a/src/script/script.pro b/src/script/script.pro
index 9aa9bc2..efbeed2 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -9,4 +9,6 @@ DEFINES   += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
 include(../qbase.pri)
+include(webkit.pri)
 include(script.pri)
+
diff --git a/src/script/webkit.pri b/src/script/webkit.pri
new file mode 100644
index 0000000..d5e3571
--- /dev/null
+++ b/src/script/webkit.pri
@@ -0,0 +1,32 @@
+# disable JIT for now
+DEFINES += ENABLE_JIT=0
+# FIXME: shared the statically built JavaScriptCore
+include($$PWD/../3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri)
+
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/parser
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/bytecompiler
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/debugger
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/runtime
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/wtf
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/unicode
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/interpreter
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/jit
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/profiler
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/wrec
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/API
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/bytecode
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/assembler
+INCLUDEPATH += $$PWD/../3rdparty/webkit/JavaScriptCore/generated
+
+
+# FIXME: not needed once JSCBISON works
+# TODO: or leave it like this since the generated file is available anyway?
+SOURCES += $$PWD/../3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
+
+DEFINES += BUILDING_QT__=1
+DEFINES += USE_SYSTEM_MALLOC
+DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1
+DEFINES += WTF_CHANGES=1
+# DEFINES += NDEBUG
+
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index faf0936a..95af0e3 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -8,5 +8,6 @@ DEFINES   += QT_NO_USING_NAMESPACE
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript
 
 include(../qbase.pri)
+include(../script/webkit.pri)
 
 include(debugging/debugging.pri)
-- 
cgit v0.12