Changeset 202813 in webkit


Ignore:
Timestamp:
Jul 4, 2016 11:35:42 PM (8 years ago)
Author:
Gyuyoung Kim
Message:

[EFL] Remove mac configuration dependency in WebKit Version definition
https://bugs.webkit.org/show_bug.cgi?id=159407

Reviewed by Yusuke Suzuki.

.:

EFL port has been used Version.xconfig file in WebKit/mac/Configurations.
in order to generate WebKitVersion.h file. But it can be simply defined
in cmake.

  • Source/cmake/OptionsEfl.cmake:

Source/WebCore:

EFL port has been used Version.xconfig file in WebKit/mac/Configurations
in order to generate WebKitVersion.h file. But it can be simply defined
in cmake.

  • PlatformEfl.cmake: Remove WebKitVersion.h generation.
  • platform/efl/UserAgentEfl.cpp:

(WebCore::versionForUAString): Use USER_AGENT_EFL_MAJOR_VERSION and USER_AGENT_EFL_MINOR_VERSION.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r202798 r202813  
     12016-07-04  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
     2
     3        [EFL] Remove mac configuration dependency in WebKit Version definition
     4        https://bugs.webkit.org/show_bug.cgi?id=159407
     5
     6        Reviewed by Yusuke Suzuki.
     7
     8        EFL port has been used Version.xconfig file in WebKit/mac/Configurations.
     9        in order to generate WebKitVersion.h file. But it can be simply defined
     10        in cmake.
     11
     12        * Source/cmake/OptionsEfl.cmake:
     13
    1142016-07-03  Dan Bernstein  <mitz@apple.com>
    215
  • trunk/Source/WebCore/ChangeLog

    r202812 r202813  
     12016-07-04  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
     2
     3        [EFL] Remove mac configuration dependency in WebKit Version definition
     4        https://bugs.webkit.org/show_bug.cgi?id=159407
     5
     6        Reviewed by Yusuke Suzuki.
     7
     8        EFL port has been used Version.xconfig file in WebKit/mac/Configurations
     9        in order to generate WebKitVersion.h file. But it can be simply defined
     10        in cmake.
     11
     12        * PlatformEfl.cmake: Remove WebKitVersion.h generation.
     13        * platform/efl/UserAgentEfl.cpp:
     14        (WebCore::versionForUAString): Use USER_AGENT_EFL_MAJOR_VERSION and USER_AGENT_EFL_MINOR_VERSION.
     15
    1162016-07-04  Carlos Garcia Campos  <cgarcia@igalia.com>
    217
  • trunk/Source/WebCore/PlatformEfl.cmake

    r202479 r202813  
    253253)
    254254
    255 add_custom_command(
    256     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
    257     MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
    258     DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
    259     COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
    260     VERBATIM)
    261 list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
    262 
    263255set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/efl/RenderThemeEfl.cpp)
    264256
  • trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp

    r192634 r202813  
    2727#include "UserAgentEfl.h"
    2828
    29 #include "WebKitVersion.h"
    3029#include <wtf/NeverDestroyed.h>
    3130
     
    5857static const char* versionForUAString()
    5958{
    60 #define MAKE_STRING(value) #value
    61 #define MAKE_VERSION(major, minor) MAKE_STRING(major) "." MAKE_STRING(minor)
    62     return MAKE_VERSION(WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION);
    63 #undef MAKE_STRING
    64 #undef MAKE_VERSION
     59    return USER_AGENT_EFL_MAJOR_VERSION "." USER_AGENT_EFL_MINOR_VERSION;
    6560}
    6661
  • trunk/Source/cmake/OptionsEfl.cmake

    r202091 r202813  
    4040
    4141add_definitions(-DBUILDING_EFL__=1)
     42add_definitions(-DUSER_AGENT_EFL_MAJOR_VERSION="602")
     43add_definitions(-DUSER_AGENT_EFL_MINOR_VERSION="1")
    4244add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
    4345                -DDEFAULT_THEME_DIR="${THEME_BINARY_DIR}")
Note: See TracChangeset for help on using the changeset viewer.