Title: [184856] trunk
- Revision
- 184856
- Author
- [email protected]
- Date
- 2015-05-26 04:26:51 -0700 (Tue, 26 May 2015)
Log Message
[GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
https://bugs.webkit.org/show_bug.cgi?id=138134
Patch by Milan Crha <[email protected]> on 2015-05-26
Reviewed by Žan Doberšek.
Source/WebKit2:
* PlatformGTK.cmake: Command line with expanded resources exceeds 32KB, which
is a limit on Windows. It's better to expand wildcards inside the python script.
Tools:
* gtk/generate-inspector-gresource-manifest.py:
(get_filenames): Command line with expanded resources exceeds 32KB, which
is a limit on Windows. It's better to expand wildcards inside the python script.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (184855 => 184856)
--- trunk/Source/WebKit2/ChangeLog 2015-05-26 06:29:34 UTC (rev 184855)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-26 11:26:51 UTC (rev 184856)
@@ -1,3 +1,13 @@
+2015-05-26 Milan Crha <[email protected]>
+
+ [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
+ https://bugs.webkit.org/show_bug.cgi?id=138134
+
+ Reviewed by Žan Doberšek.
+
+ * PlatformGTK.cmake: Command line with expanded resources exceeds 32KB, which
+ is a limit on Windows. It's better to expand wildcards inside the python script.
+
2015-05-25 Dan Bernstein <[email protected]>
ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (184855 => 184856)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-05-26 06:29:34 UTC (rev 184855)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-05-26 11:26:51 UTC (rev 184856)
@@ -411,7 +411,7 @@
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
)
-file(GLOB InspectorFiles
+set(InspectorFiles
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
@@ -426,8 +426,14 @@
${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
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
)
+file(GLOB InspectorFilesDependencies
+ ${InspectorFiles}
+)
+
# DerivedSources/_javascript_Core/inspector/InspectorBackendCommands.js is
# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
add_custom_command(
@@ -436,11 +442,6 @@
COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
)
-list(APPEND InspectorFiles
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
- ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
-)
-
# This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
"${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
@@ -579,7 +580,7 @@
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
- DEPENDS ${InspectorFiles}
+ DEPENDS ${InspectorFilesDependencies}
${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles}
VERBATIM
Modified: trunk/Tools/ChangeLog (184855 => 184856)
--- trunk/Tools/ChangeLog 2015-05-26 06:29:34 UTC (rev 184855)
+++ trunk/Tools/ChangeLog 2015-05-26 11:26:51 UTC (rev 184856)
@@ -1,3 +1,14 @@
+2015-05-26 Milan Crha <[email protected]>
+
+ [GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
+ https://bugs.webkit.org/show_bug.cgi?id=138134
+
+ Reviewed by Žan Doberšek.
+
+ * gtk/generate-inspector-gresource-manifest.py:
+ (get_filenames): Command line with expanded resources exceeds 32KB, which
+ is a limit on Windows. It's better to expand wildcards inside the python script.
+
2015-05-25 Carlos Garcia Campos <[email protected]>
[GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
Modified: trunk/Tools/gtk/generate-inspector-gresource-manifest.py (184855 => 184856)
--- trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2015-05-26 06:29:34 UTC (rev 184855)
+++ trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2015-05-26 11:26:51 UTC (rev 184856)
@@ -16,6 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import argparse
+import glob
import os
import sys
@@ -26,10 +27,17 @@
def get_filenames(args):
filenames = []
- for filename in args:
- base_dir_index = filename.rfind(BASE_DIR)
- if base_dir_index != -1:
- filenames.append(filename[base_dir_index + len(BASE_DIR):])
+ for pattern in args:
+ paths = glob.glob(pattern)
+ for filename in paths:
+ base_dir_index = filename.rfind(BASE_DIR)
+ if base_dir_index != -1:
+ name = filename[base_dir_index + len(BASE_DIR):]
+ # The result should use forward slashes, thus make sure any os-specific
+ # separator, added by the glob.glob() call, is properly replaced
+ if os.sep != '/':
+ name = name.replace(os.sep, '/')
+ filenames.append(name)
return filenames
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
