Title: [225704] trunk/Source/WebInspectorUI
- Revision
- 225704
- Author
- mcatanz...@igalia.com
- Date
- 2017-12-08 14:44:47 -0800 (Fri, 08 Dec 2017)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (225703 => 225704)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-12-08 22:44:26 UTC (rev 225703)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-12-08 22:44:47 UTC (rev 225704)
@@ -1,3 +1,18 @@
+2017-12-08 Michael Catanzaro <mcatanz...@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.carl...@apple.com>
Simplify log channel configuration UI
Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (225703 => 225704)
--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2017-12-08 22:44:26 UTC (rev 225703)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2017-12-08 22:44:47 UTC (rev 225704)
@@ -46,6 +46,15 @@
File::Copy::Recursive::dircopy($source, $destination) or die "Unable to copy directory $source to $destination: $!";
} 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";
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
