Changeset 112408 in webkit

Timestamp:

Mar 28, 2012 9:33:03 AM (12 years ago)

Author:

Philippe Normand

Message:

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

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)
• gtk/common.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-28  Philippe Normand  <pnormand@igalia.com>
+
+        [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-03-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1982 +1982 @@
     if ($project eq 'WebKit' && !isCrossCompilation()) {
         my @docGenerationOptions = ($runWithJhbuild, "$gtkScriptsPath/generate-gtkdoc", "--skip-html");
-        if ($debug) {
-            push(@docGenerationOptions, "--debug");
-        }
+        push(@docGenerationOptions, productDir());
 
         if (system(@docGenerationOptions)) {

trunk/Tools/gtk/common.py

@@ -43 +43 @@
         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
@@ -52 +55 @@
         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):