Title: [168357] trunk
- Revision
- 168357
- Author
- [email protected]
- Date
- 2014-05-06 06:34:58 -0700 (Tue, 06 May 2014)
Log Message
Unreviewed, rolling out r168304.
https://bugs.webkit.org/show_bug.cgi?id=132607
Broke the build (Requested by KaL on #webkit).
Reverted changeset:
"[GTK][CMake] Unable to do make install"
https://bugs.webkit.org/show_bug.cgi?id=130188
http://trac.webkit.org/changeset/168304
Modified Paths
Diff
Modified: trunk/ChangeLog (168356 => 168357)
--- trunk/ChangeLog 2014-05-06 13:17:26 UTC (rev 168356)
+++ trunk/ChangeLog 2014-05-06 13:34:58 UTC (rev 168357)
@@ -1,3 +1,16 @@
+2014-05-06 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r168304.
+ https://bugs.webkit.org/show_bug.cgi?id=132607
+
+ Broke the build (Requested by KaL on #webkit).
+
+ Reverted changeset:
+
+ "[GTK][CMake] Unable to do make install"
+ https://bugs.webkit.org/show_bug.cgi?id=130188
+ http://trac.webkit.org/changeset/168304
+
2014-05-05 Martin Robinson <[email protected]>
[GTK][CMake] Unable to do make install
Modified: trunk/Source/PlatformGTK.cmake (168356 => 168357)
--- trunk/Source/PlatformGTK.cmake 2014-05-06 13:17:26 UTC (rev 168356)
+++ trunk/Source/PlatformGTK.cmake 2014-05-06 13:34:58 UTC (rev 168357)
@@ -9,9 +9,6 @@
"${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
"${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
)
-endif ()
-
-if (ENABLE_GTKDOC)
install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk/html/
DESTINATION ${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkit2gtk
)
@@ -28,14 +25,14 @@
endmacro()
add_gtkdoc_generator("docs-build-no-html.stamp" "--skip-html")
-add_custom_target(gtkdoc-no-html DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp")
+add_custom_target(gtkdoc-no-html ALL
+ DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp"
+)
add_gtkdoc_generator("docs-build.stamp" "")
-if (ENABLE_GTKDOC)
- add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
-else ()
- add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
-endif ()
+add_custom_target(gtkdoc
+ DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp"
+)
add_custom_target(check
COMMAND ${TOOLS_DIR}/Scripts/run-gtk-tests
Modified: trunk/Source/cmake/OptionsGTK.cmake (168356 => 168357)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-05-06 13:17:26 UTC (rev 168356)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-05-06 13:34:58 UTC (rev 168357)
@@ -17,7 +17,6 @@
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 16 2 16)
set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
-set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to generate gtkdoc by default.")
# FIXME: We want to expose fewer options to downstream, but for now everything is public.
WEBKIT_OPTION_BEGIN()
Modified: trunk/Tools/ChangeLog (168356 => 168357)
--- trunk/Tools/ChangeLog 2014-05-06 13:17:26 UTC (rev 168356)
+++ trunk/Tools/ChangeLog 2014-05-06 13:34:58 UTC (rev 168357)
@@ -1,3 +1,16 @@
+2014-05-06 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r168304.
+ https://bugs.webkit.org/show_bug.cgi?id=132607
+
+ Broke the build (Requested by KaL on #webkit).
+
+ Reverted changeset:
+
+ "[GTK][CMake] Unable to do make install"
+ https://bugs.webkit.org/show_bug.cgi?id=130188
+ http://trac.webkit.org/changeset/168304
+
2014-05-04 Darin Adler <[email protected]>
RetainPtr: Use adoptCF function instead of AdoptCF constructor argument
Modified: trunk/Tools/Scripts/webkitdirs.pm (168356 => 168357)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-05-06 13:17:26 UTC (rev 168356)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-05-06 13:34:58 UTC (rev 168357)
@@ -1875,9 +1875,7 @@
if (isGtk()) {
chdir "$buildPath" or die;
$command = "$buildPath/build.sh";
-
- # We always try to generate gtkdoc for GTK+, so that we see errors as early as possible.
- @args = ($makeArgs, 'gtkdoc-no-html');
+ @args = ($makeArgs);
}
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
