Title: [258068] trunk/Source/WebCore
- Revision
- 258068
- Author
- [email protected]
- Date
- 2020-03-07 01:17:01 -0800 (Sat, 07 Mar 2020)
Log Message
REGRESSION(r257975): [GTK][WPE] Build failure after a clean build
https://bugs.webkit.org/show_bug.cgi?id=208711
Reviewed by Yusuke Suzuki.
Make sure that InternalSettingsGenerated,idl is generated before bindings
generation starts.
Also, make IDL preprocessor die if specified IDL file is missing, instead
of going on silently.
* CMakeLists.txt:
* WebCoreMacros.cmake:
* bindings/scripts/preprocess-idls.pl:
(getFileContents):
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (258067 => 258068)
--- trunk/Source/WebCore/CMakeLists.txt 2020-03-07 09:13:29 UTC (rev 258067)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-03-07 09:17:01 UTC (rev 258068)
@@ -1800,6 +1800,11 @@
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+
+GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.yaml Settings.h)
+list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/Settings.h)
+list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/Settings.cpp)
+list(APPEND WebCoreTestSupport_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.cpp)
list(APPEND WebCoreTestSupport_IDL_FILES ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.idl)
GENERATE_BINDINGS(WebCoreBindings
@@ -1832,9 +1837,6 @@
DESTINATION ${WebCore_DERIVED_SOURCES_DIR}
GENERATOR JS)
-# WebCoreTestSupportBindings needs InternalSettingsGenerated.idl
-add_dependencies(WebCoreTestSupportBindings WebCore)
-
# WebCore JS Builtins
set(WebCore_BUILTINS_SOURCES
@@ -1917,11 +1919,6 @@
list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/EventTargetFactory.cpp)
-GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.yaml Settings.h)
-list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/Settings.h)
-list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/Settings.cpp)
-list(APPEND WebCoreTestSupport_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.cpp)
-
GENERATE_FONT_NAMES(${WEBCORE_DIR}/css/WebKitFontFamilyNames.in)
list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.cpp)
Modified: trunk/Source/WebCore/ChangeLog (258067 => 258068)
--- trunk/Source/WebCore/ChangeLog 2020-03-07 09:13:29 UTC (rev 258067)
+++ trunk/Source/WebCore/ChangeLog 2020-03-07 09:17:01 UTC (rev 258068)
@@ -1,3 +1,21 @@
+2020-03-07 Konstantin Tokarev <[email protected]>
+
+ REGRESSION(r257975): [GTK][WPE] Build failure after a clean build
+ https://bugs.webkit.org/show_bug.cgi?id=208711
+
+ Reviewed by Yusuke Suzuki.
+
+ Make sure that InternalSettingsGenerated,idl is generated before bindings
+ generation starts.
+
+ Also, make IDL preprocessor die if specified IDL file is missing, instead
+ of going on silently.
+
+ * CMakeLists.txt:
+ * WebCoreMacros.cmake:
+ * bindings/scripts/preprocess-idls.pl:
+ (getFileContents):
+
2020-03-07 Andres Gonzalez <[email protected]>
AXIsolatedObject support for documentLinks.
Modified: trunk/Source/WebCore/WebCoreMacros.cmake (258067 => 258068)
--- trunk/Source/WebCore/WebCoreMacros.cmake 2020-03-07 09:13:29 UTC (rev 258067)
+++ trunk/Source/WebCore/WebCoreMacros.cmake 2020-03-07 09:17:01 UTC (rev 258068)
@@ -151,6 +151,7 @@
endif ()
add_custom_target(${target}
COMMAND ${PERL_EXECUTABLE} ${binding_generator} ${args}
+ DEPENDS ${arg_INPUT_FILES} ${arg_PP_INPUT_FILES}
WORKING_DIRECTORY ${arg_BASE_DIR}
COMMENT "Generate bindings (${target})"
VERBATIM ${act_args})
@@ -205,9 +206,8 @@
${WEBCORE_DIR}/Scripts/SettingsTemplates/Settings.h.erb
)
- set(_args BYPRODUCTS ${_extra_output})
add_custom_command(
- OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/${_outfile}
+ OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/${_outfile} ${_extra_output}
MAIN_DEPENDENCY ${_infile}
DEPENDS ${NAMES_GENERATOR} ${GENERATE_SETTINGS_SCRIPTS} ${SCRIPTS_BINDINGS}
COMMAND ${RUBY_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${WebCore_DERIVED_SOURCES_DIR}
Modified: trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl (258067 => 258068)
--- trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2020-03-07 09:13:29 UTC (rev 258067)
+++ trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2020-03-07 09:17:01 UTC (rev 258068)
@@ -343,9 +343,9 @@
{
my $idlFile = shift;
- open FILE, "<", $idlFile;
- my @lines = <FILE>;
- close FILE;
+ open my $file, "<", $idlFile or die "Could not open $idlFile for reading: $!";
+ my @lines = <$file>;
+ close $file;
# Filter out preprocessor lines.
@lines = grep(!/^\s*#/, @lines);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
