Top-Level:
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Dec 2008 10:04:25 +0000 (10:04 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Dec 2008 10:04:25 +0000 (10:04 +0000)
    2008-12-02  Simon Hausmann  <hausmann@webkit.org>

            Reviewed by Tor Arne Vestbø.

            Removed JavaScriptCore from SUBDIRS as it's not built separately
            anymore.

WebCore:
    2008-12-02  Simon Hausmann  <hausmann@webkit.org>

            Reviewed by Tor Arne Vestbø.

            Build JavaScriptCore into libQtWebKit.so through a direct build
            instead of a static library. When linking a static library into
            a shared library qmake generates an incorrect .prl file, which
            causes all sorts of different build problems when linking against
            QtWebKit. Fixing this in qmake requires bigger changes that are
            currently not possible, so we need to work around this limitation
            for now. The advantages of the separate build did not outweight the
            build problems it caused.

JavaScriptCore:
    2008-12-02  Simon Hausmann  <hausmann@webkit.org>

            Reviewed by Tor Arne Vestbø.

            Fix ability to include JavaScriptCore.pri from other .pro files.

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

ChangeLog
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.pri
JavaScriptCore/JavaScriptCore.pro
JavaScriptCore/jsc.pro
WebCore/ChangeLog
WebCore/WebCore.pro
WebKit.pro

index ff55c54b5b2d27329929ee7a1db2d3c6fbd3a780..6a7b98a07bf3255e170a2493fa05d34553ed581f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-02  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Removed JavaScriptCore from SUBDIRS as it's not built separately
+        anymore.
+
+        * WebKit.pro:
+
 2008-11-28  Gustavo Noronha Silva  <gns@gnome.org>
 
         Reviewed and slightly modified by Holger Freyther.
index c11d8e195f2365bd05f56a98d2f88e2d62dd7eff..a2ac275eb38bf56c233f2607ad782b12d9a3a6e0 100644 (file)
@@ -1,3 +1,13 @@
+2008-12-02  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Fix ability to include JavaScriptCore.pri from other .pro files.
+
+        * JavaScriptCore.pri: Moved -O3 setting into the .pro files.
+        * JavaScriptCore.pro:
+        * jsc.pro:
+
 2008-12-01  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Cameron Zwarich, with help from Gavin Barraclough.
index e0673b6248e8ed4d39d6ed30e3236d16729180c9..70972c2a90a2ec4f28d29506afec4f9859b40c22 100644 (file)
@@ -172,5 +172,3 @@ kjsbison.dependency_type = TYPE_C
 kjsbison.CONFIG = target_predeps
 addExtraCompilerWithHeader(kjsbison)
 
-*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
-*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
index 19fb0fd6494b68a7490f5efdfb2e739aa12b183f..56dae058e66a94fd5a05ac6e6fde45d9233b396c 100644 (file)
@@ -67,3 +67,6 @@ QMAKE_EXTRA_TARGETS += generated_files
 qt-port: lessThan(QT_MINOR_VERSION, 4) {
     DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE=""
 }
+
+*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
index 507012890c87406e48a25d411ae2a2a4232e5a84..6262e627fe285c1cb1f6484a90638ea2930e9a25 100644 (file)
@@ -34,3 +34,6 @@ include($$PWD/JavaScriptCore.pri)
 lessThan(QT_MINOR_VERSION, 4) {
     DEFINES += QT_BEGIN_NAMESPACE="" QT_END_NAMESPACE=""
 }
+
+*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
index f290a58840e2f971af9a307eb38a2700942dfdad..310a2b4ee728e7ef89662712c84f8cb25fe9f857 100644 (file)
@@ -1,3 +1,20 @@
+2008-12-02  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Build JavaScriptCore into libQtWebKit.so through a direct build
+        instead of a static library. When linking a static library into
+        a shared library qmake generates an incorrect .prl file, which
+        causes all sorts of different build problems when linking against
+        QtWebKit. Fixing this in qmake requires bigger changes that are
+        currently not possible, so we need to work around this limitation
+        for now. The advantages of the separate build did not outweight the
+        build problems it caused.
+
+        * WebCore.pro: include JavaScriptCore.pri, re-enable prl support
+        and rename the lut generator to domlut to avoid a conflict with
+        JavaScriptCore.pri's lut generator.
+
 2008-12-02  David Levin  <levin@chromium.org>
 
         Reviewed by Alexey Proskuryakov.
index 5746500a7efff3d38ff5e6f6265b9378f53ef491..7df1ced4758e3fb6ac005c8dbaed45a1f25279ec 100644 (file)
@@ -11,7 +11,6 @@ contains(QT_CONFIG, embedded):CONFIG += embedded
 CONFIG(QTDIR_build) {
     GENERATED_SOURCES_DIR = $$PWD/generated
     include($$QT_SOURCE_TREE/src/qbase.pri)
-    !win32-msvc*: CONFIG -= create_prl
     PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
     DEFINES *= NDEBUG
 }
@@ -108,25 +107,7 @@ INCLUDEPATH += $$PWD $$PWD/../JavaScriptCore $$PWD/../JavaScriptCore/ForwardingH
                $$PWD/../JavaScriptCore/jit \
                $$PWD/../JavaScriptCore/wtf \
 
-contains(CONFIG, debug_and_release_target) {
-    CONFIG(debug, debug|release) {
-        LIBS += -L../JavaScriptCore/debug
-    } else {
-        LIBS += -L../JavaScriptCore/release
-    }
-} else {
-    LIBS += -L../JavaScriptCore
-}
-
-unset(JSCORE_LINKAGE)
-CONFIG(QTDIR_build) {
-    if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-        win32:JSCORE_LINKAGE = -lJavaScriptCored
-        mac:JSCORE_LINKAGE = -lJavaScriptCore_debug
-    }
-}
-isEmpty(JSCORE_LINKAGE):JSCORE_LINKAGE += -lJavaScriptCore
-LIBS += $$JSCORE_LINKAGE
+include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
 
 RESOURCES += \
     $$PWD/../WebCore/inspector/front-end/WebKit.qrc \
