Permalink
Browse files

Top-Level:

    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: http://svn.webkit.org/repository/webkit/trunk@38901 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
hausmann@webkit.org
hausmann@webkit.org committed Dec 2, 2008
1 parent 0497fce commit 75ad054e4f4f8cedc8a0fa83ca8fb7de2eabe09c
View
@@ -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.
View
@@ -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.
@@ -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
@@ -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
View
@@ -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
View
@@ -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.
View
@@ -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
View
@@ -2,7 +2,6 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += \
- JavaScriptCore \
WebCore \
JavaScriptCore/jsc.pro \
WebKit/qt/QtLauncher \

0 comments on commit 75ad054

Please sign in to comment.