Changeset 194832 in webkit

Timestamp:

Jan 10, 2016 1:56:07 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[webkitdirs] Try arch and uname commands on non-windows OS
​https://bugs.webkit.org/show_bug.cgi?id=152958

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-01-10
Reviewed by Michael Catanzaro.

Right now, determineArchitecture() uses arch and uname -m

commands to determine architecture in case of condition (isGtk() isAppleMacWebKit()

isEfl()) is true. This should be !anyWindows()

instead, because this code is applicable to any non-windows OS WebKit
supports (even Haiku which once was supported is moderately
POSIX-compliant and has uname command).

• Scripts/webkitdirs.pm:

(determineArchitecture):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2016-01-10  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [webkitdirs] Try arch and uname commands on non-windows OS
+        https://bugs.webkit.org/show_bug.cgi?id=152958
+
+        Reviewed by Michael Catanzaro.
+
+        Right now, determineArchitecture()  uses `arch` and `uname -m`
+        commands to determine architecture in case of condition (isGtk() ||
+        isAppleMacWebKit() || isEfl()) is true. This should be !anyWindows()
+        instead, because this code is applicable to any non-windows OS WebKit
+        supports (even Haiku which once was supported is moderately
+        POSIX-compliant and has uname command).
+
+        * Scripts/webkitdirs.pm:
+        (determineArchitecture):
+
 2016-01-08  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -348 +348 @@
     }
 
-    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) {
-        # Fall back to output of `arch', if it is present.
-        $architecture = `arch`;
-        chomp $architecture;
-    }
-
-    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) {
-        # Fall back to output of `uname -m', if it is present.
-        $architecture = `uname -m`;
-        chomp $architecture;
+    if (!isAnyWindows()) {
+        if (!$architecture) {
+            # Fall back to output of `arch', if it is present.
+            $architecture = `arch`;
+            chomp $architecture;
+        }
+
+        if (!$architecture) {
+            # Fall back to output of `uname -m', if it is present.
+            $architecture = `uname -m`;
+            chomp $architecture;
+        }
     }