Title: [173757] releases/WebKitGTK/webkit-2.6
- Revision
- 173757
- Author
- [email protected]
- Date
- 2014-09-19 09:01:44 -0700 (Fri, 19 Sep 2014)
Log Message
Merge r173755 - [GTK] Missing inspector files in the tarball
https://bugs.webkit.org/show_bug.cgi?id=136952
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
* PlatformGTK.cmake: Use APPEND instead of GLOB to add individual
and generated files to the list of inspector files.
Tools:
* gtk/manifest.txt: Add
Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
to the tarball.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (173756 => 173757)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-09-19 16:01:44 UTC (rev 173757)
@@ -1,5 +1,15 @@
2014-09-19 Carlos Garcia Campos <[email protected]>
+ [GTK] Missing inspector files in the tarball
+ https://bugs.webkit.org/show_bug.cgi?id=136952
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Use APPEND instead of GLOB to add individual
+ and generated files to the list of inspector files.
+
+2014-09-19 Carlos Garcia Campos <[email protected]>
+
Webkitgtk 2.5.3: tarball contains APPLE LICENSE file - stating not distributable
https://bugs.webkit.org/show_bug.cgi?id=136632
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake (173756 => 173757)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-09-19 16:01:44 UTC (rev 173757)
@@ -372,7 +372,6 @@
)
file(GLOB InspectorFiles
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
@@ -385,6 +384,10 @@
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg
+)
+
+list(APPEND InspectorFiles
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js
)
Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (173756 => 173757)
--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-09-19 16:01:44 UTC (rev 173757)
@@ -1,5 +1,16 @@
2014-09-19 Carlos Garcia Campos <[email protected]>
+ [GTK] Missing inspector files in the tarball
+ https://bugs.webkit.org/show_bug.cgi?id=136952
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/manifest.txt: Add
+ Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
+ to the tarball.
+
+2014-09-19 Carlos Garcia Campos <[email protected]>
+
Webkitgtk 2.5.3: tarball contains APPLE LICENSE file - stating not distributable
https://bugs.webkit.org/show_bug.cgi?id=136632
Modified: releases/WebKitGTK/webkit-2.6/Tools/gtk/manifest.txt (173756 => 173757)
--- releases/WebKitGTK/webkit-2.6/Tools/gtk/manifest.txt 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Tools/gtk/manifest.txt 2014-09-19 16:01:44 UTC (rev 173757)
@@ -73,6 +73,7 @@
file Source/WebKit2/gtk/NEWS NEWS
file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js
+file Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
# Include only the resources we actually build
file Source/WebCore/Resources/deleteButton.png
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
