Changeset 116559 in webkit

Timestamp:

May 9, 2012 2:56:11 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Remove CYGWIN=tty from environment variable as its no longer supported
​https://bugs.webkit.org/show_bug.cgi?id=85791

The CYGWIN=tty environment variable is no longer supported from Cygwin
version 1.7.10. This fix avoids addition of this environment variable
for Cygwin versions greater than 1.7.9. For supporting older versions
i.e. 1.7.9 or older, the script takes care of retaining the environment
variable.

Patch by Vivek Galatage <​vivekgalatage@gmail.com> on 2012-05-09
Reviewed by Adam Roben.

• Scripts/webkitdirs.pm:

(setupAppleWinEnv):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-09  Vivek Galatage  <vivekgalatage@gmail.com>
+
+        Remove CYGWIN=tty from environment variable as its no longer supported
+        https://bugs.webkit.org/show_bug.cgi?id=85791
+
+        The CYGWIN=tty environment variable is no longer supported from Cygwin
+        version 1.7.10. This fix avoids addition of this environment variable
+        for Cygwin versions greater than 1.7.9. For supporting older versions
+        i.e. 1.7.9 or older, the script takes care of retaining the environment
+        variable.
+
+        Reviewed by Adam Roben.
+
+        * Scripts/webkitdirs.pm:
+        (setupAppleWinEnv):
+
 2012-05-09  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -30 +30 @@
 
 use strict;
+use version;
 use warnings;
 use Config;
@@ -1488 +1489 @@
         my %variablesToSet = ();
 
-        # Setting the environment variable 'CYGWIN' to 'tty' makes cygwin enable extra support (i.e., termios)
-        # for UNIX-like ttys in the Windows console
-        $variablesToSet{CYGWIN} = "tty" unless $ENV{CYGWIN};
+        # FIXME: We should remove this explicit version check for cygwin once we stop supporting Cygwin 1.7.9 or older versions. 
+        # https://bugs.webkit.org/show_bug.cgi?id=85791
+        my $currentCygwinVersion = version->parse(`uname -r`);
+        my $firstCygwinVersionWithoutTTYSupport = version->parse("1.7.10");
+        if ($currentCygwinVersion < $firstCygwinVersionWithoutTTYSupport) {
+            # Setting the environment variable 'CYGWIN' to 'tty' makes cygwin enable extra support (i.e., termios)
+            # for UNIX-like ttys in the Windows console
+            $variablesToSet{CYGWIN} = "tty" unless $ENV{CYGWIN};
+        }
         
         # Those environment variables must be set to be able to build inside Visual Studio.