Changeset 225704 in webkit

Timestamp:

Dec 8, 2017 2:44:47 PM (6 years ago)

Author:

Michael Catanzaro

Message:

Don't require perl(File::Copy::Recursive)
​https://bugs.webkit.org/show_bug.cgi?id=180479

Reviewed by Konstantin Tokarev.

If File::Copy::Recursive is not installed, there is currently a Darwin
fallback to the ditto command. That doesn't exist on Linux, but we can
emulate it by running 'cp -R' on everything in the source directory.
This should probably work everywhere except Windows.

• Scripts/copy-user-interface-resources.pl:

(ditto):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Scripts/copy-user-interface-resources.pl (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-12-08  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Don't require perl(File::Copy::Recursive)
+        https://bugs.webkit.org/show_bug.cgi?id=180479
+
+        Reviewed by Konstantin Tokarev.
+
+        If File::Copy::Recursive is not installed, there is currently a Darwin
+        fallback to the ditto command. That doesn't exist on Linux, but we can
+        emulate it by running 'cp -R' on everything in the source directory.
+        This should probably work everywhere except Windows.
+
+        * Scripts/copy-user-interface-resources.pl:
+        (ditto):
+
 2017-12-07  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl

@@ -47 +47 @@
     } elsif ($^O eq 'darwin') {
         system('ditto', $source, $destination);
+    } elsif ($^O ne 'MSWin32') {
+        # Ditto copies the *contents* of the source directory, not the directory itself.
+        opendir(my $dh, $source) or die "Can't open $source: $!";
+        while (readdir $dh) {
+            if ($_ ne '..' and $_ ne '.') {
+                system('cp', '-R', "${source}/$_", $destination) or die "Failed to copy ${source}/$_ to $destination: $!";
+            }
+        }
+        closedir $dh;
     } else {
         die "Please install the PEP module File::Copy::Recursive";