Title: [194084] tags/Safari-602.1.13.3
- Revision
- 194084
- Author
- [email protected]
- Date
- 2015-12-14 18:15:06 -0800 (Mon, 14 Dec 2015)
Log Message
Merged r193935. rdar://problem/23839868
Modified Paths
Diff
Modified: tags/Safari-602.1.13.3/ChangeLog (194083 => 194084)
--- tags/Safari-602.1.13.3/ChangeLog 2015-12-15 01:14:34 UTC (rev 194083)
+++ tags/Safari-602.1.13.3/ChangeLog 2015-12-15 02:15:06 UTC (rev 194084)
@@ -1,3 +1,18 @@
+2015-12-14 Babak Shafiei <[email protected]>
+
+ Merge r193935.
+
+ 2015-12-10 Brent Fulgham <[email protected]>
+
+ [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-08 Babak Shafiei <[email protected]>
Merge r193647.
Modified: tags/Safari-602.1.13.3/Source/cmake/tools/scripts/auto-version.pl (194083 => 194084)
--- tags/Safari-602.1.13.3/Source/cmake/tools/scripts/auto-version.pl 2015-12-15 01:14:34 UTC (rev 194083)
+++ tags/Safari-602.1.13.3/Source/cmake/tools/scripts/auto-version.pl 2015-12-15 02:15:06 UTC (rev 194084)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
