Title: [174326] trunk/Source/WebCore
- Revision
- 174326
- Author
- [email protected]
- Date
- 2014-10-05 00:41:13 -0700 (Sun, 05 Oct 2014)
Log Message
[GTK] Do not generate a symlink in derived sources for every header in WebCore/bindings/gobject
https://bugs.webkit.org/show_bug.cgi?id=137389
Reviewed by Martin Robinson.
We only need a symlink for static sources that are included in
public generated headers, because they are added with as
<webkitdom/WebKitDOMFoo.h> so they need to be inside a webkitdom
directory. Also use proper targets and commands to create the
symlinks only when needed instead of for every build.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174325 => 174326)
--- trunk/Source/WebCore/ChangeLog 2014-10-05 06:34:07 UTC (rev 174325)
+++ trunk/Source/WebCore/ChangeLog 2014-10-05 07:41:13 UTC (rev 174326)
@@ -1,3 +1,18 @@
+2014-10-05 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Do not generate a symlink in derived sources for every header in WebCore/bindings/gobject
+ https://bugs.webkit.org/show_bug.cgi?id=137389
+
+ Reviewed by Martin Robinson.
+
+ We only need a symlink for static sources that are included in
+ public generated headers, because they are added with as
+ <webkitdom/WebKitDOMFoo.h> so they need to be inside a webkitdom
+ directory. Also use proper targets and commands to create the
+ symlinks only when needed instead of for every build.
+
+ * PlatformGTK.cmake:
+
2014-10-04 Myles C. Maxfield <[email protected]>
[SVG -> OTF Converter] Arabic forms are not substituted correctly
Modified: trunk/Source/WebCore/PlatformGTK.cmake (174325 => 174326)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-10-05 06:34:07 UTC (rev 174325)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-10-05 07:41:13 UTC (rev 174326)
@@ -459,6 +459,7 @@
include_directories(
${WebCore_INCLUDE_DIRECTORIES}
+ "${WEBCORE_DIR}/bindings/gobject/"
"${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
)
@@ -682,7 +683,9 @@
)
endif ()
-set(GObjectDOMBindingsStable_CLASS_LIST Custom EventTarget NodeFilter Object XPathNSResolver)
+set(GObjectDOMBindings_STATIC_CLASS_LIST Custom EventTarget NodeFilter Object XPathNSResolver)
+
+set(GObjectDOMBindingsStable_CLASS_LIST ${GObjectDOMBindings_STATIC_CLASS_LIST})
set(GObjectDOMBindingsStable_INSTALLED_HEADERS
${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
@@ -734,8 +737,19 @@
COMMAND echo ${GObjectDOMBindingsStable_CLASS_LIST} | ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/gobject-generate-headers.pl gdom > ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
)
-add_custom_target(fake-installed-webkitdom-headers
- COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/*.h ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+# Some of the static headers are included by generated public headers with include <webkitdom/WebKitDOMFoo.h>.
+# We need those headers in the derived sources to be in webkitdom directory.
+foreach (classname ${GObjectDOMBindings_STATIC_CLASS_LIST})
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h
+ DEPENDS ${WEBCORE_DIR}/bindings/gobject/WebKitDOM${classname}.h
+ COMMAND ln -n -s -f ${WEBCORE_DIR}/bindings/gobject/WebKitDOM${classname}.h ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+ )
+ list(APPEND GObjectDOMBindings_STATIC_GENERATED_SOURCES ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
+endforeach ()
+
+add_custom_target(fake-generated-webkitdom-headers
+ DEPENDS ${GObjectDOMBindings_STATIC_GENERATED_SOURCES}
)
set(GObjectDOMBindings_IDL_FILES ${GObjectDOMBindingsStable_IDL_FILES} ${GObjectDOMBindingsUnstable_IDL_FILES})
@@ -762,7 +776,7 @@
add_dependencies(GObjectDOMBindings
WebCore
- fake-installed-webkitdom-headers
+ fake-generated-webkitdom-headers
)
file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkitdom.cfg
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
