Title: [195746] trunk/Tools
- Revision
- 195746
- Author
- [email protected]
- Date
- 2016-01-28 09:44:05 -0800 (Thu, 28 Jan 2016)
Log 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
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (195745 => 195746)
--- trunk/Tools/ChangeLog 2016-01-28 17:33:46 UTC (rev 195745)
+++ trunk/Tools/ChangeLog 2016-01-28 17:44:05 UTC (rev 195746)
@@ -1,3 +1,15 @@
+2016-01-28 Chris Dumez <[email protected]>
+
+ 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 <[email protected]>
Remove equalIgnoringCase since all callers really wanted equalIgnoringASCIICase
Modified: trunk/Tools/Scripts/webkitdirs.pm (195745 => 195746)
--- trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 17:33:46 UTC (rev 195745)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 17:44:05 UTC (rev 195746)
@@ -94,16 +94,6 @@
@EXPORT_OK = ();
}
-# 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;
use constant SIMULATOR_DEVICE_STATE_SHUTDOWN => "1";
@@ -134,9 +124,11 @@
my $iosVersion;
my $generateDsym;
my $isCMakeBuild;
+my $isGtk;
+my $isWinCairo;
my $isWin64;
+my $isEfl;
my $isInspectorFrontend;
-my $portName;
my $shouldTargetWebProcess;
my $shouldUseXPCServiceForWebProcess;
my $shouldUseGuardMalloc;
@@ -1032,57 +1024,28 @@
return scalar @indicesToRemove > 0;
}
-sub determinePortName()
+sub determineIsEfl()
{
- 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";
- }
+ return if defined($isEfl);
+ $isEfl = checkForArgumentAndRemoveFromARGV("--efl");
}
-sub portName()
+sub isEfl()
{
- determinePortName();
- return $portName;
+ determineIsEfl();
+ return $isEfl;
}
-sub isEfl()
+sub determineIsGtk()
{
- return portName() eq Efl;
+ return if defined($isGtk);
+ $isGtk = checkForArgumentAndRemoveFromARGV("--gtk");
}
sub isGtk()
{
- return portName() eq GTK;
+ determineIsGtk();
+ return $isGtk;
}
# Determine if this is debian, ubuntu, linspire, or something similar.
@@ -1098,9 +1061,16 @@
sub isWinCairo()
{
- return portName() eq WinCairo;
+ determineIsWinCairo();
+ return $isWinCairo;
}
+sub determineIsWinCairo()
+{
+ return if defined($isWinCairo);
+ $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
+}
+
sub isWin64()
{
determineIsWin64();
@@ -1221,12 +1191,12 @@
sub isAppleMacWebKit()
{
- return (portName() eq Mac) || isIOSWebKit();
+ return isDarwin() && !isGtk();
}
sub isAppleWinWebKit()
{
- return portName() eq AppleWin;
+ return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk();
}
sub iOSSimulatorDevicesPath
@@ -1289,7 +1259,8 @@
sub isIOSWebKit()
{
- return portName() eq iOS;
+ determineXcodeSDK();
+ return isAppleMacWebKit() && (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK());
}
sub determineNmPath()
@@ -2090,7 +2061,12 @@
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 "";
}
sub determineIsCMakeBuild()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
