Title: [127201] trunk/Tools
Revision
127201
Author
[email protected]
Date
2012-08-30 15:49:28 -0700 (Thu, 30 Aug 2012)

Log Message

[GTK] Tries to run empty string when calling generate-gtkdoc when not using jhbuild
https://bugs.webkit.org/show_bug.cgi?id=95499

Unreviewed. One more fix to avoid trying to run the empty string.

* Scripts/webkitdirs.pm:
(buildAutotoolsProject):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (127200 => 127201)


--- trunk/Tools/ChangeLog	2012-08-30 22:23:00 UTC (rev 127200)
+++ trunk/Tools/ChangeLog	2012-08-30 22:49:28 UTC (rev 127201)
@@ -1,3 +1,13 @@
+2012-08-30  Gustavo Noronha Silva  <[email protected]>
+
+        [GTK] Tries to run empty string when calling generate-gtkdoc when not using jhbuild
+        https://bugs.webkit.org/show_bug.cgi?id=95499
+
+        Unreviewed. One more fix to avoid trying to run the empty string.
+
+        * Scripts/webkitdirs.pm:
+        (buildAutotoolsProject):
+
 2012-08-30  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r127171.

Modified: trunk/Tools/Scripts/webkitdirs.pm (127200 => 127201)


--- trunk/Tools/Scripts/webkitdirs.pm	2012-08-30 22:23:00 UTC (rev 127200)
+++ trunk/Tools/Scripts/webkitdirs.pm	2012-08-30 22:49:28 UTC (rev 127201)
@@ -2060,9 +2060,13 @@
     chdir ".." or die;
 
     if ($project eq 'WebKit' && !isCrossCompilation()) {
-        my @docGenerationOptions = ($runWithJhbuild, "$sourceDir/Tools/gtk/generate-gtkdoc", "--skip-html");
+        my @docGenerationOptions = ("$sourceDir/Tools/gtk/generate-gtkdoc", "--skip-html");
         push(@docGenerationOptions, productDir());
 
+        if ($runWithJhbuild) {
+            unshift(@docGenerationOptions, $runWithJhbuild);
+        }
+
         if (system(@docGenerationOptions)) {
             die "\n gtkdoc did not build without warnings\n";
         }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to