Title: [202813] trunk
- Revision
- 202813
- Author
- [email protected]
- Date
- 2016-07-04 23:35:42 -0700 (Mon, 04 Jul 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (202812 => 202813)
--- trunk/ChangeLog 2016-07-05 06:16:09 UTC (rev 202812)
+++ trunk/ChangeLog 2016-07-05 06:35:42 UTC (rev 202813)
@@ -1,3 +1,16 @@
+2016-07-04 Gyuyoung Kim <[email protected]>
+
+ [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:
+
2016-07-03 Dan Bernstein <[email protected]>
[Xcode] With default verbosity, make(1) output no longer hides environment variable listings
Modified: trunk/Source/WebCore/ChangeLog (202812 => 202813)
--- trunk/Source/WebCore/ChangeLog 2016-07-05 06:16:09 UTC (rev 202812)
+++ trunk/Source/WebCore/ChangeLog 2016-07-05 06:35:42 UTC (rev 202813)
@@ -1,3 +1,18 @@
+2016-07-04 Gyuyoung Kim <[email protected]>
+
+ [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.
+
+ * PlatformEfl.cmake: Remove WebKitVersion.h generation.
+ * platform/efl/UserAgentEfl.cpp:
+ (WebCore::versionForUAString): Use USER_AGENT_EFL_MAJOR_VERSION and USER_AGENT_EFL_MINOR_VERSION.
+
2016-07-04 Carlos Garcia Campos <[email protected]>
[Coordinated Graphics] Modernize and cleanup CompositingCoordinator
Modified: trunk/Source/WebCore/PlatformEfl.cmake (202812 => 202813)
--- trunk/Source/WebCore/PlatformEfl.cmake 2016-07-05 06:16:09 UTC (rev 202812)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-07-05 06:35:42 UTC (rev 202813)
@@ -252,14 +252,6 @@
${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.js
)
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h
- MAIN_DEPENDENCY ${WEBKIT_DIR}/scripts/generate-webkitversion.pl
- DEPENDS ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/scripts/generate-webkitversion.pl --config ${WEBKIT_DIR}/mac/Configurations/Version.xcconfig --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
- VERBATIM)
-list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebKitVersion.h)
-
set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/efl/RenderThemeEfl.cpp)
list(APPEND WebCore_LIBRARIES
Modified: trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp (202812 => 202813)
--- trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp 2016-07-05 06:16:09 UTC (rev 202812)
+++ trunk/Source/WebCore/platform/efl/UserAgentEfl.cpp 2016-07-05 06:35:42 UTC (rev 202813)
@@ -26,7 +26,6 @@
#include "config.h"
#include "UserAgentEfl.h"
-#include "WebKitVersion.h"
#include <wtf/NeverDestroyed.h>
#if OS(UNIX)
@@ -57,11 +56,7 @@
static const char* versionForUAString()
{
-#define MAKE_STRING(value) #value
-#define MAKE_VERSION(major, minor) MAKE_STRING(major) "." MAKE_STRING(minor)
- return MAKE_VERSION(WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION);
-#undef MAKE_STRING
-#undef MAKE_VERSION
+ return USER_AGENT_EFL_MAJOR_VERSION "." USER_AGENT_EFL_MINOR_VERSION;
}
String standardUserAgent(const String& applicationName, const String& applicationVersion)
Modified: trunk/Source/cmake/OptionsEfl.cmake (202812 => 202813)
--- trunk/Source/cmake/OptionsEfl.cmake 2016-07-05 06:16:09 UTC (rev 202812)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-07-05 06:35:42 UTC (rev 202813)
@@ -39,6 +39,8 @@
endif ()
add_definitions(-DBUILDING_EFL__=1)
+add_definitions(-DUSER_AGENT_EFL_MAJOR_VERSION="602")
+add_definitions(-DUSER_AGENT_EFL_MINOR_VERSION="1")
add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
-DDEFAULT_THEME_DIR="${THEME_BINARY_DIR}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
