Modified: trunk/ChangeLog (170704 => 170705)
--- trunk/ChangeLog 2014-07-02 09:52:38 UTC (rev 170704)
+++ trunk/ChangeLog 2014-07-02 15:11:41 UTC (rev 170705)
@@ -1,3 +1,12 @@
+2014-07-02 Carlos Garcia Campos <[email protected]>
+
+ [GTK] make dist is broken
+ https://bugs.webkit.org/show_bug.cgi?id=134542
+
+ Reviewed by Martin Robinson.
+
+ * Source/PlatformGTK.cmake: Remove ENABLE_WEBKIT check.
+
2014-07-01 Zan Dobersek <[email protected]>
[CMake] Add necessary support for building for the Wayland target
Modified: trunk/Source/PlatformGTK.cmake (170704 => 170705)
--- trunk/Source/PlatformGTK.cmake 2014-07-02 09:52:38 UTC (rev 170704)
+++ trunk/Source/PlatformGTK.cmake 2014-07-02 15:11:41 UTC (rev 170705)
@@ -47,7 +47,7 @@
COMMAND ${TOOLS_DIR}/gtk/check-for-webkitdom-api-breaks
)
-if (ENABLE_WEBKIT AND ENABLE_WEBKIT2)
+if (ENABLE_WEBKIT2)
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
Modified: trunk/Tools/ChangeLog (170704 => 170705)
--- trunk/Tools/ChangeLog 2014-07-02 09:52:38 UTC (rev 170704)
+++ trunk/Tools/ChangeLog 2014-07-02 15:11:41 UTC (rev 170705)
@@ -1,5 +1,15 @@
2014-07-02 Carlos Garcia Campos <[email protected]>
+ [GTK] make dist is broken
+ https://bugs.webkit.org/show_bug.cgi?id=134542
+
+ Reviewed by Martin Robinson.
+
+ * gtk/make-dist.py: Rename command line options to match what cmake uses.
+ * gtk/manifest.txt: Remove WebKit1 references and add WebKitDOM documentation.
+
+2014-07-02 Carlos Garcia Campos <[email protected]>
+
[GTK] WebKitWebView::create should receive information about the navigation action
https://bugs.webkit.org/show_bug.cgi?id=133680
Modified: trunk/Tools/gtk/make-dist.py (170704 => 170705)
--- trunk/Tools/gtk/make-dist.py 2014-07-02 09:52:38 UTC (rev 170704)
+++ trunk/Tools/gtk/make-dist.py 2014-07-02 15:11:41 UTC (rev 170705)
@@ -205,12 +205,12 @@
if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Build a distribution bundle.')
- parser.add_argument('-s', '--source-directory', type=str, default=os.getcwd(),
+ parser.add_argument('-s', '--source-dir', type=str, default=os.getcwd(),
help='The top-level directory of the source distribution. ' + \
'Directory for relative paths. Defaults to current directory.')
parser.add_argument('--tarball-root', type=str, default='/',
help='The top-level path of the tarball. By default files are added to the root of the tarball.')
- parser.add_argument('-b', '--build-directory', type=str, default=None,
+ parser.add_argument('-b', '--build-dir', type=str, default=None,
help='The top-level path of directory of the build root. ' + \
'By default there is no build root.')
parser.add_argument('-o', type=str, default='out.tar', dest="output_filename",
@@ -219,5 +219,5 @@
arguments = parser.parse_args()
- manifest = Manifest(arguments.manifest_filename, arguments.source_directory, arguments.build_directory, arguments.tarball_root)
+ manifest = Manifest(arguments.manifest_filename, arguments.source_dir, arguments.build_dir, arguments.tarball_root)
manifest.create_tarfile(arguments.output_filename)
Modified: trunk/Tools/gtk/manifest.txt (170704 => 170705)
--- trunk/Tools/gtk/manifest.txt 2014-07-02 09:52:38 UTC (rev 170704)
+++ trunk/Tools/gtk/manifest.txt 2014-07-02 15:11:41 UTC (rev 170705)
@@ -39,9 +39,6 @@
# Most of the files in Source/WebKit are not necessary to build GTK+ and
# the directory includes lots of images, so we're a bit more picky here.
exclude Source/WebKit/.*
-include Source/WebKit/CMakeLists.txt
-include Source/WebKit/PlatformGTK.cmake
-include Source/WebKit/gtk
exclude Source/WebKit2/gtk/NEWS$
# We do want to include the NEWS, but we want it to be in the root of the archive.
@@ -68,5 +65,5 @@
directory $build/Documentation/webkit2gtk/html Documentation/webkit2gtk/html
directory $build/Documentation/webkit2gtk/html Documentation/webkit2gtk/html
-directory $build/Documentation/webkitgtk/tmpl Documentation/webkitgtk/tmpl
-directory $build/Documentation/webkitgtk/tmpl Documentation/webkitgtk/tmpl
+directory $build/Documentation/webkitdomgtk/html Documentation/webkitdomgtk/html
+directory $build/Documentation/webkitdomgtk/html Documentation/webkitdomgtk/html
