Title: [230212] trunk/Source/WebCore
- Revision
- 230212
- Author
- commit-qu...@webkit.org
- Date
- 2018-04-03 11:14:43 -0700 (Tue, 03 Apr 2018)
Log Message
[CMake] gperf path should be given when WebCore/css/makevalues.pl is executed
https://bugs.webkit.org/show_bug.cgi?id=184224
Patch by Yousuke Kimoto <yousuke.kim...@sony.com> on 2018-04-03
Reviewed by Konstantin Tokarev.
When a building evironment doens't include a path to gperf,
WebCore/css/makevalue.pl failes due to failing to execute gperf,
so the full path to gperf should be given like WebCore/css/makeprop.pl.
No new tests, no Web-facing behavior change.
* CMakeLists.txt: gperf path is given to css/makevalues.pl.
* css/makevalues.pl: Add an argument to handle a given gperf path.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (230211 => 230212)
--- trunk/Source/WebCore/CMakeLists.txt 2018-04-03 18:01:41 UTC (rev 230211)
+++ trunk/Source/WebCore/CMakeLists.txt 2018-04-03 18:14:43 UTC (rev 230212)
@@ -1726,7 +1726,7 @@
DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in
- COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
VERBATIM)
list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
Modified: trunk/Source/WebCore/ChangeLog (230211 => 230212)
--- trunk/Source/WebCore/ChangeLog 2018-04-03 18:01:41 UTC (rev 230211)
+++ trunk/Source/WebCore/ChangeLog 2018-04-03 18:14:43 UTC (rev 230212)
@@ -1,3 +1,19 @@
+2018-04-03 Yousuke Kimoto <yousuke.kim...@sony.com>
+
+ [CMake] gperf path should be given when WebCore/css/makevalues.pl is executed
+ https://bugs.webkit.org/show_bug.cgi?id=184224
+
+ Reviewed by Konstantin Tokarev.
+
+ When a building evironment doens't include a path to gperf,
+ WebCore/css/makevalue.pl failes due to failing to execute gperf,
+ so the full path to gperf should be given like WebCore/css/makeprop.pl.
+
+ No new tests, no Web-facing behavior change.
+
+ * CMakeLists.txt: gperf path is given to css/makevalues.pl.
+ * css/makevalues.pl: Add an argument to handle a given gperf path.
+
2018-04-03 Chris Dumez <cdu...@apple.com>
Drop MainFrame class
Modified: trunk/Source/WebCore/css/makevalues.pl (230211 => 230212)
--- trunk/Source/WebCore/css/makevalues.pl 2018-04-03 18:01:41 UTC (rev 230211)
+++ trunk/Source/WebCore/css/makevalues.pl 2018-04-03 18:14:43 UTC (rev 230212)
@@ -31,8 +31,10 @@
my $defines;
my $preprocessor;
+my $gperf;
GetOptions('defines=s' => \$defines,
- 'preprocessor=s' => \$preprocessor);
+ 'preprocessor=s' => \$preprocessor,
+ 'gperf-executable=s' => \$gperf);
my @NAMES = applyPreprocessor("CSSValueKeywords.in", $defines, $preprocessor);
@@ -172,5 +174,7 @@
EOF
close HEADER;
-my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
+if (not $gperf) {
+ $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
+}
system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSValueKeywords.gperf --output-file=CSSValueKeywords.cpp") == 0 || die "calling gperf failed: $?";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
