Title: [111678] trunk/Tools
- Revision
- 111678
- Author
- k...@profusion.mobi
- Date
- 2012-03-22 06:06:05 -0700 (Thu, 22 Mar 2012)
Log Message
[EFL] DRT: Do not pass a relative path to DOWNLOADED_FONTS_DIR.
https://bugs.webkit.org/show_bug.cgi?id=81900
Reviewed by Gustavo Noronha Silva.
r111598 added the DOWNLOADED_FONTS_DIR define, but it used a relative
path which assumed a certain directory structure for the build
directory which may noy be true.
Instead, hardcode the path to the downloaded fonts starting from the
top-level source directory. While this solution is also far from
perfect, it makes it more consistent and reliable, and easier to
tackle at once with the rest of bug 81475.
* DumpRenderTree/efl/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111677 => 111678)
--- trunk/Tools/ChangeLog 2012-03-22 12:56:47 UTC (rev 111677)
+++ trunk/Tools/ChangeLog 2012-03-22 13:06:05 UTC (rev 111678)
@@ -1,3 +1,21 @@
+2012-03-22 Raphael Kubo da Costa <rak...@freebsd.org>
+
+ [EFL] DRT: Do not pass a relative path to DOWNLOADED_FONTS_DIR.
+ https://bugs.webkit.org/show_bug.cgi?id=81900
+
+ Reviewed by Gustavo Noronha Silva.
+
+ r111598 added the DOWNLOADED_FONTS_DIR define, but it used a relative
+ path which assumed a certain directory structure for the build
+ directory which may noy be true.
+
+ Instead, hardcode the path to the downloaded fonts starting from the
+ top-level source directory. While this solution is also far from
+ perfect, it makes it more consistent and reliable, and easier to
+ tackle at once with the rest of bug 81475.
+
+ * DumpRenderTree/efl/CMakeLists.txt:
+
2012-03-22 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Allow to run any jhbuild command with jhbuild-wrapper script
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (111677 => 111678)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-03-22 12:56:47 UTC (rev 111677)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-03-22 13:06:05 UTC (rev 111678)
@@ -108,8 +108,10 @@
${LIBSOUP24_LDFLAGS}
)
+# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
+# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
ADD_DEFINITIONS(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
- -DDOWNLOADED_FONTS_DIR="${CMAKE_BINARY_DIR}/../Dependencies/Source/webkitgtk-test-fonts-0.0.1"
+ -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.1"
-DDATA_DIR="${THEME_BINARY_DIR}")
INCLUDE_DIRECTORIES(${DumpRenderTree_INCLUDE_DIRECTORIES})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
