Changeset 195742 in webkit

Timestamp:

Jan 28, 2016 9:18:38 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[webkitdirs] Clarify logic behind is{PortName} functions.
​https://bugs.webkit.org/show_bug.cgi?id=153554

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-01-28
Reviewed by Darin Adler.

• Scripts/webkitdirs.pm:

(determinePortName): Added new function which decides which port are
we building based on command line switches and platform defaults.
(portName): Added getter for determined $portName.
(isEfl): Modified to use portName().
(isGtk): Ditto.
(isWinCairo): Ditto.
(isAppleMacWebKit): Ditto.
(isAppleWinWebKit): Ditto.
(isIOSWebKit): Ditto.
(cmakeBasedPortName): Code replaced with portName() call.
(determineIsEfl): Deleted.
(determineIsGtk): Deleted.
(determineIsWinCairo): Deleted.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2016-01-28  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [webkitdirs] Clarify logic behind is{PortName} functions.
+        https://bugs.webkit.org/show_bug.cgi?id=153554
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitdirs.pm:
+        (determinePortName): Added new function which decides which port are
+        we building based on command line switches and platform defaults.
+        (portName): Added getter for determined $portName.
+        (isEfl): Modified to use portName().
+        (isGtk): Ditto.
+        (isWinCairo): Ditto.
+        (isAppleMacWebKit): Ditto.
+        (isAppleWinWebKit): Ditto.
+        (isIOSWebKit): Ditto.
+        (cmakeBasedPortName): Code replaced with portName() call.
+        (determineIsEfl): Deleted.
+        (determineIsGtk): Deleted.
+        (determineIsWinCairo): Deleted.
+
 2016-01-28  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -95 +95 @@
 }
 
+# Ports
+use constant {
+    AppleWin => "AppleWin",
+    GTK      => "GTK",
+    Efl      => "Efl",
+    iOS      => "iOS",
+    Mac      => "Mac",
+    WinCairo => "WinCairo"
+};
+
 use constant USE_OPEN_COMMAND => 1; # Used in runMacWebKitApp().
 use constant INCLUDE_OPTIONS_FOR_DEBUGGING => 1;
@@ -125 +135 @@
 my $generateDsym;
 my $isCMakeBuild;
-my $isGtk;
-my $isWinCairo;
 my $isWin64;
-my $isEfl;
 my $isInspectorFrontend;
+my $portName;
 my $shouldTargetWebProcess;
 my $shouldUseXPCServiceForWebProcess;
@@ -1025 +1033 @@
 }
 
-sub determineIsEfl()
-{
-    return if defined($isEfl);
-    $isEfl = checkForArgumentAndRemoveFromARGV("--efl");
+sub determinePortName()
+{
+    return if defined $portName;
+
+    my %argToPortName = (
+        efl => Efl,
+        gtk => GTK,
+        wincairo => WinCairo
+    );
+
+    for my $arg (sort keys %argToPortName) {
+        if (checkForArgumentAndRemoveFromARGV("--$arg")) {
+            die "Argument '--$arg' conflicts with selected port '$portName'"
+                if defined $portName;
+
+            $portName = $argToPortName{$arg};
+        }
+    }
+
+    return if defined $portName;
+
+    # Port was not selected via command line, use appropriate default value
+
+    if (isAnyWindows()) {
+        $portName = AppleWin;
+    } elsif (isDarwin()) {
+        determineXcodeSDK();
+        if (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK()) {
+            $portName = iOS;
+        } else {
+            $portName = Mac;
+        }
+    } else {
+        die "Please choose which WebKit port to build";
+    }
+}
+
+sub portName()
+{
+    determinePortName();
+    return $portName;
 }
 
 sub isEfl()
 {
-    determineIsEfl();
-    return $isEfl;
-}
-
-sub determineIsGtk()
-{
-    return if defined($isGtk);
-    $isGtk = checkForArgumentAndRemoveFromARGV("--gtk");
+    return portName() eq Efl;
 }
 
 sub isGtk()
 {
-    determineIsGtk();
-    return $isGtk;
+    return portName() eq GTK;
 }
 
@@ -1062 +1099 @@
 sub isWinCairo()
 {
-    determineIsWinCairo();
-    return $isWinCairo;
-}
-
-sub determineIsWinCairo()
-{
-    return if defined($isWinCairo);
-    $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
+    return portName() eq WinCairo;
 }
 
@@ -1192 +1222 @@
 sub isAppleMacWebKit()
 {
-    return isDarwin() && !isGtk();
+    return (portName() eq Mac) || isIOSWebKit();
 }
 
 sub isAppleWinWebKit()
 {
-    return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk();
+    return portName() eq AppleWin;
 }
 
@@ -1260 +1290 @@
 sub isIOSWebKit()
 {
-    determineXcodeSDK();
-    return isAppleMacWebKit() && (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK());
+    return portName() eq iOS;
 }
 
@@ -2062 +2091 @@
 sub cmakeBasedPortName()
 {
-    return "Efl" if isEfl();
-    return "GTK" if isGtk();
-    return "Mac" if isAppleMacWebKit();
-    return "WinCairo" if isWinCairo();
-    return "AppleWin" if isAppleWinWebKit();
-    return "";
+    return portName();
 }