Commit 77d9538e authored by hausmann@webkit.org's avatar hausmann@webkit.org

Make the new WTF module build on Qt

https://bugs.webkit.org/show_bug.cgi?id=76163

Reviewed by Tor Arne Vestbø.

.:

* WebKit.pro: Build the new WTF instead of the old one.

Source/JavaScriptCore:

* JavaScriptCore.pro: Removed wtf from the subdirs to build.

Source/WTF:

With this change the WTF sources are built _here_ but _from_ their old location using a VPATH.

* WTF.pri: Renamed from Source/JavaScriptCore/wtf/wtf.pri.
* WTF.pro: Renamed from Source/JavaScriptCore/wtf/wtf.pro.
* config.h: Bring this file in sync with JavaScriptCore/config.h with regards to the inclusion
/ definition of the export macros.

Tools:

* qmake/mkspecs/modules/wtf.prf: Pull in WTF from the new location.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@104825 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b996a3f0
2012-01-12 Simon Hausmann <simon.hausmann@nokia.com>
Make the new WTF module build on Qt
https://bugs.webkit.org/show_bug.cgi?id=76163
Reviewed by Tor Arne Vestbø.
* WebKit.pro: Build the new WTF instead of the old one.
2012-01-12 Shinya Kawanaka <shinyak@google.com>
ShadowContentElement should be able to use query.
......
2012-01-12 Simon Hausmann <simon.hausmann@nokia.com>
Make the new WTF module build on Qt
https://bugs.webkit.org/show_bug.cgi?id=76163
Reviewed by Tor Arne Vestbø.
* JavaScriptCore.pro: Removed wtf from the subdirs to build.
2012-01-11 Filip Pizlo <fpizlo@apple.com>
CodeBlock::m_executeCounter should be renamed to CodeBlock::m_jitExecuteCounter
......@@ -7,19 +7,13 @@
TEMPLATE = subdirs
CONFIG += ordered
WTF.file = wtf/wtf.pro
WTF.makefile = Makefile.WTF
SUBDIRS += WTF
derived_sources.file = DerivedSources.pri
target.file = Target.pri
!v8 {
derived_sources.file = DerivedSources.pri
target.file = Target.pri
SUBDIRS += derived_sources target
SUBDIRS += derived_sources target
addStrictSubdirOrderBetween(derived_sources, target)
addStrictSubdirOrderBetween(derived_sources, target)
jsc.file = jsc.pro
jsc.makefile = Makefile.jsc
SUBDIRS += jsc
}
jsc.file = jsc.pro
jsc.makefile = Makefile.jsc
SUBDIRS += jsc
2012-01-12 Simon Hausmann <simon.hausmann@nokia.com>
Make the new WTF module build on Qt
https://bugs.webkit.org/show_bug.cgi?id=76163
Reviewed by Tor Arne Vestbø.
With this change the WTF sources are built _here_ but _from_ their old location using a VPATH.
* WTF.pri: Renamed from Source/JavaScriptCore/wtf/wtf.pri.
* WTF.pro: Renamed from Source/JavaScriptCore/wtf/wtf.pro.
* config.h: Bring this file in sync with JavaScriptCore/config.h with regards to the inclusion
/ definition of the export macros.
2012-01-06 Benjamin Poulain <bpoulain@apple.com>
[Mac] Sort the resources of WTF.xcodeproj
......
......@@ -7,14 +7,15 @@
load(features)
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore/wtf
SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WTF
OLD_SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore/wtf
INCLUDEPATH += \
$$SOURCE_DIR/.. \
$$SOURCE_DIR \
$$SOURCE_DIR/gobject \
$$SOURCE_DIR/qt \
$$SOURCE_DIR/unicode
$$OLD_SOURCE_DIR/.. \
$$OLD_SOURCE_DIR \
$$OLD_SOURCE_DIR/gobject \
$$OLD_SOURCE_DIR/qt \
$$OLD_SOURCE_DIR/unicode
contains(CONFIG, use_system_icu) {
DEFINES += WTF_USE_ICU_UNICODE=1
......
......@@ -3,19 +3,14 @@
#
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
TEMPLATE = lib
TARGET = WTF
include(wtf.pri)
include(WTF.pri)
CONFIG += staticlib
QT += core
QT -= gui
*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
VPATH += $$PWD/../JavaScriptCore/wtf
HEADERS += \
Alignment.h \
......@@ -163,7 +158,6 @@ HEADERS += \
VMTags.h \
WTFThreadData.h
unix: HEADERS += ThreadIdentifierDataPthreads.h
SOURCES += \
......@@ -227,6 +221,13 @@ win*|wince*: SOURCES += \
ThreadSpecificWin.cpp \
ThreadingWin.cpp
QT += core
QT -= gui
*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
*sh4* {
QMAKE_CXXFLAGS += -mieee -w
QMAKE_CFLAGS += -mieee -w
......@@ -250,3 +251,4 @@ lessThan(QT_GCC_MAJOR_VERSION, 5) {
}
}
}
......@@ -28,25 +28,12 @@
#endif
#include <wtf/Platform.h>
/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
#if USE(EXPORT_MACROS)
#include <wtf/ExportMacros.h>
#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
#define WTF_EXPORT_PRIVATE WTF_EXPORT
#else
#define WTF_EXPORT_PRIVATE WTF_IMPORT
// WTF cannot depend on JSC even if USE(JSC).
#if USE(JSC) && !defined(BUILDING_WTF)
#include "JSExportMacros.h"
#endif
#else /* !USE(EXPORT_MACROS) */
#define WTF_EXPORT_PRIVATE
#define JS_EXPORT_PRIVATE
#endif /* USE(EXPORT_MACROS) */
#if OS(WINDOWS)
#ifndef _WIN32_WINNT
......
2012-01-12 Simon Hausmann <simon.hausmann@nokia.com>
Make the new WTF module build on Qt
https://bugs.webkit.org/show_bug.cgi?id=76163
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/modules/wtf.prf: Pull in WTF from the new location.
2012-01-12 Vsevolod Vlasov <vsevik@chromium.org>
Unreviewed, mac DumpRenderTree fix.
......@@ -4,6 +4,6 @@
# See 'Tools/qmake/README' for an overview of the build system
# -------------------------------------------------------------------
WEBKIT.wtf.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore/wtf
WEBKIT.wtf.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/WTF
include($${WEBKIT.wtf.root_source_dir}/wtf.pri)
include($${WEBKIT.wtf.root_source_dir}/WTF.pri)
......@@ -14,10 +14,15 @@ isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
# Otherwise we won't pick up the feature prf files needed for the build
}
# Always go into JavaScriptCore to at least build WTF.
JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
JavaScriptCore.makefile = Makefile.JavaScriptCore
SUBDIRS += JavaScriptCore
WTF.file = Source/WTF/WTF.pro
WTF.makefile = Makefile.WTF
SUBDIRS += WTF
!v8 {
JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
JavaScriptCore.makefile = Makefile.JavaScriptCore
SUBDIRS += JavaScriptCore
}
WebCore.file = Source/WebCore/WebCore.pro
WebCore.makefile = Makefile.WebCore
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment