Changeset 128362 in webkit


Ignore:
Timestamp:
Sep 12, 2012 2:37:35 PM (12 years ago)
Author:
dpranke@chromium.org
Message:

webkitdirs: fix uname version handling for cygwin
https://bugs.webkit.org/show_bug.cgi?id=96436

Reviewed by Jon Honeycutt.

Newer versions of cygwin embed an additional version string
inside parentheses, so you get "1.7.16(0.249/5/3)" instead of "1.7.16".
Update the code to handle that.

  • Scripts/webkitdirs.pm:

(setupAppleWinEnv):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r128349 r128362  
     12012-09-12  Dirk Pranke  <dpranke@chromium.org>
     2
     3        webkitdirs: fix uname version handling for cygwin
     4        https://bugs.webkit.org/show_bug.cgi?id=96436
     5
     6        Reviewed by Jon Honeycutt.
     7
     8        Newer versions of cygwin embed an additional version string
     9        inside parentheses, so you get "1.7.16(0.249/5/3)" instead of "1.7.16".
     10        Update the code to handle that.
     11
     12        * Scripts/webkitdirs.pm:
     13        (setupAppleWinEnv):
     14
    1152012-09-12  Christophe Dumez  <christophe.dumez@intel.com>
    216
  • trunk/Tools/Scripts/webkitdirs.pm

    r128308 r128362  
    16011601        # FIXME: We should remove this explicit version check for cygwin once we stop supporting Cygwin 1.7.9 or older versions.
    16021602        # https://bugs.webkit.org/show_bug.cgi?id=85791
    1603         my $currentCygwinVersion = version->parse(`uname -r`);
    1604         my $firstCygwinVersionWithoutTTYSupport = version->parse("1.7.10");
    1605         if ($currentCygwinVersion < $firstCygwinVersionWithoutTTYSupport) {
     1603        my $uname_version = (POSIX::uname())[2];
     1604        $uname_version =~ s/\(.*\)//;  # Remove the trailing cygwin version, if any.
     1605        if (version->parse($uname_version) < version->parse("1.7.10")) {
    16061606            # Setting the environment variable 'CYGWIN' to 'tty' makes cygwin enable extra support (i.e., termios)
    16071607            # for UNIX-like ttys in the Windows console
Note: See TracChangeset for help on using the changeset viewer.