Changeset 196065 in webkit

Timestamp:

Feb 3, 2016 3:38:13 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-02-03
Reviewed by Michael Catanzaro.

• Scripts/webkitdirs.pm:

(prohibitUnknownPort): This function makes determinePortName()
failure fatal.
(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): Return portName() with capitalized first letter.
(determineIsEfl): Deleted.
(determineIsGtk): Deleted.
(determineIsWinCairo): Deleted.

• Scripts/build-jsc: Call prohibitUnknownPort().
• Scripts/run-minibrowser: Ditto.
• Scripts/webkitperl/FeatureList.pm: Ditto.
• Scripts/update-webkit: Call determinePortName() instead of

determineIsWinCairo().

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-jsc (modified) (1 diff)
• Scripts/run-minibrowser (modified) (1 diff)
• Scripts/update-webkit (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (8 diffs)
• Scripts/webkitperl/FeatureList.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-02-03  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [webkitdirs] Clarify logic behind is{PortName} functions.
+        https://bugs.webkit.org/show_bug.cgi?id=153554
+
+        Reviewed by Michael Catanzaro.
+
+        * Scripts/webkitdirs.pm:
+        (prohibitUnknownPort): This function makes determinePortName()
+        failure fatal.
+        (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): Return portName() with capitalized first letter.
+        (determineIsEfl): Deleted.
+        (determineIsGtk): Deleted.
+        (determineIsWinCairo): Deleted.
+
+        * Scripts/build-jsc: Call prohibitUnknownPort().
+        * Scripts/run-minibrowser: Ditto.
+        * Scripts/webkitperl/FeatureList.pm: Ditto.
+        * Scripts/update-webkit: Call determinePortName() instead of
+        determineIsWinCairo().
+
 2016-02-02  Dan Bernstein  <mitz@apple.com>
 

trunk/Tools/Scripts/build-jsc

@@ -37 +37 @@
 
 sub writeCongrats();
+
+prohibitUnknownPort();
 
 my $shouldRunStaticAnalyzer = 0;

trunk/Tools/Scripts/run-minibrowser

@@ -41 +41 @@
 my @jhbuildWrapper;
 
+prohibitUnknownPort();
 setConfiguration();
 

trunk/Tools/Scripts/update-webkit

@@ -44 +44 @@
 my $showHelp;
 
-determineIsWinCairo();
+# This call is needed to eat --wincairo argument and avoid unknown option error.
+# FIXME: Allow port options explicitly or make this script port-agnostic.
+determinePortName();
 
 chdirWebKit();

trunk/Tools/Scripts/webkitdirs.pm

@@ -95 +95 @@
 }
 
+# Ports
+use constant {
+    AppleWin => "AppleWin",
+    GTK      => "GTK",
+    Efl      => "Efl",
+    iOS      => "iOS",
+    Mac      => "Mac",
+    WinCairo => "WinCairo",
+    Unknown  => "Unknown"
+};
+
 use constant USE_OPEN_COMMAND => 1; # Used in runMacWebKitApp().
 use constant INCLUDE_OPTIONS_FOR_DEBUGGING => 1;
@@ -125 +136 @@
 my $generateDsym;
 my $isCMakeBuild;
-my $isGtk;
-my $isWinCairo;
 my $isWin64;
-my $isEfl;
 my $isInspectorFrontend;
+my $portName;
 my $shouldTargetWebProcess;
 my $shouldUseXPCServiceForWebProcess;
@@ -135 +144 @@
 my $shouldNotUseNinja;
 my $xcodeVersion;
+
+my $unknownPortProhibited = 0;
 
 # Variables for Win32 support
@@ -1025 +1036 @@
 }
 
-sub determineIsEfl()
-{
-    return if defined($isEfl);
-    $isEfl = checkForArgumentAndRemoveFromARGV("--efl");
+sub prohibitUnknownPort()
+{
+    $unknownPortProhibited = 1;
+}
+
+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'\n"
+                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 {
+        if ($unknownPortProhibited) {
+            my $portsChoice = join "\n\t", qw(
+                --efl
+                --gtk
+            );
+            die "Please specify which WebKit port to build using one of the following options:"
+                . "\n\t$portsChoice\n";
+        }
+
+        # If script is run without arguments we cannot determine port
+        # TODO: This state should be outlawed
+        $portName = Unknown;
+    }
+}
+
+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 +1118 @@
 sub isWinCairo()
 {
-    determineIsWinCairo();
-    return $isWinCairo;
-}
-
-sub determineIsWinCairo()
-{
-    return if defined($isWinCairo);
-    $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
+    return portName() eq WinCairo;
 }
 
@@ -1192 +1241 @@
 sub isAppleMacWebKit()
 {
-    return isDarwin() && !isGtk();
+    return (portName() eq Mac) || isIOSWebKit();
 }
 
 sub isAppleWinWebKit()
 {
-    return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk();
+    return portName() eq AppleWin;
 }
 
@@ -1260 +1309 @@
 sub isIOSWebKit()
 {
-    determineXcodeSDK();
-    return isAppleMacWebKit() && (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK());
+    return portName() eq iOS;
 }
 
@@ -2063 +2111 @@
 sub cmakeBasedPortName()
 {
-    return "Efl" if isEfl();
-    return "GTK" if isGtk();
-    return "Mac" if isAppleMacWebKit();
-    return "WinCairo" if isWinCairo();
-    return "AppleWin" if isAppleWinWebKit();
-    return "";
+    return ucfirst portName();
 }
 

trunk/Tools/Scripts/webkitperl/FeatureList.pm

@@ -155 +155 @@
 );
 
+prohibitUnknownPort();
+
 my @features = (
     { option => "3d-rendering", desc => "Toggle 3D Rendering support",