Changeset 104825 in webkit


Ignore:
Timestamp:
Jan 12, 2012 7:14:56 AM (12 years ago)
Author:
Simon Hausmann
Message:

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:

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.
Location:
trunk
Files:
8 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r104805 r104825  
     12012-01-12  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Make the new WTF module build on Qt
     4        https://bugs.webkit.org/show_bug.cgi?id=76163
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * WebKit.pro: Build the new WTF instead of the old one.
     9
    1102012-01-12  Shinya Kawanaka  <shinyak@google.com>
    211

  • trunk/Source/JavaScriptCore/ChangeLog

    r104787 r104825  
     12012-01-12  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Make the new WTF module build on Qt
     4        https://bugs.webkit.org/show_bug.cgi?id=76163
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * JavaScriptCore.pro: Removed wtf from the subdirs to build.
     9
    1102012-01-11  Filip Pizlo  <fpizlo@apple.com>
    211

  • trunk/Source/JavaScriptCore/JavaScriptCore.pro

    r102125 r104825  
    88CONFIG += ordered
    99
    10 WTF.file = wtf/wtf.pro
    11 WTF.makefile = Makefile.WTF
    12 SUBDIRS += WTF
     10derived_sources.file = DerivedSources.pri
     11target.file = Target.pri
    1312
    14 !v8 {
    15     derived_sources.file = DerivedSources.pri
    16     target.file = Target.pri
     13SUBDIRS += derived_sources target
    1714
    18     SUBDIRS += derived_sources target
     15addStrictSubdirOrderBetween(derived_sources, target)
    1916
    20     addStrictSubdirOrderBetween(derived_sources, target)
    21 
    22     jsc.file = jsc.pro
    23     jsc.makefile = Makefile.jsc
    24     SUBDIRS += jsc
    25 }
     17jsc.file = jsc.pro
     18jsc.makefile = Makefile.jsc
     19SUBDIRS += jsc

  • trunk/Source/WTF/ChangeLog

    r104323 r104825  
     12012-01-12  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Make the new WTF module build on Qt
     4        https://bugs.webkit.org/show_bug.cgi?id=76163
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        With this change the WTF sources are built _here_ but _from_ their old location using a VPATH.
     9
     10        * WTF.pri: Renamed from Source/JavaScriptCore/wtf/wtf.pri.
     11        * WTF.pro: Renamed from Source/JavaScriptCore/wtf/wtf.pro.
     12        * config.h: Bring this file in sync with JavaScriptCore/config.h with regards to the inclusion
     13        / definition of the export macros.
     14
    1152012-01-06  Benjamin Poulain  <bpoulain@apple.com>
    216

  • trunk/Source/WTF/WTF.pri

    r104824 r104825  
    88load(features)
    99
    10 SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore/wtf
     10SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WTF
     11OLD_SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore/wtf
    1112
    1213INCLUDEPATH += \
    13     $$SOURCE_DIR/.. \
    14     $$SOURCE_DIR \
    15     $$SOURCE_DIR/gobject \
    16     $$SOURCE_DIR/qt \
    17     $$SOURCE_DIR/unicode
     14    $$OLD_SOURCE_DIR/.. \
     15    $$OLD_SOURCE_DIR \
     16    $$OLD_SOURCE_DIR/gobject \
     17    $$OLD_SOURCE_DIR/qt \
     18    $$OLD_SOURCE_DIR/unicode
    1819
    1920contains(CONFIG, use_system_icu) {

  • trunk/Source/WTF/WTF.pro

    r104824 r104825  
    44# See 'Tools/qmake/README' for an overview of the build system
    55# -------------------------------------------------------------------
    6 
    76TEMPLATE = lib
    87TARGET = WTF
    98
    10 include(wtf.pri)
     9include(WTF.pri)
    1110
    1211CONFIG += staticlib
    1312
    14 QT += core
    15 QT -= gui
    16 
    17 *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
    18 *-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
     13VPATH += $$PWD/../JavaScriptCore/wtf
    1914
    2015HEADERS += \
    … …  
    164159    WTFThreadData.h
    165160
    166 
    167161unix: HEADERS += ThreadIdentifierDataPthreads.h
    168162
    … …  
    228222    ThreadingWin.cpp
    229223
     224
     225QT += core
     226QT -= gui
     227
     228*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
     229*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
     230
    230231*sh4* {
    231232    QMAKE_CXXFLAGS += -mieee -w
    … …  
    251252    }
    252253}
     254

  • trunk/Source/WTF/config.h

    r100850 r104825  
    2929
    3030#include <wtf/Platform.h>
    31 
    32 /* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
    33 #if USE(EXPORT_MACROS)
    34 
    3531#include <wtf/ExportMacros.h>
    36 
    37 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
    38 #define WTF_EXPORT_PRIVATE WTF_EXPORT
    39 #else
    40 #define WTF_EXPORT_PRIVATE WTF_IMPORT
     32// WTF cannot depend on JSC even if USE(JSC).
     33#if USE(JSC) && !defined(BUILDING_WTF)
     34#include "JSExportMacros.h"
    4135#endif
    42 
    43 #else /* !USE(EXPORT_MACROS) */
    44 
    45 #define WTF_EXPORT_PRIVATE
    46 #define JS_EXPORT_PRIVATE
    47 
    48 #endif /* USE(EXPORT_MACROS) */
    4936
    5037#if OS(WINDOWS)

  • trunk/Tools/ChangeLog

    r104820 r104825  
     12012-01-12  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Make the new WTF module build on Qt
     4        https://bugs.webkit.org/show_bug.cgi?id=76163
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * qmake/mkspecs/modules/wtf.prf: Pull in WTF from the new location.
     9
    1102012-01-12  Vsevolod Vlasov  <vsevik@chromium.org>
    211

  • trunk/Tools/qmake/mkspecs/modules/wtf.prf

    r104285 r104825  
    55# -------------------------------------------------------------------
    66
    7 WEBKIT.wtf.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore/wtf
     7WEBKIT.wtf.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/WTF
    88
    9 include($${WEBKIT.wtf.root_source_dir}/wtf.pri)
     9include($${WEBKIT.wtf.root_source_dir}/WTF.pri)

  • trunk/WebKit.pro

    r104285 r104825  
    1515}
    1616
    17 # Always go into JavaScriptCore to at least build WTF.
    18 JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
    19 JavaScriptCore.makefile = Makefile.JavaScriptCore
    20 SUBDIRS += JavaScriptCore
     17WTF.file = Source/WTF/WTF.pro
     18WTF.makefile = Makefile.WTF
     19SUBDIRS += WTF
     20
     21!v8 {
     22    JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
     23    JavaScriptCore.makefile = Makefile.JavaScriptCore
     24    SUBDIRS += JavaScriptCore
     25}
    2126
    2227WebCore.file = Source/WebCore/WebCore.pro
Note: See TracChangeset for help on using the changeset viewer.