2011-01-24 Andras Becsi <abecsi@webkit.org>
authorabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Jan 2011 10:36:47 +0000 (10:36 +0000)
committerabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Jan 2011 10:36:47 +0000 (10:36 +0000)
        Reviewed by Csaba Osztrogonác.

        [Qt] Move project files into Source
        https://bugs.webkit.org/show_bug.cgi?id=52891

        * Source/DerivedSources.pro: Copied from DerivedSources.pro.
        * Source/WebKit.pri: Renamed from WebKit.pri.
        * Source/WebKit.pro: Added.
        * Source/common.pri: Renamed from common.pri.
        * WebKit.pro: Removed.
2011-01-24  Andras Becsi  <abecsi@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] Move project files into Source
        https://bugs.webkit.org/show_bug.cgi?id=52891

        * JavaScriptCore.pri:
        * JavaScriptCore.pro:
        * jsc.pro:
2011-01-24  Andras Becsi  <abecsi@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] Move project files into Source
        https://bugs.webkit.org/show_bug.cgi?id=52891

        No new tests needed.

        * WebCore.pri:
        * WebCore.pro:
2011-01-24  Andras Becsi  <abecsi@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] Move project files into Source
        https://bugs.webkit.org/show_bug.cgi?id=52891

        * declarative/declarative.pro:
        * docs/docs.pri:
        * tests/tests.pri:
2011-01-24  Andras Becsi  <abecsi@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] Move project files into Source
        https://bugs.webkit.org/show_bug.cgi?id=52891

        * DerivedSources.pro:
        * WebKit2.pro:
        * WebProcess.pro:
2011-01-24  Andras Becsi  <abecsi@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] Move project files into Source
        https://bugs.webkit.org/show_bug.cgi?id=52891

        * DerivedSources.pro: Renamed from DerivedSources.pro.
        * DumpRenderTree/qt/DumpRenderTree.pro:
        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
        * MiniBrowser/DerivedSources.pro:
        * MiniBrowser/qt/MiniBrowser.pro:
        * QtTestBrowser/QtTestBrowser.pro:
        * Scripts/webkitdirs.pm:
        * Tools.pro: Added.
        * WebKitTestRunner/DerivedSources.pro:
        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
        * WebKitTestRunner/qt/WebKitTestRunner.pro:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76496 268f45cc-cd09-0410-ab3c-d52691b4dbfc

33 files changed:
ChangeLog
Source/DerivedSources.pro [moved from DerivedSources.pro with 61% similarity]
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.pri
Source/JavaScriptCore/JavaScriptCore.pro
Source/JavaScriptCore/jsc.pro
Source/WebCore/ChangeLog
Source/WebCore/WebCore.pri
Source/WebCore/WebCore.pro
Source/WebKit.pri [moved from WebKit.pri with 92% similarity]
Source/WebKit.pro [new file with mode: 0644]
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/declarative.pro
Source/WebKit/qt/docs/docs.pri
Source/WebKit/qt/tests/tests.pri
Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.pro
Source/WebKit2/WebKit2.pro
Source/WebKit2/WebProcess.pro
Source/common.pri [moved from common.pri with 100% similarity]
Tools/ChangeLog
Tools/DerivedSources.pro [new file with mode: 0644]
Tools/DumpRenderTree/qt/DumpRenderTree.pro
Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
Tools/MiniBrowser/DerivedSources.pro
Tools/MiniBrowser/qt/MiniBrowser.pro
Tools/QtTestBrowser/QtTestBrowser.pro
Tools/Scripts/webkitdirs.pm
Tools/Tools.pro [new file with mode: 0644]
Tools/WebKitTestRunner/DerivedSources.pro
Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
Tools/WebKitTestRunner/qt/WebKitTestRunner.pro
WebKit.pro [deleted file]

index 133ebd5..60790d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-24  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        * Source/DerivedSources.pro: Copied from DerivedSources.pro.
+        * Source/WebKit.pri: Renamed from WebKit.pri.
+        * Source/WebKit.pro: Added.
+        * Source/common.pri: Renamed from common.pri.
+        * WebKit.pro: Removed.
+
 2011-01-20  Siddharth Mathur  <siddharth.mathur@nokia.com>
 
         Reviewed by Laszlo Gombos.
