Changeset 203167 in webkit


Ignore:
Timestamp:
Jul 13, 2016 10:49:01 AM (8 years ago)
Author:
pvollan@apple.com
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:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r203115 r203167  
     12016-07-13  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] DLLs are missing version information.
     4        https://bugs.webkit.org/show_bug.cgi?id=159349
     5
     6        Reviewed by Alex Christensen.
     7
     8        Avoid using environment variable WEBKIT_LIBRARIES when finding version stamper utility,
     9        in case it is not defined. Instead, use the location of the perl script to find the
     10        utility.
     11
     12        * Source/cmake/tools/scripts/version-stamp.pl:
     13
    1142016-07-12  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
    215

  • trunk/Source/cmake/tools/scripts/version-stamp.pl

    r203111 r203167  
    22
    33use strict;
     4use Cwd 'abs_path';
     5use File::Basename;
    46use File::Spec;
    57use POSIX;
    … …  
    3032sub exitStatus($);
    3133
    32 my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
     34my $rawPath = $0;
    3335
    34 my $VERSION_STAMPER = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'VersionStamper', 'VersionStamper.exe');
     36my $thisDirectory = dirname(abs_path($rawPath));
     37
     38my $VERSION_STAMPER = File::Spec->catfile($thisDirectory, '..', 'VersionStamper', 'VersionStamper.exe');
    3539
    3640unless (-e $VERSION_STAMPER) {

  • trunk/WebKitLibraries/ChangeLog

    r203111 r203167  
     12016-07-13  Per Arne Vollan  <pvollan@apple.com>
     2
     3        [Win] DLLs are missing version information.
     4        https://bugs.webkit.org/show_bug.cgi?id=159349
     5
     6        Reviewed by Alex Christensen.
     7
     8        Avoid using environment variable WEBKIT_LIBRARIES when finding version stamper utility,
     9        in case it is not defined. Instead, use the location of the perl script to find the
     10        utility.
     11
     12        * win/tools/scripts/version-stamp.pl:
     13
    1142016-07-12  Per Arne Vollan  <pvollan@apple.com>
    215

  • trunk/WebKitLibraries/win/tools/scripts/version-stamp.pl

    r203111 r203167  
    22
    33use strict;
     4use Cwd 'abs_path';
     5use File::Basename;
    46use File::Spec;
    57use POSIX;
    … …  
    3032sub exitStatus($);
    3133
    32 my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
     34my $rawPath = $0;
    3335
    34 my $VERSION_STAMPER = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'VersionStamper', 'VersionStamper.exe');
     36my $thisDirectory = dirname(abs_path($rawPath));
     37
     38my $VERSION_STAMPER = File::Spec->catfile($thisDirectory, '..', 'VersionStamper', 'VersionStamper.exe');
    3539
    3640unless (-e $VERSION_STAMPER) {
Note: See TracChangeset for help on using the changeset viewer.