@@ -219,7 +200,7 @@ SVGCSSVALUES = $$PWD/css/SVGCSSValueKeywords.in
 
 STYLESHEETS_EMBED = $$PWD/css/html4.css
 
-LUT_FILES += \
+DOMLUT_FILES += \
     bindings/js/JSDOMWindowBase.cpp \
     bindings/js/JSRGBColor.cpp \
     bindings/js/JSWorkerContext.cpp
@@ -1858,21 +1839,12 @@ idl.CONFIG += target_predeps
 addExtraCompilerWithHeader(idl)
 
 # GENERATOR 2-A: LUT creator
-lut.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.lut.h
-lut.commands = perl $$PWD/../JavaScriptCore/create_hash_table ${QMAKE_FILE_NAME} -n WebCore > ${QMAKE_FILE_OUT}
-lut.depend = ${QMAKE_FILE_NAME}
-lut.input = LUT_FILES
-lut.CONFIG += no_link
-addExtraCompiler(lut)
-
-# GENERATOR 2-B: like JavaScriptCore/LUT Generator, but rename output
-luttable.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}Table.cpp
-luttable.commands = perl $$PWD/../JavaScriptCore/create_hash_table ${QMAKE_FILE_NAME} -n WebCore > ${QMAKE_FILE_OUT}
-luttable.depend = ${QMAKE_FILE_NAME}
-luttable.input = LUT_TABLE_FILES
-luttable.CONFIG += no_link
-luttable.dependency_type = TYPE_C
-addExtraCompiler(luttable)
+domlut.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.lut.h
+domlut.commands = perl $$PWD/../JavaScriptCore/create_hash_table ${QMAKE_FILE_NAME} -n WebCore > ${QMAKE_FILE_OUT}
+domlut.depend = ${QMAKE_FILE_NAME}
+domlut.input = DOMLUT_FILES
+domlut.CONFIG += no_link
+addExtraCompiler(domlut)
 
 # GENERATOR 3: tokenizer (flex)
 tokenizer.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
index 1cf103dafabf9834376dd542697b674f8c1aa739..f7d9bff4f7317fcf848444ecd32f2be1af8c0fd3 100644 (file)
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += \
-        JavaScriptCore \
         WebCore \
         JavaScriptCore/jsc.pro \
         WebKit/qt/QtLauncher \