similarity index 61%
rename from DerivedSources.pro
rename to Source/DerivedSources.pro
index 2df6b1f..41c6fd2 100644 (file)
@@ -2,15 +2,11 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += \
-        Source/JavaScriptCore/DerivedSources.pro \
-        Source/WebCore/DerivedSources.pro \
-        Source/WebKit/qt/Api/DerivedSources.pro
+        JavaScriptCore/DerivedSources.pro \
+        WebCore/DerivedSources.pro \
+        WebKit/qt/Api/DerivedSources.pro
 
-webkit2 {
-    SUBDIRS += Source/WebKit2/DerivedSources.pro \
-            Tools/WebKitTestRunner/DerivedSources.pro \
-            Tools/MiniBrowser/DerivedSources.pro
-}
+webkit2: SUBDIRS += WebKit2/DerivedSources.pro
 
 for(subpro, SUBDIRS) {
     subdir = $${dirname(subpro)}
index 5d2d2f4..14c9992 100644 (file)
@@ -1,3 +1,14 @@
+2011-01-24  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        * JavaScriptCore.pri:
+        * JavaScriptCore.pro:
+        * jsc.pro:
+
 2011-01-23  Mark Rowe  <mrowe@apple.com>
 
         Follow-up to r76477.
index a816c97..f57a062 100644 (file)
@@ -1,6 +1,6 @@
 # JavaScriptCore - Qt4 build info
 
-include(../../common.pri)
+include(../common.pri)
 
 VPATH += $$PWD
 
index ca31066..9d8a50c 100644 (file)
@@ -1,6 +1,6 @@
 # JavaScriptCore - qmake build info
 CONFIG += building-libs
-include($$PWD/../../WebKit.pri)
+include($$PWD/../WebKit.pri)
 include(JavaScriptCore.pri)
 
 TEMPLATE = lib
index 7c90f37..b4db812 100644 (file)
@@ -9,7 +9,7 @@ win32-*: CONFIG += console
 win32-msvc*: CONFIG += exceptions_off stl_off
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR= ..
-include($$PWD/../../WebKit.pri)
+include($$PWD/../WebKit.pri)
 
 unix:!mac:!symbian:CONFIG += link_pkgconfig
 
index 06d8d8a..2fe3b5b 100644 (file)
@@ -1,3 +1,15 @@
+2011-01-24  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        No new tests needed.
+
+        * WebCore.pri:
+        * WebCore.pro:
+
 2011-01-24  Kent Tamura  <tkent@chromium.org>
 
         Unreviewed, trivial fix.
index ad1835f..43ea483 100644 (file)
@@ -1,5 +1,5 @@
 
-include(../../common.pri)
+include(../common.pri)
 include(features.pri)
 
 CONFIG(standalone_package) {
index f550eca..b26ec4c 100644 (file)
@@ -79,7 +79,7 @@ symbian: {
 }
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ..
-include($$PWD/../../WebKit.pri)
+include($$PWD/../WebKit.pri)
 
 TEMPLATE = lib
 TARGET = QtWebKit
similarity index 92%
rename from WebKit.pri
rename to Source/WebKit.pri
index 676af7e..ab8a6d5 100644 (file)
@@ -4,14 +4,14 @@
 # either the generated files directory or as part of the Qt package through
 # QTDIR_build
 CONFIG(QTDIR_build): CONFIG += standalone_package
-else:exists($$PWD/Source/WebCore/generated): CONFIG += standalone_package
+else:exists($$PWD/WebCore/generated): CONFIG += standalone_package
 
 CONFIG += depend_includepath
 DEPENDPATH += $$OUT_PWD
 
 DEFINES += BUILDING_QT__=1
 building-libs {
-    win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/Source/JavaScriptCore/os-win32
+    win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
 } else {
     CONFIG(QTDIR_build) {
         QT += webkit
@@ -32,7 +32,7 @@ building-libs {
                 symbian {
                     TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB
                     # For EXEs only: set heap to usable value
-                    TARGET.EPOCHEAPSIZE = 
+                    TARGET.EPOCHEAPSIZE =
                     heapSizeRule = \
                     "$${LITERAL_HASH}ifdef WINSCW" \
                         "EPOCHEAPSIZE  0x40000 0x2000000 // Min 256kB, Max 32MB" \
@@ -44,7 +44,7 @@ building-libs {
             }
         }
     }
-    DEPENDPATH += $$PWD/Source/WebKit/qt/Api
+    DEPENDPATH += $$PWD/WebKit/qt/Api
 }
 
 !mac:!unix|symbian {
@@ -55,7 +55,7 @@ CONFIG(release, debug|release) {
     DEFINES += NDEBUG
 }
 
-INCLUDEPATH += $$OUTPUT_DIR/Source/include/QtWebKit
+INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
 
 CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
@@ -70,7 +70,7 @@ symbian|*-armcc {
     RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293
     RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates
     # Make debug symbols leaner in RVCT4.x. Ignored by compiler for release builds
-    QMAKE_CXXFLAGS.ARMCC_4_0 += --remove_unneeded_entities 
+    QMAKE_CXXFLAGS.ARMCC_4_0 += --remove_unneeded_entities
 }
 
 *-armcc {
diff --git a/Source/WebKit.pro b/Source/WebKit.pro
new file mode 100644 (file)
index 0000000..a6be4b6
--- /dev/null
@@ -0,0 +1,36 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+include(WebKit.pri)
+
+!v8 {
+    exists($$PWD/JavaScriptCore/JavaScriptCore.pro): SUBDIRS += JavaScriptCore/JavaScriptCore.pro
+    exists($$PWD/JavaScriptCore/jsc.pro): SUBDIRS += JavaScriptCore/jsc.pro
+}
+
+webkit2:exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
+
+SUBDIRS += WebCore
+
+webkit2:exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+
+contains(QT_CONFIG, declarative) {
+    exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
+}
+
+exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
+
+build-qtscript {
+    SUBDIRS += \
+        JavaScriptCore/qt/api/QtScript.pro \
+        JavaScriptCore/qt/tests \
+        JavaScriptCore/qt/benchmarks
+}
+
+symbian {
+    # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
+    install.commands = $(MAKE) -C WebCore install
+    QMAKE_EXTRA_TARGETS += install
+}
+
+include(WebKit/qt/docs/docs.pri)
index 445a2a2..8d49fa1 100644 (file)
@@ -1,3 +1,14 @@
+2011-01-24  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        * declarative/declarative.pro:
+        * docs/docs.pri:
+        * tests/tests.pri:
+
 2011-01-22  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Reviewed by Pavel Feldman.
index bc94eed..526cf06 100644 (file)
@@ -33,7 +33,7 @@ symbian: {
     TARGET = $$TARGET$${QT_LIBINFIX}
 }
 
-include(../../../../WebKit.pri)
+include(../../../WebKit.pri)
 
 QT += declarative
 
index d87dcd6..a56ddb4 100644 (file)
@@ -1,4 +1,4 @@
-include(../../../../WebKit.pri)
+include(../../../WebKit.pri)
 
 unix {
     QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
index 2e30dd0..a795ff8 100644 (file)
@@ -10,7 +10,7 @@ INCLUDEPATH += \
     $$PWD \
     $$PWD/../Api
 
-include(../../../../WebKit.pri)
+include(../../../WebKit.pri)
 QT += testlib network
 
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
index 07f641d..331f0ab 100644 (file)
@@ -1,3 +1,14 @@
+2011-01-24  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        * DerivedSources.pro:
+        * WebKit2.pro:
+        * WebProcess.pro:
+
 2011-01-23  Damian Kaleta  <dkaleta@apple.com>
 
         Reviewed by Kevin Decker.
index 4164203..d7d4a7b 100644 (file)
@@ -41,7 +41,7 @@ SBOX_CHECK = $$(_SBOX_DIR)
     PYTHON = python
 }
 
-SRC_ROOT_DIR = $$replace(PWD, /Source/WebKit2, /)
+SRC_ROOT_DIR = $$replace(PWD, /Source/WebKit2, "")
 
 defineTest(addExtraCompiler) {
     eval($${1}.CONFIG = target_predeps no_link)
@@ -111,19 +111,19 @@ SCRIPTS = \
     $$PWD/Scripts/webkit2/__init__.py \
     $$PWD/Scripts/webkit2/messages.py
 
-message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}Source/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+message_header_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
 message_header_generator.input = MESSAGE_RECEIVERS
 message_header_generator.depends = $$SCRIPTS
 message_header_generator.output_function = message_header_generator_output
 addExtraCompiler(message_header_generator)
 
-message_receiver_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}Source/WebKit2/Scripts/generate-message-receiver.py  ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+message_receiver_generator.commands = $${PYTHON} $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-message-receiver.py  ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
 message_receiver_generator.input = MESSAGE_RECEIVERS
 message_receiver_generator.depends = $$SCRIPTS
 message_receiver_generator.output_function = message_receiver_generator_output
 addExtraCompiler(message_receiver_generator)
 
-fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebKit2 ../../include qt
+fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Source/WebKit2 ../include qt
 fwheader_generator.depends  = $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl
 generated_files.depends     += fwheader_generator
 QMAKE_EXTRA_TARGETS         += fwheader_generator
index c478636..ed6bf1b 100644 (file)
@@ -13,8 +13,8 @@ CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
 }
 
-include($$PWD/../../WebKit.pri)
-include($$PWD/../../common.pri)
+include($$PWD/../WebKit.pri)
+include($$PWD/../common.pri)
 include($$PWD/../WebCore/features.pri)
 include(WebKit2.pri)
 
index 94f49cd..bc0b878 100644 (file)
@@ -5,7 +5,7 @@ SOURCES += \
     qt/MainQt.cpp
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
-include(../../WebKit.pri)
+include($$PWD/../WebKit.pri)
 
 DESTDIR = $$OUTPUT_DIR/bin
 !CONFIG(standalone_package): CONFIG -= app_bundle
similarity index 100%
rename from common.pri
rename to Source/common.pri
index 6376264..2ec6ead 100644 (file)
@@ -1,3 +1,22 @@
+2011-01-24  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Move project files into Source
+        https://bugs.webkit.org/show_bug.cgi?id=52891
+
+        * DerivedSources.pro: Renamed from DerivedSources.pro.
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+        * MiniBrowser/DerivedSources.pro:
+        * MiniBrowser/qt/MiniBrowser.pro:
+        * QtTestBrowser/QtTestBrowser.pro:
+        * Scripts/webkitdirs.pm:
+        * Tools.pro: Added.
+        * WebKitTestRunner/DerivedSources.pro:
+        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
+        * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
 2011-01-22  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Tools/DerivedSources.pro b/Tools/DerivedSources.pro
new file mode 100644 (file)
index 0000000..55a26a2
--- /dev/null
@@ -0,0 +1,16 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += \
+    MiniBrowser/DerivedSources.pro \
+    WebKitTestRunner/DerivedSources.pro
+
+for(subpro, SUBDIRS) {
+    subdir = $${dirname(subpro)}
+    subtarget = $$replace(subpro, [^a-zA-Z0-9_], -)
+    eval($${subtarget}.makefile = "Makefile.DerivedSources")
+    eval(generated_files-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f Makefile.DerivedSources generated_files))
+    QMAKE_EXTRA_TARGETS += generated_files-$${subtarget}
+    generated_files.depends += generated_files-$${subtarget}
+}
+QMAKE_EXTRA_TARGETS += generated_files
index a7c6c26..d84af96 100644 (file)
@@ -5,12 +5,12 @@ CONFIG += uitools
 BASEDIR = $$PWD/../
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
 
-include(../../../WebKit.pri)
+include(../../../Source/WebKit.pri)
 INCLUDEPATH += ../../../Source
 INCLUDEPATH += ../../../Source/JavaScriptCore
 INCLUDEPATH += ../../../Source/JavaScriptCore/ForwardingHeaders
 INCLUDEPATH += $$BASEDIR
-DESTDIR = ../../../bin
+DESTDIR = ../../bin
 
 unix:!mac:!symbian {
     CONFIG += link_pkgconfig
index 6f96d0a..176c4c4 100644 (file)
@@ -3,7 +3,7 @@ TARGET = TestNetscapePlugIn
 
 VPATH = ../../unix/TestNetscapePlugin ../../TestNetscapePlugIn
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
-include(../../../../WebKit.pri)
+include(../../../../Source/WebKit.pri)
 
 DESTDIR = $$OUTPUT_DIR/lib/plugins
 
index 3ca89ad..8674beb 100644 (file)
@@ -7,12 +7,13 @@ TARGET = dummy
 
 QMAKE_EXTRA_TARGETS += generated_files
 
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
 SRC_ROOT_DIR = $$replace(PWD, "/Tools/MiniBrowser", "")
 
-!exists($$OUTPUT_DIR/Tools/MiniBrowser/qt):system($$QMAKE_MKDIR $$OUTPUT_DIR/Tools/MiniBrowser/qt)
+!exists($$OUTPUT_DIR/MiniBrowser/qt): system($$QMAKE_MKDIR $$OUTPUT_DIR/MiniBrowser/qt)
 
 ualist_copier.input = $$SRC_ROOT_DIR/Tools/QtTestBrowser/useragentlist.txt
-ualist_copier.output = $$OUTPUT_DIR/Tools/MiniBrowser/qt/useragentlist.txt
+ualist_copier.output = $$OUTPUT_DIR/MiniBrowser/qt/useragentlist.txt
 ualist_copier.tempNames = $$ualist_copier.input $$ualist_copier.output
 ualist_copier.commands = $$QMAKE_COPY $$replace(ualist_copier.tempNames, "/", $$QMAKE_DIR_SEP)
 ualist_copier.depends = $$ualist_copier.input
@@ -24,7 +25,7 @@ QMAKE_EXTRA_TARGETS += ualist_copier
 # polluting the source tree.
 
 qrc_copier.input = $$SRC_ROOT_DIR/Tools/MiniBrowser/MiniBrowser.qrc
-qrc_copier.output = $$OUTPUT_DIR/Tools/MiniBrowser/qt/MiniBrowser.qrc
+qrc_copier.output = $$OUTPUT_DIR/MiniBrowser/qt/MiniBrowser.qrc
 qrc_copier.tempNames = $$qrc_copier.input $$qrc_copier.output
 qrc_copier.commands = $$QMAKE_COPY $$replace(qrc_copier.tempNames, "/", $$QMAKE_DIR_SEP)
 qrc_copier.depends = ualist_copier $$qrc_copier.input
index c297207..84bbb33 100644 (file)
@@ -13,7 +13,7 @@ HEADERS += \
 CONFIG += uitools
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
-include(../../../WebKit.pri)
+include(../../../Source/WebKit.pri)
 
 INCLUDEPATH += \
     $$PWD/../../../Source/WebKit2/ \
@@ -55,4 +55,4 @@ contains(QT_CONFIG, opengl) {
 # We copy the resource file to the build directory.
 # The copier is defined in Tools/MiniBrowser/DerivedSources.pro.
 RESOURCES += \
-    $$OUTPUT_DIR/Tools/MiniBrowser/qt/MiniBrowser.qrc
+    $$OUTPUT_DIR/MiniBrowser/qt/MiniBrowser.qrc
index 62d2c02..6c8cdf4 100644 (file)
@@ -25,7 +25,7 @@ HEADERS += \
 CONFIG += uitools
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
-include(../../WebKit.pri)
+include(../../Source/WebKit.pri)
 
 DESTDIR = $$OUTPUT_DIR/bin
 !CONFIG(standalone_package): CONFIG -= app_bundle
index 0ead831..9fc7c72 100644 (file)
@@ -356,7 +356,7 @@ sub productDir
 sub jscProductDir
 {
     my $productDir = productDir();
-    $productDir .= "/Source/JavaScriptCore" if isQt();
+    $productDir .= "JavaScriptCore" if isQt();
     $productDir .= "/$configuration" if (isQt() && isWindows());
     $productDir .= "/Programs" if (isGtk() || isEfl());
 
@@ -1580,7 +1580,7 @@ sub buildQMakeProject($@)
 
     my @dsQmakeArgs = @buildArgs;
     push @dsQmakeArgs, "-r";
-    push @dsQmakeArgs, sourceDir() . "/DerivedSources.pro";
+    push @dsQmakeArgs, sourceDir() . "/Source/DerivedSources.pro";
     push @dsQmakeArgs, "-o Makefile.DerivedSources";
     print "Calling '$qmakebin @dsQmakeArgs' in " . $dir . "\n\n";
     my $result = system "$qmakebin @dsQmakeArgs";
@@ -1588,18 +1588,29 @@ sub buildQMakeProject($@)
         die "Failed while running $qmakebin to generate derived sources!\n";
     }
 
-    my $dsMakefile = "Makefile.DerivedSources";
-
-    # Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60
-    my @subdirs = ("Source/JavaScriptCore", "Source/WebCore", "Source/WebKit/qt/Api");
+    # FIXME: Iterate over different source directories manually to workaround a problem with qmake+extraTargets+s60
+    # To avoid overwriting of Makefile.DerivedSources in the root dir use Makefile.DerivedSources.Tools for Tools
+    my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
     if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
-        push @subdirs, "Source/WebKit2";
-        push @subdirs, "Tools/WebKitTestRunner";
-        push @subdirs, "Tools/MiniBrowser";
+        push @subdirs, "WebKit2";
+        if ( -e sourceDir() ."/Tools/DerivedSources.pro" ) {
+            @dsQmakeArgs = @buildArgs;
+            push @dsQmakeArgs, "-r";
+            push @dsQmakeArgs, sourceDir() . "/Tools/DerivedSources.pro";
+            push @dsQmakeArgs, "-o Makefile.DerivedSources.Tools";
+            print "Calling '$qmakebin @dsQmakeArgs' in " . $dir . "\n\n";
+            my $result = system "$qmakebin @dsQmakeArgs";
+            if ($result ne 0) {
+                die "Failed while running $qmakebin to generate derived sources for Tools!\n";
+            }
+            push @subdirs, "MiniBrowser";
+            push @subdirs, "WebKitTestRunner";
+        }
     }
 
     for my $subdir (@subdirs) {
-        print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/$subdir\n\n";
+        my $dsMakefile = "Makefile.DerivedSources";
+        print "Calling '$make $makeargs -C $subdir -f $dsMakefile generated_files' in " . $dir . "/$subdir\n\n";
         if ($make eq "nmake") {
             my $subdirWindows = $subdir;
             $subdirWindows =~ s:/:\\:g;
@@ -1626,8 +1637,7 @@ sub buildQMakeProject($@)
         }
     }
 
-    push @buildArgs, sourceDir() . "/WebKit.pro";
-
+    push @buildArgs, sourceDir() . "/Source/WebKit.pro";
     print "Calling '$qmakebin @buildArgs' in " . $dir . "\n\n";
     print "Installation headers directory: $installHeaders\n" if(defined($installHeaders));
     print "Installation libraries directory: $installLibs\n" if(defined($installLibs));
@@ -1637,8 +1647,16 @@ sub buildQMakeProject($@)
        die "Failed to setup build environment using $qmakebin!\n";
     }
 
+    $buildArgs[-1] = sourceDir() . "/Tools/Tools.pro";
+    print "Calling '$qmakebin @buildArgs -o Makefile.Tools' in " . $dir . "\n\n";
+
+    $result = system "$qmakebin @buildArgs -o Makefile.Tools";
+    if ($result ne 0) {
+       die "Failed to setup build environment using $qmakebin!\n";
+    }
+
     # Manually create makefiles for the examples so we don't build by default
-    my $examplesDir = $dir . "/Source/WebKit/qt/examples";
+    my $examplesDir = $dir . "/WebKit/qt/examples";
     File::Path::mkpath($examplesDir);
     $buildArgs[-1] = sourceDir() . "/Source/WebKit/qt/examples/examples.pro";
     chdir $examplesDir or die;
@@ -1647,9 +1665,16 @@ sub buildQMakeProject($@)
     die "Failed to create makefiles for the examples!\n" if $result ne 0;
     chdir $dir or die;
 
+    my $makeTools = "echo No Makefile for Tools. Skipping make";
+
+    if (-e "$dir/Makefile.Tools") {
+        $makeTools = "$make $makeargs -f Makefile.Tools";
+    }
+
     if ($clean) {
       print "Calling '$make $makeargs distclean' in " . $dir . "\n\n";
       $result = system "$make $makeargs distclean";
+      $result = $result || system "$makeTools distclean";
     } elsif (isSymbian()) {
       print "\n\nWebKit is now configured for building, but you have to make\n";
       print "a choice about the target yourself. To start the build run:\n\n";
@@ -1657,6 +1682,7 @@ sub buildQMakeProject($@)
     } else {
       print "Calling '$make $makeargs' in " . $dir . "\n\n";
       $result = system "$make $makeargs";
+      $result = $result || system "$makeTools";
     }
 
     chdir ".." or die;
diff --git a/Tools/Tools.pro b/Tools/Tools.pro
new file mode 100644 (file)
index 0000000..ca4ba3d
--- /dev/null
@@ -0,0 +1,15 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+exists($$PWD/QtTestBrowser/QtTestBrowser.pro): SUBDIRS += QtTestBrowser/QtTestBrowser.pro
+exists($$PWD/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += DumpRenderTree/qt/DumpRenderTree.pro
+exists($$PWD/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += DumpRenderTree/qt/ImageDiff.pro
+
+webkit2 {
+    exists($$PWD/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
+    exists($$PWD/WebKitTestRunner/WebKitTestRunner.pro): SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+}
+
+!win32:!symbian {
+    exists($$PWD/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro): SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+}
index 1e4e461..ce7ac63 100644 (file)
@@ -34,7 +34,7 @@ defineTest(addExtraCompiler) {
     return(true)
 }
 
-SRC_ROOT_DIR = $$replace(PWD, /Tools/WebKitTestRunner, /)
+SRC_ROOT_DIR = $$replace(PWD, /Tools/WebKitTestRunner, "")
 
 # Make sure forwarded headers needed by this project are present
 fwheader_generator.commands = perl $${SRC_ROOT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/Tools/WebKitTestRunner $${OUTPUT_DIR}/include qt
index 92d31b8..3d89727 100644 (file)
@@ -43,11 +43,11 @@ HEADERS += \
     OBJECTS_DIR = obj/release
 }
 
-include(../../../../WebKit.pri)
+include(../../../../Source/WebKit.pri)
 include(../../../../Source/JavaScriptCore/JavaScriptCore.pri)
-addJavaScriptCoreLib(../../../../Source/JavaScriptCore)
+addJavaScriptCoreLib(../../../JavaScriptCore)
 include(../../../../Source/WebKit2/WebKit2.pri)
-addWebKit2Lib(../../../../Source/WebKit2)
+addWebKit2Lib(../../../WebKit2)
 
 INCLUDEPATH += \
     $$PWD \
index 73ab4b0..de648ea 100644 (file)
@@ -6,7 +6,7 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
 GENERATED_SOURCES_DIR = ../generated
 
 
-include(../../../WebKit.pri)
+include(../../../Source/WebKit.pri)
 
 !CONFIG(release, debug|release) {
     OBJECTS_DIR = obj/debug
@@ -68,4 +68,4 @@ linux-* {
 }
 
 include(../../../Source/JavaScriptCore/JavaScriptCore.pri)
-addJavaScriptCoreLib(../../../Source/JavaScriptCore)
+addJavaScriptCoreLib(../../JavaScriptCore)
diff --git a/WebKit.pro b/WebKit.pro
deleted file mode 100644 (file)
index 2c79ef8..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-include(WebKit.pri)
-
-!v8: SUBDIRS += Source/JavaScriptCore
-webkit2 {
-    SUBDIRS += Source/WebKit2
-}
-SUBDIRS += Source/WebCore
-
-# If the source exists, built it
-exists($$PWD/Tools/QtTestBrowser): SUBDIRS += Tools/QtTestBrowser
-contains(QT_CONFIG, declarative) {
-    exists($$PWD/Source/WebKit/qt/declarative): SUBDIRS += Source/WebKit/qt/declarative
-}
-!v8:exists($$PWD/Source/JavaScriptCore/jsc.pro): SUBDIRS += Source/JavaScriptCore/jsc.pro
-exists($$PWD/Source/WebKit/qt/tests): SUBDIRS += Source/WebKit/qt/tests
-exists($$PWD/Tools/DumpRenderTree/qt/DumpRenderTree.pro): SUBDIRS += Tools/DumpRenderTree/qt/DumpRenderTree.pro
-exists($$PWD/Tools/DumpRenderTree/qt/ImageDiff.pro): SUBDIRS += Tools/DumpRenderTree/qt/ImageDiff.pro
-
-!win32:!symbian {
-    exists($$PWD/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro): SUBDIRS += Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
-}
-
-build-qtscript {
-    SUBDIRS += \
-        Source/JavaScriptCore/qt/api/QtScript.pro \
-        Source/JavaScriptCore/qt/tests \
-        Source/JavaScriptCore/qt/benchmarks
-}
-
-webkit2 {
-    exists($$PWD/Source/WebKit2/WebProcess.pro): SUBDIRS += Source/WebKit2/WebProcess.pro
-    exists($$PWD/Tools/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += Tools/MiniBrowser/qt/MiniBrowser.pro
-    exists($$PWD/Tools/WebKitTestRunner/WebKitTestRunner.pro): SUBDIRS += Tools/WebKitTestRunner/WebKitTestRunner.pro
-}
-
-symbian {
-    # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
-    install.commands = $(MAKE) -C WebCore install
-    QMAKE_EXTRA_TARGETS += install
-}
-
-include(Source/WebKit/qt/docs/docs.pri)