Modified: trunk/Source/WebCore/ChangeLog (210505 => 210506)
--- trunk/Source/WebCore/ChangeLog 2017-01-09 16:02:39 UTC (rev 210505)
+++ trunk/Source/WebCore/ChangeLog 2017-01-09 16:31:18 UTC (rev 210506)
@@ -1,3 +1,23 @@
+2017-01-09 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r210493 and r210495.
+ https://bugs.webkit.org/show_bug.cgi?id=166842
+
+ Causes makeprops.pl to run on every build (Requested by smfr
+ on #webkit).
+
+ Reverted changesets:
+
+ "Avoid triggering rebuilds for minor changes of
+ CSSProperties.json"
+ https://bugs.webkit.org/show_bug.cgi?id=166810
+ http://trac.webkit.org/changeset/210493
+
+ "Avoid triggering rebuilds for minor changes of
+ CSSProperties.json"
+ https://bugs.webkit.org/show_bug.cgi?id=166810
+ http://trac.webkit.org/changeset/210495
+
2017-01-06 Gustavo Noronha Silva <gustavo.noro...@collabora.co.uk>
[GTK] Should support key and code properties on keyboard events
Modified: trunk/Source/WebCore/css/makeprop.pl (210505 => 210506)
--- trunk/Source/WebCore/css/makeprop.pl 2017-01-09 16:02:39 UTC (rev 210505)
+++ trunk/Source/WebCore/css/makeprop.pl 2017-01-09 16:31:18 UTC (rev 210506)
@@ -27,8 +27,6 @@
use warnings;
use English;
-use File::Compare;
-use File::Copy;
use File::Spec;
use Getopt::Long;
use JSON::PP;
@@ -177,19 +175,7 @@
@names = sort sortByDescendingPriorityAndName @names;
-sub replaceFileIfChanged($$)
-{
- my ($tempFile, $file) = @_;
-
- if (compare($tempFile, $file) != 0) {
- copy($tempFile, $file) or die "Failed to copy $tempFile to $file: $!";
- }
- unlink($tempFile);
-}
-
-my $gperfTempFile = "CSSPropertyNames.gperf.tmp";
-
-open GPERF, ">", $gperfTempFile or die "Could not open $gperfTempFile for writing";
+open GPERF, ">CSSPropertyNames.gperf" || die "Could not open CSSPropertyNames.gperf for writing";
print GPERF << "EOF";
%{
/* This file is automatically generated from $inputFile by makeprop, do not edit */
@@ -346,11 +332,7 @@
close GPERF;
-replaceFileIfChanged($gperfTempFile, "CSSPropertyNames.gperf");
-
-my $propertyNamesHeaderTempFile = "CSSPropertyNames.h.tmp";
-
-open HEADER, ">", $propertyNamesHeaderTempFile or die "Could not open $propertyNamesHeaderTempFile for writing";
+open HEADER, ">CSSPropertyNames.h" || die "Could not open CSSPropertyNames.h for writing";
print HEADER << "EOF";
/* This file is automatically generated from $inputFile by makeprop, do not edit */
@@ -423,8 +405,6 @@
close HEADER;
-replaceFileIfChanged($propertyNamesHeaderTempFile, "CSSPropertyNames.h");
-
#
# StyleBuilder.cpp generator.
#
@@ -914,9 +894,7 @@
return $setterContent;
}
-my $styleBuilderTempFile = "StyleBuilder.cpp.tmp";
-
-open STYLEBUILDER, ">", $styleBuilderTempFile or die "Could not open $styleBuilderTempFile for writing";
+open STYLEBUILDER, ">StyleBuilder.cpp" || die "Could not open StyleBuilder.cpp for writing";
print STYLEBUILDER << "EOF";
/* This file is automatically generated from $inputFile by makeprop, do not edit */
@@ -990,13 +968,8 @@
close STYLEBUILDER;
-replaceFileIfChanged($styleBuilderTempFile, "StyleBuilder.cpp");
-
# Generate StylePropertyShorthandsFunctions.
-
-my $stylePropertyShorthandFunctionsHeaderTempFile = "StylePropertyShorthandFunctions.h.tmp";
-
-open SHORTHANDS_H, ">", $stylePropertyShorthandFunctionsHeaderTempFile or die "Could not open $stylePropertyShorthandFunctionsHeaderTempFile for writing";
+open SHORTHANDS_H, ">StylePropertyShorthandFunctions.h" || die "Could not open StylePropertyShorthandFunctions.h for writing";
print SHORTHANDS_H << "EOF";
/* This file is automatically generated from $inputFile by makeprop, do not edit */
@@ -1022,13 +995,7 @@
close SHORTHANDS_H;
-replaceFileIfChanged($stylePropertyShorthandFunctionsHeaderTempFile, "StylePropertyShorthandFunctions.h");
-
-# Generate StylePropertyShorthandsFunctions.
-
-my $stylePropertyShorthandFunctionsTempFile = "StylePropertyShorthandFunctions.cpp.tmp";
-
-open SHORTHANDS_CPP, ">", $stylePropertyShorthandFunctionsTempFile or die "Could not open $stylePropertyShorthandFunctionsTempFile for writing";
+open SHORTHANDS_CPP, ">StylePropertyShorthandFunctions.cpp" || die "Could not open StylePropertyShorthandFunctions.cpp for writing";
print SHORTHANDS_CPP << "EOF";
/* This file is automatically generated from $inputFile by makeprop, do not edit */
@@ -1141,9 +1108,7 @@
close SHORTHANDS_CPP;
-replaceFileIfChanged($stylePropertyShorthandFunctionsTempFile, "StylePropertyShorthandFunctions.cpp");
-
if (not $gperf) {
$gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
}
-system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf --output-file=CSSPropertyNames.cpp") == 0 or die "calling gperf failed: $?";
+system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf --output-file=CSSPropertyNames.cpp") == 0 || die "calling gperf failed: $?";
