Title: [203167] trunk
- Revision
- 203167
- Author
- [email protected]
- Date
- 2016-07-13 10:49:01 -0700 (Wed, 13 Jul 2016)
Log Message
[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:
WebKitLibraries:
* win/tools/scripts/version-stamp.pl:
Modified Paths
Diff
Modified: trunk/ChangeLog (203166 => 203167)
--- trunk/ChangeLog 2016-07-13 17:40:43 UTC (rev 203166)
+++ trunk/ChangeLog 2016-07-13 17:49:01 UTC (rev 203167)
@@ -1,3 +1,16 @@
+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 Gyuyoung Kim <[email protected]>
Remove ENABLE_CSS3_TEXT_LINE_BREAK flag
Modified: trunk/Source/cmake/tools/scripts/version-stamp.pl (203166 => 203167)
--- trunk/Source/cmake/tools/scripts/version-stamp.pl 2016-07-13 17:40:43 UTC (rev 203166)
+++ trunk/Source/cmake/tools/scripts/version-stamp.pl 2016-07-13 17:49:01 UTC (rev 203167)
@@ -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: trunk/WebKitLibraries/ChangeLog (203166 => 203167)
--- trunk/WebKitLibraries/ChangeLog 2016-07-13 17:40:43 UTC (rev 203166)
+++ trunk/WebKitLibraries/ChangeLog 2016-07-13 17:49:01 UTC (rev 203167)
@@ -1,3 +1,16 @@
+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 Per Arne Vollan <[email protected]>
[Win] DLLs are missing version information.
Modified: trunk/WebKitLibraries/win/tools/scripts/version-stamp.pl (203166 => 203167)
--- trunk/WebKitLibraries/win/tools/scripts/version-stamp.pl 2016-07-13 17:40:43 UTC (rev 203166)
+++ trunk/WebKitLibraries/win/tools/scripts/version-stamp.pl 2016-07-13 17:49:01 UTC (rev 203167)
@@ -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
