Title: [193935] trunk
Revision
193935
Author
bfulg...@apple.com
Date
2015-12-10 17:21:29 -0800 (Thu, 10 Dec 2015)

Log Message

[Win] Support building under Cygwin or native Perl
https://bugs.webkit.org/show_bug.cgi?id=152145
<rdar://problem/23839868>

Reviewed by David Kilzer.

* Source/cmake/tools/scripts/auto-version.pl: Correct handling of mixed DOS filenames when used in a
Cygwin context.

Modified Paths

Diff

Modified: trunk/ChangeLog (193934 => 193935)


--- trunk/ChangeLog	2015-12-11 01:19:03 UTC (rev 193934)
+++ trunk/ChangeLog	2015-12-11 01:21:29 UTC (rev 193935)
@@ -1,3 +1,15 @@
+2015-12-10  Brent Fulgham  <bfulg...@apple.com>
+
+        [Win] Support building under Cygwin or native Perl
+        https://bugs.webkit.org/show_bug.cgi?id=152145
+        <rdar://problem/23839868>
+
+        Reviewed by David Kilzer.
+
+        * Source/cmake/tools/scripts/auto-version.pl: Correct handling of mixed DOS filenames when used in a
+        Cygwin context.
+        
+
 2015-12-09  Daniel Bates  <daba...@apple.com>
 
         [iOS] Suspend and resume device motion and device orientation updates when page is hidden and visible, respectively

Modified: trunk/Source/cmake/tools/scripts/auto-version.pl (193934 => 193935)


--- trunk/Source/cmake/tools/scripts/auto-version.pl	2015-12-11 01:19:03 UTC (rev 193934)
+++ trunk/Source/cmake/tools/scripts/auto-version.pl	2015-12-11 01:21:29 UTC (rev 193935)
@@ -34,8 +34,14 @@
 
 die "You must supply an output path as the argument.\n" if ($#ARGV < 0);
 
-my $thisDirectory = dirname(abs_path($0));
+my $rawPath = $0;
 
+if ($^O eq "cygwin") {
+    chomp($rawPath = `/usr/bin/cygpath -u "$0"`);
+}
+
+my $thisDirectory = dirname(abs_path($rawPath));
+
 my $FALLBACK_VERSION_PATH = File::Spec->catfile($thisDirectory, 'VERSION');
 open(FALLBACK_VERSION_FILE, '<', $FALLBACK_VERSION_PATH) or die "Unable to open $FALLBACK_VERSION_PATH: $!";
 my $FALLBACK_VERSION = <FALLBACK_VERSION_FILE>;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to