Title: [120927] trunk
- Revision
- 120927
- Author
- [email protected]
- Date
- 2012-06-21 08:46:40 -0700 (Thu, 21 Jun 2012)
Log Message
[EFL][WK2] Make WebKit2/Efl headers and resources installable.
https://bugs.webkit.org/show_bug.cgi?id=88207
Patch by Ryuan Choi <[email protected]> on 2012-06-21
Reviewed by Chang Shu.
.:
* Source/cmake/OptionsCommon.cmake:
Provide new variable, EXEC_INSTALL_DIR to determine where to install
executables.
Source/_javascript_Core:
* shell/CMakeLists.txt: Use ${EXEC_INSTALL_DIR} instead of hardcoding "bin"
Source/WebKit2:
* CMakeLists.txt: Install WebProcess.
* PlatformEfl.cmake: Generate ewebkit2.pc and install it.
* efl/ewebkit2.pc.in: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (120926 => 120927)
--- trunk/ChangeLog 2012-06-21 15:28:10 UTC (rev 120926)
+++ trunk/ChangeLog 2012-06-21 15:46:40 UTC (rev 120927)
@@ -1,3 +1,14 @@
+2012-06-21 Ryuan Choi <[email protected]>
+
+ [EFL][WK2] Make WebKit2/Efl headers and resources installable.
+ https://bugs.webkit.org/show_bug.cgi?id=88207
+
+ Reviewed by Chang Shu.
+
+ * Source/cmake/OptionsCommon.cmake:
+ Provide new variable, EXEC_INSTALL_DIR to determine where to install
+ executables.
+
2012-06-21 Ryuan Choi <[email protected]>
[EFL[WK2] Add WKViewEfl and WebKit2 API Object to represent Evas_Object.
Modified: trunk/Source/_javascript_Core/ChangeLog (120926 => 120927)
--- trunk/Source/_javascript_Core/ChangeLog 2012-06-21 15:28:10 UTC (rev 120926)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-06-21 15:46:40 UTC (rev 120927)
@@ -1,3 +1,12 @@
+2012-06-21 Ryuan Choi <[email protected]>
+
+ [EFL][WK2] Make WebKit2/Efl headers and resources installable.
+ https://bugs.webkit.org/show_bug.cgi?id=88207
+
+ Reviewed by Chang Shu.
+
+ * shell/CMakeLists.txt: Use ${EXEC_INSTALL_DIR} instead of hardcoding "bin"
+
2012-06-20 Geoffrey Garen <[email protected]>
Reduced (but did not eliminate) use of "berzerker GC"
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (120926 => 120927)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2012-06-21 15:28:10 UTC (rev 120926)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2012-06-21 15:46:40 UTC (rev 120927)
@@ -20,5 +20,5 @@
ENDIF ()
IF (SHOULD_INSTALL_JS_SHELL)
- INSTALL(TARGETS ${JSC_EXECUTABLE_NAME} DESTINATION bin)
+ INSTALL(TARGETS ${JSC_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
ENDIF ()
Modified: trunk/Source/WebKit2/CMakeLists.txt (120926 => 120927)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-06-21 15:28:10 UTC (rev 120926)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-06-21 15:46:40 UTC (rev 120927)
@@ -549,3 +549,4 @@
ENDIF ()
INSTALL(TARGETS ${WebKit2_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
+INSTALL(TARGETS ${WebProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
Modified: trunk/Source/WebKit2/ChangeLog (120926 => 120927)
--- trunk/Source/WebKit2/ChangeLog 2012-06-21 15:28:10 UTC (rev 120926)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-21 15:46:40 UTC (rev 120927)
@@ -1,3 +1,14 @@
+2012-06-21 Ryuan Choi <[email protected]>
+
+ [EFL][WK2] Make WebKit2/Efl headers and resources installable.
+ https://bugs.webkit.org/show_bug.cgi?id=88207
+
+ Reviewed by Chang Shu.
+
+ * CMakeLists.txt: Install WebProcess.
+ * PlatformEfl.cmake: Generate ewebkit2.pc and install it.
+ * efl/ewebkit2.pc.in: Added.
+
2012-06-21 Ryuan Choi <[email protected]>
[EFL[WK2] Add WKViewEfl and WebKit2 API Object to represent Evas_Object.
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (120926 => 120927)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-06-21 15:28:10 UTC (rev 120926)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-06-21 15:46:40 UTC (rev 120927)
@@ -148,3 +148,13 @@
COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
)
SET(ForwardingNetworkHeaders_NAME forwarding-headerSoup)
+
+CONFIGURE_FILE(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @ONLY)
+SET (EWebKit2_HEADERS
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/EWebKit2.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_context.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_view.h"
+)
+
+INSTALL(FILES ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${EWebKit2_HEADERS} DESTINATION include/${WebKit2_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
Added: trunk/Source/WebKit2/efl/ewebkit2.pc.in (0 => 120927)
--- trunk/Source/WebKit2/efl/ewebkit2.pc.in (rev 0)
+++ trunk/Source/WebKit2/efl/ewebkit2.pc.in 2012-06-21 15:46:40 UTC (rev 120927)
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+datadir=${prefix}/share/@WebKit2_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
+
+Name: WebKit2-EFL
+Description: Web content engine for EFL applications
+Version: @PROJECT_VERSION@
+Requires: cairo evas ecore libsoup-2.4 ecore-input
+Libs: -L${libdir} -lewebkit2
+Libs.private: @LIBS_PRIVATE@
+Cflags: -I${includedir}/@WebKit2_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@
Modified: trunk/Source/cmake/OptionsCommon.cmake (120926 => 120927)
--- trunk/Source/cmake/OptionsCommon.cmake 2012-06-21 15:28:10 UTC (rev 120926)
+++ trunk/Source/cmake/OptionsCommon.cmake 2012-06-21 15:46:40 UTC (rev 120927)
@@ -29,3 +29,4 @@
SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries (lib${LIB_SUFFIX})")
+SET(EXEC_INSTALL_DIR "bin" CACHE PATH "Where to install executables")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
