Changeset 171942 in webkit


Ignore:
Timestamp:
Aug 1, 2014 12:19:14 PM (10 years ago)
Author:
achristensen@apple.com
Message:

Progress towards cmake on Windows.
​https://bugs.webkit.org/show_bug.cgi?id=135484

Reviewed by Martin Robinson.

.:

  • CMakeLists.txt:

Added Mac to list of ports, even though it is not done yet.
Changed minimum bison version to version installed on Macs.

  • Source/cmake/OptionsAppleWin.cmake:

Added some definitions.

  • Source/cmake/OptionsEfl.cmake:
  • Source/cmake/OptionsGTK.cmake:

Set WTF_LIBRARY_TYPE to STATIC to not change WTF linking on EFL or GTK ports.

  • Source/cmake/OptionsMac.cmake: Added blank for now.
  • Source/cmake/OptionsWinCairo.cmake:
  • Source/cmake/OptionsWindows.cmake:

Added some definitions.
Removed /WX (warnings treated as error while compiling).
Copied warnings to ignore from WebKitLibraries/win/tools/vsprops/common.props.

Source/JavaScriptCore:

  • CMakeLists.txt:

Generate code directly to inspector directory to avoid using the cp command
which is not available on Windows.

  • PlatformWin.cmake: Added.

Source/WTF:

  • wtf/CMakeLists.txt:

Added WTF_LIBRARY_TYPE because Windows needs WTF to be a shared library.

