Title: [116892] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 116892
- Author
- [email protected]
- Date
- 2012-05-13 06:45:04 -0700 (Sun, 13 May 2012)
Log Message
Merge 112408 - [GTK] generate-gtk-doc doesn't cope with custom build directory
https://bugs.webkit.org/show_bug.cgi?id=82448
Reviewed by Martin Robinson.
Pass the product directory in generate-gtkdoc arguments from
build-webkit.
* Scripts/webkitdirs.pm:
(buildAutotoolsProject):
* gtk/common.py:
(get_build_path):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116891 => 116892)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:44:49 UTC (rev 116891)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:45:04 UTC (rev 116892)
@@ -1,3 +1,18 @@
+2012-03-28 Philippe Normand <[email protected]>
+
+ [GTK] generate-gtk-doc doesn't cope with custom build directory
+ https://bugs.webkit.org/show_bug.cgi?id=82448
+
+ Reviewed by Martin Robinson.
+
+ Pass the product directory in generate-gtkdoc arguments from
+ build-webkit.
+
+ * Scripts/webkitdirs.pm:
+ (buildAutotoolsProject):
+ * gtk/common.py:
+ (get_build_path):
+
2012-05-02 Gustavo Noronha Silva <[email protected]>
Unreviewed. Fix mistake I committed when applying review comments.
Modified: releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm (116891 => 116892)
--- releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm 2012-05-13 13:44:49 UTC (rev 116891)
+++ releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm 2012-05-13 13:45:04 UTC (rev 116892)
@@ -1987,9 +1987,7 @@
if ($project eq 'WebKit' && !isCrossCompilation()) {
my @docGenerationOptions = ($runWithJhbuild, "$gtkScriptsPath/generate-gtkdoc", "--skip-html");
- if ($debug) {
- push(@docGenerationOptions, "--debug");
- }
+ push(@docGenerationOptions, productDir());
if (system(@docGenerationOptions)) {
die "\n gtkdoc did not build without warnings\n";
Modified: releases/WebKitGTK/webkit-1.8/Tools/gtk/common.py (116891 => 116892)
--- releases/WebKitGTK/webkit-1.8/Tools/gtk/common.py 2012-05-13 13:44:49 UTC (rev 116891)
+++ releases/WebKitGTK/webkit-1.8/Tools/gtk/common.py 2012-05-13 13:45:04 UTC (rev 116892)
@@ -42,6 +42,9 @@
def is_valid_build_directory(path):
return os.path.exists(os.path.join(path, 'GNUmakefile'))
+ if len(sys.argv[1:]) > 1 and os.path.exists(sys.argv[-1]) and is_valid_build_directory(sys.argv[-1]):
+ return sys.argv[-1]
+
# 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
@@ -51,11 +54,7 @@
if is_valid_build_directory(build_dir):
return build_dir
- build_types = ['Release', 'Debug']
- if '--debug' in sys.argv:
- build_types.reverse()
-
- for build_type in build_types:
+ for build_type in ('Release', 'Debug'):
build_dir = top_level_path('WebKitBuild', build_type)
if is_valid_build_directory(build_dir):
return build_dir
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
