Title: [254954] trunk/Source/WebCore
Revision
254954
Author
[email protected]
Date
2020-01-22 17:53:18 -0800 (Wed, 22 Jan 2020)

Log Message

preprocess-idls.pl: CygwinPathIfNeeded should use Cygwin::win_to_posix_path instead of invoking cygpath
https://bugs.webkit.org/show_bug.cgi?id=206407

Reviewed by Chris Dumez.

preprocess-idls.pl was invoking cygpath command for all input IDL
files. Use Cygwin::win_to_posix_path function instead.

* bindings/scripts/preprocess-idls.pl: Changed the way to load idlFilesList as well as generate-bindings-all.pl does.
(CygwinPathIfNeeded): Copied from CygwinPathIfNeeded of generate-bindings-all.pl.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (254953 => 254954)


--- trunk/Source/WebCore/ChangeLog	2020-01-23 00:27:43 UTC (rev 254953)
+++ trunk/Source/WebCore/ChangeLog	2020-01-23 01:53:18 UTC (rev 254954)
@@ -1,3 +1,16 @@
+2020-01-22  Fujii Hironori  <[email protected]>
+
+        preprocess-idls.pl: CygwinPathIfNeeded should use Cygwin::win_to_posix_path instead of invoking cygpath
+        https://bugs.webkit.org/show_bug.cgi?id=206407
+
+        Reviewed by Chris Dumez.
+
+        preprocess-idls.pl was invoking cygpath command for all input IDL
+        files. Use Cygwin::win_to_posix_path function instead.
+
+        * bindings/scripts/preprocess-idls.pl: Changed the way to load idlFilesList as well as generate-bindings-all.pl does.
+        (CygwinPathIfNeeded): Copied from CygwinPathIfNeeded of generate-bindings-all.pl.
+
 2020-01-21  Ryosuke Niwa  <[email protected]>
 
         Make a Ref to WindowEventLoop when the timer to run tasks fires

Modified: trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl (254953 => 254954)


--- trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl	2020-01-23 00:27:43 UTC (rev 254953)
+++ trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl	2020-01-23 01:53:18 UTC (rev 254954)
@@ -74,16 +74,12 @@
 $serviceWorkerGlobalScopeConstructorsFile = CygwinPathIfNeeded($serviceWorkerGlobalScopeConstructorsFile);
 $workletGlobalScopeConstructorsFile = CygwinPathIfNeeded($workletGlobalScopeConstructorsFile);
 $paintWorkletGlobalScopeConstructorsFile = CygwinPathIfNeeded($paintWorkletGlobalScopeConstructorsFile);
-$supplementalMakefileDeps = CygwinPathIfNeeded($supplementalMakefileDeps);
+$supplementalMakefileDeps = CygwinPathIfNeeded($supplementalMakefileDeps) if defined($supplementalMakefileDeps);
 
-open FH, "< $idlFilesList" or die "Cannot open $idlFilesList\n";
-my @idlFilesIn = <FH>;
-chomp(@idlFilesIn);
-my @idlFiles = ();
-foreach (@idlFilesIn) {
-    push @idlFiles, CygwinPathIfNeeded($_);
-}
-close FH;
+my @idlFiles;
+open(my $fh, '<', $idlFilesList) or die "Cannot open $idlFilesList";
+@idlFiles = map { CygwinPathIfNeeded(s/\r?\n?$//r) } <$fh>;
+close($fh) or die;
 
 my %interfaceNameToIdlFile;
 my %idlFileToInterfaceName;
@@ -228,18 +224,10 @@
     WriteFileIfChanged($supplementalMakefileDeps, $makefileDeps);
 }
 
-my $cygwinPathAdded;
 sub CygwinPathIfNeeded
 {
     my $path = shift;
-    if ($path && $Config{osname} eq "cygwin") {
-        if (not $cygwinPathAdded) {
-            $ENV{PATH} = "$ENV{PATH}:/cygdrive/c/cygwin/bin";
-            $cygwinPathAdded = 1; 
-        }
-        chomp($path = `cygpath -u '$path'`);
-        $path =~ s/[\r\n]//;
-    }
+    return Cygwin::win_to_posix_path($path) if ($^O eq 'cygwin');
     return $path;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to