[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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4d84e4654c6c9a39cfe60f90d738d92dc501c592..552ff63567a38bddd3278d911602dde39277dc9a 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2012-03-22  Raphael Kubo da Costa  <rakuco@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  <cgarcia@igalia.com>
 
         [GTK] Allow to run any jhbuild command with jhbuild-wrapper script

diff --git a/Tools/DumpRenderTree/efl/CMakeLists.txt b/Tools/DumpRenderTree/efl/CMakeLists.txt
index 29ae5f6e6185f180db80332ccb1c2b602fa5329b..78f93fb7c4ecb03a7e2a003b75010ddc57fc692d 100644 (file)
--- a/Tools/DumpRenderTree/efl/CMakeLists.txt
+++ b/Tools/DumpRenderTree/efl/CMakeLists.txt
@@ -108,8 +108,10 @@ SET(DumpRenderTree_LINK_FLAGS
     ${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})