Title: [171991] trunk/Source/WebCore
- Revision
- 171991
- Author
- [email protected]
- Date
- 2014-08-04 08:08:17 -0700 (Mon, 04 Aug 2014)
Log Message
[GTK] Install all unstable webkitdom headers
https://bugs.webkit.org/show_bug.cgi?id=135544
Reviewed by Gustavo Noronha Silva.
We were checking whether generated file existed before they had
been generated.
* PlatformGTK.cmake: Add Unstable.h header for all stable classes
to GObjectDOMBindingsUnstable_INSTALLED_HEADERS and split the
install command for stable and unstable headers making unstable
headers optional.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171990 => 171991)
--- trunk/Source/WebCore/ChangeLog 2014-08-04 13:31:58 UTC (rev 171990)
+++ trunk/Source/WebCore/ChangeLog 2014-08-04 15:08:17 UTC (rev 171991)
@@ -1,3 +1,18 @@
+2014-08-04 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Install all unstable webkitdom headers
+ https://bugs.webkit.org/show_bug.cgi?id=135544
+
+ Reviewed by Gustavo Noronha Silva.
+
+ We were checking whether generated file existed before they had
+ been generated.
+
+ * PlatformGTK.cmake: Add Unstable.h header for all stable classes
+ to GObjectDOMBindingsUnstable_INSTALLED_HEADERS and split the
+ install command for stable and unstable headers making unstable
+ headers optional.
+
2014-08-04 [email protected] <[email protected]>
[WinCairo] Compile error in OpenTypeMathData.cpp.
Modified: trunk/Source/WebCore/PlatformGTK.cmake (171990 => 171991)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-08-04 13:31:58 UTC (rev 171990)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-08-04 15:08:17 UTC (rev 171991)
@@ -669,9 +669,7 @@
get_filename_component(classname ${file} NAME_WE)
list(APPEND GObjectDOMBindingsStable_CLASS_LIST ${classname})
list(APPEND GObjectDOMBindingsStable_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
- if (EXISTS "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}Unstable.h")
- list(APPEND GObjectDOMBindingsUnstable_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}Unstable.h)
- endif ()
+ list(APPEND GObjectDOMBindingsUnstable_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}Unstable.h)
endforeach ()
foreach (file ${GObjectDOMBindingsUnstable_IDL_FILES})
@@ -749,13 +747,18 @@
"headers=${GObjectDOMBindingsStable_INSTALLED_HEADERS}\n"
)
-set(GObjectDOMBindings_INSTALLED_HEADERS ${GObjectDOMBindingsStable_INSTALLED_HEADERS} ${GObjectDOMBindingsUnstable_INSTALLED_HEADERS})
-install(FILES ${GObjectDOMBindings_INSTALLED_HEADERS}
+install(FILES ${GObjectDOMBindingsStable_INSTALLED_HEADERS}
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
)
+# Make unstable header optional if they don't exist
+install(FILES ${GObjectDOMBindingsUnstable_INSTALLED_HEADERS}
+ DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
+ OPTIONAL
+)
+
# Some installed headers are not on the list of headers used for gir generation.
-set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_INSTALLED_HEADERS})
+set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindingsStable_INSTALLED_HEADERS})
list(REMOVE_ITEM GObjectDOMBindings_GIR_HEADERS
bindings/gobject/WebKitDOMEventTarget.h
bindings/gobject/WebKitDOMNodeFilter.h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
