Changeset 195746 in webkit

Timestamp:

Jan 28, 2016 9:44:05 AM (8 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r195742.

Broke EWS

Reverted changeset:

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2016-01-28  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r195742.
+
+        Broke EWS
+
+        Reverted changeset:
+
+        "[webkitdirs] Clarify logic behind is{PortName} functions."
+        https://bugs.webkit.org/show_bug.cgi?id=153554
+        http://trac.webkit.org/changeset/195742
+
 2016-01-28  Darin Adler  <darin@apple.com>
 

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;
@@ -135 +125 @@
 my $generateDsym;
 my $isCMakeBuild;
+my $isGtk;
+my $isWinCairo;
 my $isWin64;
+my $isEfl;
 my $isInspectorFrontend;
-my $portName;
 my $shouldTargetWebProcess;
 my $shouldUseXPCServiceForWebProcess;
@@ -1033 +1025 @@
 }
 
-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 determineIsEfl()
+{
+    return if defined($isEfl);
+    $isEfl = checkForArgumentAndRemoveFromARGV("--efl");
 }
 
 sub isEfl()
 {
-    return portName() eq Efl;
+    determineIsEfl();
+    return $isEfl;
+}
+
+sub determineIsGtk()
+{
+    return if defined($isGtk);
+    $isGtk = checkForArgumentAndRemoveFromARGV("--gtk");
 }
 
 sub isGtk()
 {
-    return portName() eq GTK;
+    determineIsGtk();
+    return $isGtk;
 }
 
@@ -1099 +1062 @@
 sub isWinCairo()
 {
-    return portName() eq WinCairo;
+    determineIsWinCairo();
+    return $isWinCairo;
+}
+
+sub determineIsWinCairo()
+{
+    return if defined($isWinCairo);
+    $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
 }
 
@@ -1222 +1192 @@
 sub isAppleMacWebKit()
 {
-    return (portName() eq Mac) || isIOSWebKit();
+    return isDarwin() && !isGtk();
 }
 
 sub isAppleWinWebKit()
 {
-    return portName() eq AppleWin;
+    return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk();
 }
 
@@ -1290 +1260 @@
 sub isIOSWebKit()
 {
-    return portName() eq iOS;
+    determineXcodeSDK();
+    return isAppleMacWebKit() && (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK());
 }
 
@@ -2091 +2062 @@
 sub cmakeBasedPortName()
 {
-    return portName();
+    return "Efl" if isEfl();
+    return "GTK" if isGtk();
+    return "Mac" if isAppleMacWebKit();
+    return "WinCairo" if isWinCairo();
+    return "AppleWin" if isAppleWinWebKit();
+    return "";
 }