Changeset 184856 in webkit

Timestamp:

May 26, 2015 4:26:51 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Expand wildcards inside generate-inspector-gresource-manifest.py
​https://bugs.webkit.org/show_bug.cgi?id=138134

Patch by Milan Crha <​mcrha@redhat.com> 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.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PlatformGTK.cmake (modified) (4 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/gtk/generate-inspector-gresource-manifest.py (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-26  Milan Crha  <mcrha@redhat.com>
+
+        [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  <mitz@apple.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -412 +412 @@
 )
 
-file(GLOB InspectorFiles
+set(InspectorFiles
     ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
     ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
@@ -427 +427 @@
     ${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}
 )
 
@@ -435 +441 @@
     DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
     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
 )
 
@@ -580 +581 @@
 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}

trunk/Tools/ChangeLog

@@ +1 @@
+2015-05-26  Milan Crha  <mcrha@redhat.com>
+
+        [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  <cgarcia@igalia.com>
 

trunk/Tools/gtk/generate-inspector-gresource-manifest.py

@@ -17 +17 @@
 
 import argparse
+import glob
 import os
 import sys
@@ -27 +28 @@
     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