Title: [193769] tags/Safari-602.1.13.2
- Revision
- 193769
- Author
- [email protected]
- Date
- 2015-12-08 12:33:59 -0800 (Tue, 08 Dec 2015)
Log Message
Merged r193647. rdar://problem/23806716
Modified Paths
Diff
Modified: tags/Safari-602.1.13.2/ChangeLog (193768 => 193769)
--- tags/Safari-602.1.13.2/ChangeLog 2015-12-08 20:33:00 UTC (rev 193768)
+++ tags/Safari-602.1.13.2/ChangeLog 2015-12-08 20:33:59 UTC (rev 193769)
@@ -1,3 +1,16 @@
+2015-12-08 Babak Shafiei <[email protected]>
+
+ Merge r193647.
+
+ 2015-12-07 Alex Christensen <[email protected]>
+
+ Fix internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=151950
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/tools/scripts/auto-version.pl:
+
2015-12-01 Commit Queue <[email protected]>
Unreviewed, rolling out r192914.
Modified: tags/Safari-602.1.13.2/Source/cmake/tools/scripts/auto-version.pl (193768 => 193769)
--- tags/Safari-602.1.13.2/Source/cmake/tools/scripts/auto-version.pl 2015-12-08 20:33:00 UTC (rev 193768)
+++ tags/Safari-602.1.13.2/Source/cmake/tools/scripts/auto-version.pl 2015-12-08 20:33:59 UTC (rev 193769)
@@ -34,13 +34,7 @@
die "You must supply an output path as the argument.\n" if ($#ARGV < 0);
-my $thisDirectory;
-my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
-if (defined $WEBKIT_LIBRARIES) {
- $thisDirectory = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'scripts');
-} else {
- $thisDirectory = dirname(abs_path($0));
-}
+my $thisDirectory = dirname(abs_path($0));
my $FALLBACK_VERSION_PATH = File::Spec->catfile($thisDirectory, 'VERSION');
open(FALLBACK_VERSION_FILE, '<', $FALLBACK_VERSION_PATH) or die "Unable to open $FALLBACK_VERSION_PATH: $!";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
