Title: [100722] trunk
- Revision
- 100722
- Author
- [email protected]
- Date
- 2011-11-17 21:43:02 -0800 (Thu, 17 Nov 2011)
Log Message
[EFL] Clean up the use of DATA_DIR in the buildsystem
https://bugs.webkit.org/show_bug.cgi?id=72681
Patch by Raphael Kubo da Costa <[email protected]> on 2011-11-17
Reviewed by Daniel Bates.
.:
* Source/cmake/OptionsEfl.cmake: Rename DATA_DIR to DATA_INSTALL_DIR
and add it to the cache; add a variable with the path of the generated
theme and remove the -DDATA_DIR definition, it was moved to
PlatformEFL.cmake in WebCore.
Source/WebCore:
Add the -DDATA_DIR definition here instead of defining it globally in
OptionsEfl.cmake, as WebCore is the only place which needs it.
No new tests, this is a buildsystem change.
* PlatformEfl.cmake:
Source/WebKit/efl:
Instead of messing with BUILD_DATA_DIR and PARENT_SCOPE, just use
THEME_BINARY_DIR as defined in OptionsEfl.cmake.
* CMakeListsEfl.txt:
Tools:
Instead of adding -DDATA_DIR in all scopes, only define it in
WebCore/PlatformEFL.cmake, as WebCore is the only place that uses
it.
We can then define DATA_DIR to the generated theme directory for
EWebLauncher, since it's what we want here.
* CMakeListsEfl.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (100721 => 100722)
--- trunk/ChangeLog 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/ChangeLog 2011-11-18 05:43:02 UTC (rev 100722)
@@ -1,3 +1,15 @@
+2011-11-17 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Clean up the use of DATA_DIR in the buildsystem
+ https://bugs.webkit.org/show_bug.cgi?id=72681
+
+ Reviewed by Daniel Bates.
+
+ * Source/cmake/OptionsEfl.cmake: Rename DATA_DIR to DATA_INSTALL_DIR
+ and add it to the cache; add a variable with the path of the generated
+ theme and remove the -DDATA_DIR definition, it was moved to
+ PlatformEFL.cmake in WebCore.
+
2011-11-17 Patrick Gansterer <[email protected]>
[CMake] Add ENABLE_CLIENT_BASED_GEOLOCATION to cmakeconfig.h
Modified: trunk/Source/WebCore/ChangeLog (100721 => 100722)
--- trunk/Source/WebCore/ChangeLog 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/Source/WebCore/ChangeLog 2011-11-18 05:43:02 UTC (rev 100722)
@@ -1,3 +1,17 @@
+2011-11-17 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Clean up the use of DATA_DIR in the buildsystem
+ https://bugs.webkit.org/show_bug.cgi?id=72681
+
+ Reviewed by Daniel Bates.
+
+ Add the -DDATA_DIR definition here instead of defining it globally in
+ OptionsEfl.cmake, as WebCore is the only place which needs it.
+
+ No new tests, this is a buildsystem change.
+
+ * PlatformEfl.cmake:
+
2011-11-17 Adam Klein <[email protected]>
Move JS recursion counter from V8Proxy to V8BindingPerIsolateData
Modified: trunk/Source/WebCore/PlatformEfl.cmake (100721 => 100722)
--- trunk/Source/WebCore/PlatformEfl.cmake 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2011-11-18 05:43:02 UTC (rev 100722)
@@ -280,4 +280,5 @@
)
ENDIF ()
-ADD_DEFINITIONS(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
+ADD_DEFINITIONS(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1
+ -DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}")
Modified: trunk/Source/WebKit/efl/CMakeListsEfl.txt (100721 => 100722)
--- trunk/Source/WebKit/efl/CMakeListsEfl.txt 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/Source/WebKit/efl/CMakeListsEfl.txt 2011-11-18 05:43:02 UTC (rev 100722)
@@ -134,16 +134,13 @@
LIST(APPEND WebKit_LIBRARIES ${CURL_LIBRARIES} ${ZLIB_LIBRARIES})
ENDIF ()
-SET(BUILD_DATA_DIR ${CMAKE_BINARY_DIR}/WebKit/efl/DefaultTheme)
-SET(BUILD_DATA_DIR ${BUILD_DATA_DIR} PARENT_SCOPE)
-FILE(MAKE_DIRECTORY ${BUILD_DATA_DIR})
-
SET(WebKit_THEME_DEFINITION "")
IF (ENABLE_PROGRESS_TAG)
LIST(APPEND WebKit_THEME_DEFINITION "-DENABLE_PROGRESS_TAG")
ENDIF ()
-SET(WebKit_THEME ${BUILD_DATA_DIR}/default.edj)
+FILE(MAKE_DIRECTORY ${THEME_BINARY_DIR})
+SET(WebKit_THEME ${THEME_BINARY_DIR}/default.edj)
ADD_CUSTOM_COMMAND(
OUTPUT ${WebKit_THEME}
COMMAND ${EDJE_CC_EXECUTABLE} -v -id ${WEBKIT_DIR}/efl/DefaultTheme ${WebKit_THEME_DEFINITION} ${WEBKIT_DIR}/efl/DefaultTheme/default.edc ${WebKit_THEME}
@@ -260,4 +257,4 @@
DESTINATION include/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
INSTALL(FILES ${WebKit_THEME}
- DESTINATION share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR}/themes)
+ DESTINATION ${DATA_INSTALL_DIR}/themes)
Modified: trunk/Source/WebKit/efl/ChangeLog (100721 => 100722)
--- trunk/Source/WebKit/efl/ChangeLog 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-11-18 05:43:02 UTC (rev 100722)
@@ -1,3 +1,15 @@
+2011-11-17 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] Clean up the use of DATA_DIR in the buildsystem
+ https://bugs.webkit.org/show_bug.cgi?id=72681
+
+ Reviewed by Daniel Bates.
+
+ Instead of messing with BUILD_DATA_DIR and PARENT_SCOPE, just use
+ THEME_BINARY_DIR as defined in OptionsEfl.cmake.
+
+ * CMakeListsEfl.txt:
+
2011-11-16 Gyuyoung Kim <[email protected]>
[EFL] Use standard booleand data type in struct.
Modified: trunk/Source/cmake/OptionsEfl.cmake (100721 => 100722)
--- trunk/Source/cmake/OptionsEfl.cmake 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/Source/cmake/OptionsEfl.cmake 2011-11-18 05:43:02 UTC (rev 100722)
@@ -54,8 +54,8 @@
SET(WebCore_LIBRARY_NAME webcore_efl)
SET(WebKit_LIBRARY_NAME ewebkit)
-SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
-ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")
+SET(DATA_INSTALL_DIR "share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR}" CACHE PATH "Installation path for theme data")
+SET(THEME_BINARY_DIR ${CMAKE_BINARY_DIR}/WebKit/efl/DefaultTheme)
SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
Modified: trunk/Tools/CMakeListsEfl.txt (100721 => 100722)
--- trunk/Tools/CMakeListsEfl.txt 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/Tools/CMakeListsEfl.txt 2011-11-18 05:43:02 UTC (rev 100722)
@@ -49,9 +49,7 @@
LIST(APPEND EWebLauncher_LINK_FLAGS ${CURL_LDFLAGS})
ENDIF ()
-# Override data directory. We always want to get a fresh theme.
-REMOVE_DEFINITIONS(-DDATA_DIR=\"${DATA_DIR}\")
-ADD_DEFINITIONS(-DDATA_DIR=\"${BUILD_DATA_DIR}\")
+ADD_DEFINITIONS(-DDATA_DIR=\"${THEME_BINARY_DIR}\")
INCLUDE_DIRECTORIES(${EWebLauncher_INCLUDE_DIRECTORIES})
ADD_EXECUTABLE(Programs/EWebLauncher ${EWebLauncher_SOURCES})
Modified: trunk/Tools/ChangeLog (100721 => 100722)
--- trunk/Tools/ChangeLog 2011-11-18 05:41:33 UTC (rev 100721)
+++ trunk/Tools/ChangeLog 2011-11-18 05:43:02 UTC (rev 100722)
@@ -1,5 +1,21 @@
2011-11-17 Raphael Kubo da Costa <[email protected]>
+ [EFL] Clean up the use of DATA_DIR in the buildsystem
+ https://bugs.webkit.org/show_bug.cgi?id=72681
+
+ Reviewed by Daniel Bates.
+
+ Instead of adding -DDATA_DIR in all scopes, only define it in
+ WebCore/PlatformEFL.cmake, as WebCore is the only place that uses
+ it.
+
+ We can then define DATA_DIR to the generated theme directory for
+ EWebLauncher, since it's what we want here.
+
+ * CMakeListsEfl.txt:
+
+2011-11-17 Raphael Kubo da Costa <[email protected]>
+
[EFL] Move platform includes last in DRT's include directories.
https://bugs.webkit.org/show_bug.cgi?id=72684
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