Location:
trunk
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r171793 r171942  
    4242# Determine which port will be built
    4343# -----------------------------------------------------------------------------
    44 set(ALL_PORTS Efl WinCE GTK AppleWin WinCairo)
     44set(ALL_PORTS Efl WinCE GTK AppleWin WinCairo Mac)
    4545set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
    4646
    … …  
    5555# Find common packages (used by all ports)
    5656# -----------------------------------------------------------------------------
    57 find_package(BISON 2.4.1 REQUIRED)
     57find_package(BISON 2.3 REQUIRED)
    5858find_package(FLEX 2.5.34 REQUIRED)
    5959

  • trunk/ChangeLog

    r171915 r171942  
     12014-08-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards cmake on Windows.
     4        https://bugs.webkit.org/show_bug.cgi?id=135484
     5
     6        Reviewed by Martin Robinson.
     7
     8        * CMakeLists.txt:
     9        Added Mac to list of ports, even though it is not done yet.
     10        Changed minimum bison version to version installed on Macs.
     11        * Source/cmake/OptionsAppleWin.cmake:
     12        Added some definitions.
     13        * Source/cmake/OptionsEfl.cmake:
     14        * Source/cmake/OptionsGTK.cmake:
     15        Set WTF_LIBRARY_TYPE to STATIC to not change WTF linking on EFL or GTK ports.
     16        * Source/cmake/OptionsMac.cmake: Added blank for now.
     17        * Source/cmake/OptionsWinCairo.cmake:
     18        * Source/cmake/OptionsWindows.cmake:
     19        Added some definitions.
     20        Removed /WX (warnings treated as error while compiling).
     21        Copied warnings to ignore from WebKitLibraries/win/tools/vsprops/common.props.
     22
    1232014-08-01  Carlos Garcia Campos  <cgarcia@igalia.com>
    224

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r171660 r171942  
    2828    "${WTF_DIR}"
    2929    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
     30    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
    3031    "${CMAKE_SOURCE_DIR}/Source"
    3132    ${ICU_INCLUDE_DIRS}
    … …  
    873874# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
    874875add_custom_command(
    875     OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp
    876            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h
    877            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp
    878            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h
    879            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp
    880            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
     876    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
     877           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
     878           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
     879           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
     880           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
     881           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
    881882           ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
    882883    MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
    883884    DEPENDS ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py
    884885            ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
    885     COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type JavaScript --write_always && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector
     886    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type JavaScript --write_always
    886887    VERBATIM)
     888file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
    887889
    888890# JSCBuiltins
    … …  
    896898
    897899list(APPEND JavaScriptCore_SOURCES
    898     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp
    899     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp
    900     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp
     900    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
     901    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
     902    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
    901903    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
    902904)
    903905
    904906list(APPEND JavaScriptCore_HEADERS
    905     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h
    906     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h
    907     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
     907    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
     908    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
     909    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
    908910    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
    909911)

  • trunk/Source/JavaScriptCore/ChangeLog

    r171939 r171942  
     12014-08-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards cmake on Windows.
     4        https://bugs.webkit.org/show_bug.cgi?id=135484
     5
     6        Reviewed by Martin Robinson.
     7
     8        * CMakeLists.txt:
     9        Generate code directly to inspector directory to avoid using the cp command
     10        which is not available on Windows.
     11        * PlatformWin.cmake: Added.
     12
    1132014-07-31  Andreas Kling  <akling@apple.com>
    214

  • trunk/Source/WTF/ChangeLog

    r171838 r171942  
     12014-07-31  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards cmake on Windows.
     4        https://bugs.webkit.org/show_bug.cgi?id=135484
     5
     6        Reviewed by Martin Robinson.
     7
     8        * wtf/CMakeLists.txt:
     9        Added WTF_LIBRARY_TYPE because Windows needs WTF to be a shared library.
     10
    1112014-07-30  Andreas Kling  <akling@apple.com>
    212

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r170778 r171942  
    256256WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
    257257include_directories(${WTF_INCLUDE_DIRECTORIES})
    258 add_library(WTF STATIC ${WTF_HEADERS} ${WTF_SOURCES})
     258add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES})
    259259target_link_libraries(WTF ${WTF_LIBRARIES})
    260260set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")

  • trunk/Source/cmake/OptionsAppleWin.cmake

    r170892 r171942  
    11include(OptionsWindows)
    22
    3 set(PORT_FALLBACK Win)
     3set(WTF_USE_CG 1)
     4set(WTF_USE_CA 1)
     5set(WTF_USE_CFNETWORK 1)
     6set(WTF_USE_ICU_UNICODE 1)

  • trunk/Source/cmake/OptionsEfl.cmake

    r171915 r171942  
    3535add_definitions(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
    3636
     37set(WTF_LIBRARY_TYPE STATIC)
    3738set(WTF_OUTPUT_NAME wtf_efl)
    3839set(JavaScriptCore_OUTPUT_NAME javascriptcore_efl)

  • trunk/Source/cmake/OptionsGTK.cmake

    r171915 r171942  
    175175set(WTF_USE_UDIS86 1)
    176176
     177set(WTF_LIBRARY_TYPE STATIC)
    177178set(WTF_OUTPUT_NAME WTFGTK)
    178179set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r170892 r171942  
    11include(OptionsWindows)
    22
    3 set(PORT_FALLBACK Win)
     3set(WTF_PLATFORM_WIN_CAIRO 1)
     4set(WTF_USE_CF 1)
     5set(WTF_USE_CURL 1)
     6set(WTF_USE_ICU_UNICODE 1)

  • trunk/Source/cmake/OptionsWindows.cmake

    r170892 r171942  
    55WEBKIT_OPTION_END()
    66
     7include_directories("$ENV{WEBKIT_LIBRARIES}/include")
     8link_directories("$ENV{WEBKIT_LIBRARIES}/lib$(PlatformArchitecture)")
    79if (MSVC)
    8     add_definitions(/WX
    9         /wd4018 /wd4065 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4275 /wd4288 /wd4291
    10         /wd4305 /wd4344 /wd4355 /wd4389 /wd4396 /wd4503 /wd4505 /wd4510 /wd4512 /wd4610 /wd4706 /wd4800 /wd4951 /wd4952 /wd4996)
     10    add_definitions(
     11        /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
     12        /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702
     13        /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
     14    )
    1115
    1216    string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
    … …  
    1822    endif ()
    1923endif ()
     24
     25set(PORT_FALLBACK Win)
     26set(JavaScriptCore_LIBRARY_TYPE SHARED)
     27set(WTF_LIBRARY_TYPE SHARED)
     28set(ICU_LIBRARIES libicuuc$(DebugSuffix) libicuin$(DebugSuffix))
Note: See TracChangeset for help on using the changeset viewer.