[GTK] generate-gtkdoc should respect build type

https://bugs.webkit.org/show_bug.cgi?id=73296

Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(buildAutotoolsProject): Pass the --debug to the generate-gtkdoc script.
* gtk/common.py: If --build is passed give preference to the Debug build directory.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 94957ac..6375f4e 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] generate-gtkdoc should respect build type
+        https://bugs.webkit.org/show_bug.cgi?id=73296
+
+        Reviewed by Philippe Normand.
+
+        * Scripts/webkitdirs.pm:
+        (buildAutotoolsProject): Pass the --debug to the generate-gtkdoc script.
+        * gtk/common.py: If --build is passed give preference to the Debug build directory.
+
 2011-12-02  Tony Chang  <tony@chromium.org>
 
         [nrwt] fix wdiff output

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 7e7c7b2..8ced4f3 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1700,8 +1700,9 @@ sub buildAutotoolsProject($@)
     $prefix = $ENV{"WebKitInstallationPrefix"} if !defined($prefix);
     push @buildArgs, "--prefix=" . $prefix if defined($prefix);
 
-    # check if configuration is Debug
-    if ($config =~ m/debug/i) {
+    # Check if configuration is Debug.
+    my $debug = $config =~ m/debug/i;
+    if ($debug) {
         push @buildArgs, "--enable-debug";
     } else {
         push @buildArgs, "--disable-debug";
@@ -1743,8 +1744,12 @@ sub buildAutotoolsProject($@)
     chdir ".." or die;
 
     if ($buildingWebKit) {
-        my $relativeScriptsPath = relativeScriptsDir();
-        if (system("$runWithJhbuild $gtkScriptsPath/generate-gtkdoc --skip-html")) {
+        my @docGenerationOptions = ($runWithJhbuild, "$gtkScriptsPath/generate-gtkdoc", "--skip-html");
+        if ($debug) {
+            push(@docGenerationOptions, "--debug");
+        }
+
+        if (system(@docGenerationOptions)) {
             die "\n gtkdoc did not build without warnings\n";
         }
     }

diff --git a/Tools/gtk/common.py b/Tools/gtk/common.py
index cae46f1..7941e13 100644 (file)
--- a/Tools/gtk/common.py
+++ b/Tools/gtk/common.py
@@ -42,13 +42,14 @@ def get_build_path():
     def is_valid_build_directory(path):
         return os.path.exists(os.path.join(path, 'GNUmakefile'))
 
-    build_dir = top_level_path('WebKitBuild', 'Release')
-    if is_valid_build_directory(build_dir):
-        return build_dir
-
-    build_dir = top_level_path('WebKitBuild', 'Debug')
-    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:
+        build_dir = top_level_path('WebKitBuild', build_type)
+        if is_valid_build_directory(build_dir):
+            return build_dir
 
     # distcheck builds in a directory named _build in the top-level path.
     build_dir = top_level_path("_build")