Title: [203173] branches/safari-602.1.40-branch
- Revision
- 203173
- Author
- [email protected]
- Date
- 2016-07-13 13:00:26 -0700 (Wed, 13 Jul 2016)
Log Message
Merged r203167. rdar://problem/26358998
Modified Paths
Diff
Modified: branches/safari-602.1.40-branch/ChangeLog (203172 => 203173)
--- branches/safari-602.1.40-branch/ChangeLog 2016-07-13 19:17:46 UTC (rev 203172)
+++ branches/safari-602.1.40-branch/ChangeLog 2016-07-13 20:00:26 UTC (rev 203173)
@@ -1,3 +1,20 @@
+2016-07-13 Babak Shafiei <[email protected]>
+
+ Merge r203167.
+
+ 2016-07-13 Per Arne Vollan <[email protected]>
+
+ [Win] DLLs are missing version information.
+ https://bugs.webkit.org/show_bug.cgi?id=159349
+
+ Reviewed by Alex Christensen.
+
+ Avoid using environment variable WEBKIT_LIBRARIES when finding version stamper utility,
+ in case it is not defined. Instead, use the location of the perl script to find the
+ utility.
+
+ * Source/cmake/tools/scripts/version-stamp.pl:
+
2016-07-12 Babak Shafiei <[email protected]>
Merge r203111.
Modified: branches/safari-602.1.40-branch/Source/cmake/tools/scripts/version-stamp.pl (203172 => 203173)
--- branches/safari-602.1.40-branch/Source/cmake/tools/scripts/version-stamp.pl 2016-07-13 19:17:46 UTC (rev 203172)
+++ branches/safari-602.1.40-branch/Source/cmake/tools/scripts/version-stamp.pl 2016-07-13 20:00:26 UTC (rev 203173)
@@ -1,6 +1,8 @@
#!/usr/bin/perl -w
use strict;
+use Cwd 'abs_path';
+use File::Basename;
use File::Spec;
use POSIX;
@@ -29,10 +31,12 @@
sub exitStatus($);
-my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
+my $rawPath = $0;
-my $VERSION_STAMPER = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'VersionStamper', 'VersionStamper.exe');
+my $thisDirectory = dirname(abs_path($rawPath));
+my $VERSION_STAMPER = File::Spec->catfile($thisDirectory, '..', 'VersionStamper', 'VersionStamper.exe');
+
unless (-e $VERSION_STAMPER) {
print "No $VERSION_STAMPER executable. Exiting.\n";
exit(0);
Modified: branches/safari-602.1.40-branch/WebKitLibraries/ChangeLog (203172 => 203173)
--- branches/safari-602.1.40-branch/WebKitLibraries/ChangeLog 2016-07-13 19:17:46 UTC (rev 203172)
+++ branches/safari-602.1.40-branch/WebKitLibraries/ChangeLog 2016-07-13 20:00:26 UTC (rev 203173)
@@ -1,3 +1,20 @@
+2016-07-13 Babak Shafiei <[email protected]>
+
+ Merge r203167.
+
+ 2016-07-13 Per Arne Vollan <[email protected]>
+
+ [Win] DLLs are missing version information.
+ https://bugs.webkit.org/show_bug.cgi?id=159349
+
+ Reviewed by Alex Christensen.
+
+ Avoid using environment variable WEBKIT_LIBRARIES when finding version stamper utility,
+ in case it is not defined. Instead, use the location of the perl script to find the
+ utility.
+
+ * win/tools/scripts/version-stamp.pl:
+
2016-07-12 Babak Shafiei <[email protected]>
Merge r203111.
Modified: branches/safari-602.1.40-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl (203172 => 203173)
--- branches/safari-602.1.40-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2016-07-13 19:17:46 UTC (rev 203172)
+++ branches/safari-602.1.40-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2016-07-13 20:00:26 UTC (rev 203173)
@@ -1,6 +1,8 @@
#!/usr/bin/perl -w
use strict;
+use Cwd 'abs_path';
+use File::Basename;
use File::Spec;
use POSIX;
@@ -29,10 +31,12 @@
sub exitStatus($);
-my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
+my $rawPath = $0;
-my $VERSION_STAMPER = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'VersionStamper', 'VersionStamper.exe');
+my $thisDirectory = dirname(abs_path($rawPath));
+my $VERSION_STAMPER = File::Spec->catfile($thisDirectory, '..', 'VersionStamper', 'VersionStamper.exe');
+
unless (-e $VERSION_STAMPER) {
print "No $VERSION_STAMPER executable. Exiting.\n";
exit(0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
