Changeset 133891 in webkit


Ignore:
Timestamp:
Nov 8, 2012 6:15:22 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Remove non-variable options from the build system
​https://bugs.webkit.org/show_bug.cgi?id=101506

Patch by Laszlo Gombos <​l.gombos@samsung.com> on 2012-11-08
Reviewed by Kenneth Rohde Christiansen.

.:

Remove WTF_USE_PTHREADS, WTF_USE_ICU_UNICODE, WTF_USE_CAIRO,
WTF_USE_FREETYPE and WTF_USE_HARFBUZZ_NG cmake variables
as these are always set to const 1 and not really configurable.

Remove the definition of ENABLE_CONTEXT_MENUS as this is already set to 1 by default in Platform.h.

  • Source/cmake/OptionsEfl.cmake:

Source/WebCore:

Remove WTF_USE_ICU_UNICODE, WTF_USE_CAIRO and WTF_USE_FREETYPE cmake variables
as these are always set to const 1 and not really configurable.

Remove duplicate platform/graphics/cairo include path from
PlatformEfl.cmake.

No new tests as there is no new functionality.

  • PlatformEfl.cmake:

Source/WebKit:

Remove WTF_USE_FREETYPE and ENABLE_GLIB_SUPPORT cmake variables
as these are always set to const 1 and not really configurable.

  • PlatformEfl.cmake:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r133876 r133891  
     12012-11-08  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        [EFL] Remove non-variable options from the build system
     4        https://bugs.webkit.org/show_bug.cgi?id=101506
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Remove WTF_USE_PTHREADS, WTF_USE_ICU_UNICODE, WTF_USE_CAIRO,
     9        WTF_USE_FREETYPE and WTF_USE_HARFBUZZ_NG cmake variables
     10        as these are always set to const 1 and not really configurable.
     11
     12        Remove the definition of ENABLE_CONTEXT_MENUS as this is already set to 1 by default in Platform.h.
     13
     14        * Source/cmake/OptionsEfl.cmake:
     15
    1162012-11-08  Sheriff Bot  <webkit.review.bot@gmail.com>
    217

  • trunk/Source/WebCore/ChangeLog

    r133889 r133891  
     12012-11-08  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        [EFL] Remove non-variable options from the build system
     4        https://bugs.webkit.org/show_bug.cgi?id=101506
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Remove WTF_USE_ICU_UNICODE, WTF_USE_CAIRO and WTF_USE_FREETYPE cmake variables
     9        as these are always set to const 1 and not really configurable.
     10
     11        Remove duplicate platform/graphics/cairo include path from
     12        PlatformEfl.cmake.
     13
     14        No new tests as there is no new functionality.
     15
     16        * PlatformEfl.cmake:
     17
    1182012-11-08  KyungTae Kim  <ktf.kim@samsung.com>
    219

  • trunk/Source/WebCore/PlatformEfl.cmake

    r133488 r133891  
    118118)
    119119
    120 IF (WTF_USE_CAIRO)
    121   LIST(APPEND WebCore_INCLUDE_DIRECTORIES
    122     "${WEBCORE_DIR}/platform/cairo"
    123     "${WEBCORE_DIR}/platform/graphics/cairo"
    124   )
    125   LIST(APPEND WebCore_SOURCES
    126     platform/cairo/WidgetBackingStoreCairo.cpp
    127     platform/graphics/cairo/BitmapImageCairo.cpp
    128     platform/graphics/cairo/CairoUtilities.cpp
    129     platform/graphics/cairo/FontCairo.cpp
    130     platform/graphics/cairo/GradientCairo.cpp
    131     platform/graphics/cairo/GraphicsContextCairo.cpp
    132     platform/graphics/cairo/ImageBufferCairo.cpp
    133     platform/graphics/cairo/ImageCairo.cpp
    134     platform/graphics/cairo/IntRectCairo.cpp
    135     platform/graphics/cairo/NativeImageCairo.cpp
    136     platform/graphics/cairo/OwnPtrCairo.cpp
    137     platform/graphics/cairo/PathCairo.cpp
    138     platform/graphics/cairo/PatternCairo.cpp
    139     platform/graphics/cairo/PlatformContextCairo.cpp
    140     platform/graphics/cairo/PlatformPathCairo.cpp
    141     platform/graphics/cairo/RefPtrCairo.cpp
    142     platform/graphics/cairo/TileCairo.cpp
    143     platform/graphics/cairo/TiledBackingStoreBackendCairo.cpp
    144     platform/graphics/cairo/TransformationMatrixCairo.cpp
    145 
    146     platform/image-decoders/cairo/ImageDecoderCairo.cpp
    147   )
    148 
    149   IF (WTF_USE_FREETYPE)
    150     LIST(APPEND WebCore_INCLUDE_DIRECTORIES
    151       "${WEBCORE_DIR}/platform/graphics/freetype"
    152       "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
    153       "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
    154       ${HARFBUZZ_INCLUDE_DIRS}
    155     )
    156     LIST(APPEND WebCore_SOURCES
    157       platform/graphics/WOFFFileFormat.cpp
    158       platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
    159       platform/graphics/freetype/FontCacheFreeType.cpp
    160       platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
    161       platform/graphics/freetype/FontPlatformDataFreeType.cpp
    162       platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
    163       platform/graphics/freetype/SimpleFontDataFreeType.cpp
    164       platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp
    165       platform/graphics/harfbuzz/ng/HarfBuzzNGFace.cpp
    166       platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCairo.cpp
    167       platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
    168     )
    169     LIST(APPEND WebCore_LIBRARIES
    170       ${HARFBUZZ_LIBRARIES}
    171     )
    172   ENDIF ()
    173 ENDIF ()
    174 
    175 IF (WTF_USE_ICU_UNICODE)
    176   LIST(APPEND WebCore_SOURCES
    177     editing/SmartReplaceICU.cpp
    178     platform/text/TextEncodingDetectorICU.cpp
    179     platform/text/TextBreakIteratorICU.cpp
    180     platform/text/TextCodecICU.cpp
    181   )
    182 ENDIF ()
     120LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     121  "${WEBCORE_DIR}/platform/cairo"
     122  "${WEBCORE_DIR}/platform/graphics/cairo"
     123)
     124LIST(APPEND WebCore_SOURCES
     125  platform/cairo/WidgetBackingStoreCairo.cpp
     126  platform/graphics/cairo/BitmapImageCairo.cpp
     127  platform/graphics/cairo/CairoUtilities.cpp
     128  platform/graphics/cairo/FontCairo.cpp
     129  platform/graphics/cairo/GradientCairo.cpp
     130  platform/graphics/cairo/GraphicsContextCairo.cpp
     131  platform/graphics/cairo/ImageBufferCairo.cpp
     132  platform/graphics/cairo/ImageCairo.cpp
     133  platform/graphics/cairo/IntRectCairo.cpp
     134  platform/graphics/cairo/NativeImageCairo.cpp
     135  platform/graphics/cairo/OwnPtrCairo.cpp
     136  platform/graphics/cairo/PathCairo.cpp
     137  platform/graphics/cairo/PatternCairo.cpp
     138  platform/graphics/cairo/PlatformContextCairo.cpp
     139  platform/graphics/cairo/PlatformPathCairo.cpp
     140  platform/graphics/cairo/RefPtrCairo.cpp
     141  platform/graphics/cairo/TileCairo.cpp
     142  platform/graphics/cairo/TiledBackingStoreBackendCairo.cpp
     143  platform/graphics/cairo/TransformationMatrixCairo.cpp
     144  platform/image-decoders/cairo/ImageDecoderCairo.cpp
     145)
     146
     147LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     148  "${WEBCORE_DIR}/platform/graphics/freetype"
     149  "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
     150  "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
     151  ${HARFBUZZ_INCLUDE_DIRS}
     152)
     153LIST(APPEND WebCore_SOURCES
     154  platform/graphics/WOFFFileFormat.cpp
     155  platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
     156  platform/graphics/freetype/FontCacheFreeType.cpp
     157  platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
     158  platform/graphics/freetype/FontPlatformDataFreeType.cpp
     159  platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
     160  platform/graphics/freetype/SimpleFontDataFreeType.cpp
     161  platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp
     162  platform/graphics/harfbuzz/ng/HarfBuzzNGFace.cpp
     163  platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCairo.cpp
     164  platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
     165)
     166LIST(APPEND WebCore_LIBRARIES
     167  ${HARFBUZZ_LIBRARIES}
     168)
     169
     170LIST(APPEND WebCore_SOURCES
     171  editing/SmartReplaceICU.cpp
     172  platform/text/TextEncodingDetectorICU.cpp
     173  platform/text/TextBreakIteratorICU.cpp
     174  platform/text/TextCodecICU.cpp
     175)
    183176
    184177IF (WTF_USE_TEXTURE_MAPPER)
    … …  
    283276
    284277  LIST(APPEND WebCore_INCLUDE_DIRECTORIES
    285     "${WEBCORE_DIR}/platform/graphics/cairo"
    286278    "${WEBCORE_DIR}/platform/graphics/opengl"
    287279    "${WEBCORE_DIR}/platform/graphics/surfaces"

  • trunk/Source/WebKit/ChangeLog

    r133799 r133891  
     12012-11-08  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        [EFL] Remove non-variable options from the build system
     4        https://bugs.webkit.org/show_bug.cgi?id=101506
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Remove WTF_USE_FREETYPE and ENABLE_GLIB_SUPPORT cmake variables
     9        as these are always set to const 1 and not really configurable.
     10
     11        * PlatformEfl.cmake:
     12
    1132012-11-07  Andreas Kling  <akling@apple.com>
    214

  • trunk/Source/WebKit/PlatformEfl.cmake

    r133678 r133891  
    5050ENDIF ()
    5151
    52 IF (WTF_USE_FREETYPE)
    53   LIST(APPEND WebKit_INCLUDE_DIRECTORIES
    54     "${WEBCORE_DIR}/platform/graphics/freetype"
    55   )
    56 ENDIF ()
     52LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     53  "${WEBCORE_DIR}/platform/graphics/freetype"
     54)
    5755
    5856IF (ENABLE_NOTIFICATIONS)
    … …  
    234232)
    235233
    236 IF (ENABLE_GLIB_SUPPORT)
    237     LIST(APPEND EWKUnitTests_INCLUDE_DIRECTORIES "${WTF_DIR}/wtf/gobject")
    238     LIST(APPEND EWKUnitTests_LIBRARIES
    239         ${GLIB_LIBRARIES}
    240         ${GLIB_GTHREAD_LIBRARIES}
    241     )
    242 ENDIF ()
     234LIST(APPEND EWKUnitTests_INCLUDE_DIRECTORIES "${WTF_DIR}/wtf/gobject")
     235LIST(APPEND EWKUnitTests_LIBRARIES
     236    ${GLIB_LIBRARIES}
     237    ${GLIB_GTHREAD_LIBRARIES}
     238)
    243239
    244240SET(DEFAULT_TEST_PAGE_DIR ${CMAKE_SOURCE_DIR}/Source/WebKit/efl/tests/resources)

  • trunk/Source/cmake/OptionsEfl.cmake

    r133876 r133891  
    2121FIND_PACKAGE(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread)
    2222FIND_PACKAGE(LibSoup 2.39.4.1 REQUIRED)
    23 SET(ENABLE_GLIB_SUPPORT ON)
    2423
    2524SET(WTF_USE_SOUP 1)
    2625ADD_DEFINITIONS(-DWTF_USE_SOUP=1)
    27 
    28 ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=1)
    29 
    30 SET(WTF_USE_PTHREADS 1)
    3126ADD_DEFINITIONS(-DWTF_USE_PTHREADS=1)
    32 
    33 SET(WTF_USE_ICU_UNICODE 1)
    3427ADD_DEFINITIONS(-DWTF_USE_ICU_UNICODE=1)
    35 
    36 SET(WTF_USE_CAIRO 1)
    3728ADD_DEFINITIONS(-DWTF_USE_CAIRO=1)
    3829
    … …  
    129120FIND_PACKAGE(Freetype 2.4.2 REQUIRED)
    130121FIND_PACKAGE(HarfBuzz 0.9.2 REQUIRED)
    131 SET(WTF_USE_FREETYPE 1)
    132 SET(WTF_USE_HARFBUZZ_NG 1)
    133122ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
    134123ADD_DEFINITIONS(-DWTF_USE_HARFBUZZ_NG=1)
Note: See TracChangeset for help on using the changeset viewer.