From 0e67730318533873bc41681b9d1396947be6ec7c Mon Sep 17 00:00:00 2001 From: "kov@webkit.org" Date: Wed, 8 Feb 2012 23:20:31 +0000 Subject: [PATCH] [GTK] Fails to build docs with non-standard build directories https://bugs.webkit.org/show_bug.cgi?id=78118 * gtk/common.py: (get_build_path): add comment to document changes done in r107098, as requested by the reviewer and forgotten by me. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107138 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 9 +++++++++ Tools/gtk/common.py | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 7f32b0f..2cccfa2 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,12 @@ +2012-02-08 Gustavo Noronha Silva + + [GTK] Fails to build docs with non-standard build directories + https://bugs.webkit.org/show_bug.cgi?id=78118 + + * gtk/common.py: + (get_build_path): add comment to document changes done in r107098, + as requested by the reviewer and forgotten by me. + 2012-02-08 Adam Barth Stop importing with_statement from the mysterious future diff --git a/Tools/gtk/common.py b/Tools/gtk/common.py index f8c47b6..73aafc3 100644 --- a/Tools/gtk/common.py +++ b/Tools/gtk/common.py @@ -64,6 +64,11 @@ def get_build_path(): if is_valid_build_directory(build_dir): return build_dir + # Debian and Ubuntu build both flavours of the library (with gtk2 + # and with gtk3); they use directories build-2.0 and build-3.0 for + # that, which is not handled by the above cases; we check that the + # directory where we are called from is a valid build directory, + # which should handle pretty much all other non-standard cases. build_dir = os.getcwd() if is_valid_build_directory(build_dir): return build_dir -- 2.7.4