Modified: trunk/Tools/ChangeLog (101675 => 101676)
--- trunk/Tools/ChangeLog 2011-12-01 16:59:32 UTC (rev 101675)
+++ trunk/Tools/ChangeLog 2011-12-01 17:23:19 UTC (rev 101676)
@@ -1,3 +1,16 @@
+2011-12-01 Martin Robinson <[email protected]>
+
+ [GTK] build-jsc should not trigger gtkdoc generation
+ https://bugs.webkit.org/show_bug.cgi?id=73552
+
+ Reviewed by Philippe Normand.
+
+ Do not generate gtkdoc when building projects other than WebKit. In particular, this ensures
+ that build-jsc does not try to generate gtkdoc.
+
+ * Scripts/webkitdirs.pm:
+ (buildAutotoolsProject): Only generate gtkdoc if the project is "WebKit".
+
2011-12-01 Kristóf Kosztyó <[email protected]>
tests_run0.txt gets clobbered when re-running failing tests
Modified: trunk/Tools/Scripts/webkitdirs.pm (101675 => 101676)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-12-01 16:59:32 UTC (rev 101675)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-12-01 17:23:19 UTC (rev 101676)
@@ -1674,13 +1674,13 @@
# have changed. The makefile should be smart enough to track autotools
# dependencies and re-run autogen.sh when build files change.
my $autogenArgumentsFile = "previous-autogen-arguments.txt";
- my $saveAutogenArguments = $project eq "WebKit";
+ my $buildingWebKit = $project eq "WebKit";
if (!(-e "GNUmakefile")) {
- runAutogenForAutotoolsProject($dir, $prefix, $sourceDir, $saveAutogenArguments, $autogenArgumentsFile, @buildArgs);
+ runAutogenForAutotoolsProject($dir, $prefix, $sourceDir, $buildingWebKit, $autogenArgumentsFile, @buildArgs);
}
- if ($saveAutogenArguments and autogenArgumentsHaveChanged($autogenArgumentsFile, @buildArgs)) {
- runAutogenForAutotoolsProject($dir, $prefix, $sourceDir, $saveAutogenArguments, $autogenArgumentsFile, @buildArgs);
+ if ($buildingWebKit and autogenArgumentsHaveChanged($autogenArgumentsFile, @buildArgs)) {
+ runAutogenForAutotoolsProject($dir, $prefix, $sourceDir, $buildingWebKit, $autogenArgumentsFile, @buildArgs);
}
if (system("$make $makeArgs") ne 0) {
@@ -1689,7 +1689,7 @@
chdir ".." or die;
- if (isGtk()) {
+ if (isGtk() && $buildingWebKit) {
my $relativeScriptsPath = relativeScriptsDir();
if (system("$relativeScriptsPath/../gtk/generate-gtkdoc --skip-html")) {
die "\n gtkdoc did not build without warnings\n";
