Diff
Modified: trunk/ChangeLog (240135 => 240136)
--- trunk/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Makefile.shared (240135 => 240136)
--- trunk/Makefile.shared 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Makefile.shared 2019-01-18 00:43:25 UTC (rev 240136)
@@ -34,8 +34,9 @@
endif
endif
-ifneq (,$(SDK_VARIANT))
- XCODE_OPTIONS += SDK_VARIANT="$(SDK_VARIANT)"
+ifeq (iosmac,$(SDK_VARIANT))
+ XCODE_OPTIONS += SDK_VARIANT=iosmac
+ XCODE_OPTIONS += WK_ALTERNATE_FRAMEWORKS_DIR=/System/iOSSupport
endif
DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
Modified: trunk/PerformanceTests/ChangeLog (240135 => 240136)
--- trunk/PerformanceTests/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/PerformanceTests/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Deleted: trunk/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/_javascript_Core/ChangeLog (240135 => 240136)
--- trunk/Source/_javascript_Core/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
@@ -152,7 +151,12 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
@@ -163,6 +167,13 @@
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iosmac = cocoatouch;
Deleted: trunk/Source/_javascript_Core/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/_javascript_Core/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/_javascript_Core/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (240135 => 240136)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,5 +1,4 @@
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
@@ -76,10 +75,20 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Deleted: trunk/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (240135 => 240136)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,5 +1,4 @@
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
@@ -100,6 +99,10 @@
NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
Deleted: trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/WTF/ChangeLog (240135 => 240136)
--- trunk/Source/WTF/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WTF/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
@@ -136,6 +135,20 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
+WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Deleted: trunk/Source/WTF/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/WTF/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WTF/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/WebCore/ChangeLog (240135 => 240136)
--- trunk/Source/WebCore/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Devin Rousso <[email protected]>
Web Inspector: fix Xcode project file list after r239976
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
@@ -128,6 +127,19 @@
// This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iosmac = cocoatouch;
Deleted: trunk/Source/WebCore/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/WebCore/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (240135 => 240136)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -165,6 +165,10 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h;
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
Modified: trunk/Source/WebCore/PAL/ChangeLog (240135 => 240136)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Tim Horton <[email protected]>
Adopt NSTextCheckingSuppressInitialCapitalizationKey
Modified: trunk/Source/WebCore/PAL/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
@@ -125,6 +124,19 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iosmac = cocoatouch;
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (240135 => 240136)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -53,6 +53,11 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png;
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_NO = YES;
+WK_NOT_YES = NO;
+
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
Deleted: trunk/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/WebInspectorUI/ChangeLog (240135 => 240136)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,5 +1,4 @@
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
@@ -86,7 +85,12 @@
COMBINE_INSPECTOR_RESOURCES = YES;
COMBINE_TEST_RESOURCES = NO;
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
@@ -94,6 +98,10 @@
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iosmac = cocoatouch;
Deleted: trunk/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/WebKit/ChangeLog (240135 => 240136)
--- trunk/Source/WebKit/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKit/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 John Wilander <[email protected]>
Add infrastructure to enable/disable ITP Debug Mode through Preferences
Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/WebKit/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
@@ -136,6 +135,19 @@
// This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.
LLVM_TARGET_TRIPLE_SUFFIX = $(inherited);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iosmac = cocoatouch;
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (240135 => 240136)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -96,6 +96,10 @@
WK_MANUAL_SANDBOXING_DEFINES = $(WK_MANUAL_SANDBOXING_DEFINES_$(WK_MANUAL_SANDBOXING_ENABLED));
WK_MANUAL_SANDBOXING_DEFINES_YES = ENABLE_MANUAL_SANDBOXING;
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
Deleted: trunk/Source/WebKit/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/WebKit/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKit/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (240135 => 240136)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
@@ -125,6 +124,19 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iosmac = cocoatouch;
Deleted: trunk/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (240135 => 240136)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -126,6 +126,10 @@
WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
Modified: trunk/Source/bmalloc/ChangeLog (240135 => 240136)
--- trunk/Source/bmalloc/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/bmalloc/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Jer Noble <[email protected]>
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
@@ -128,10 +127,20 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Deleted: trunk/Source/bmalloc/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Source/bmalloc/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Source/bmalloc/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/ChangeLog (240135 => 240136)
--- trunk/Tools/ChangeLog 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/ChangeLog 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,3 +1,16 @@
+2019-01-17 Truitt Savell <[email protected]>
+
+ Unreviewed, rolling out r240124.
+
+ This commit broke an internal build.
+
+ Reverted changeset:
+
+ "SDK_VARIANT build destinations should be separate from non-
+ SDK_VARIANT builds"
+ https://bugs.webkit.org/show_bug.cgi?id=189553
+ https://trac.webkit.org/changeset/240124
+
2019-01-17 Alex Christensen <[email protected]>
Fix string concatenation API test after r239920
Modified: trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Deleted: trunk/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
@@ -29,6 +28,10 @@
USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
Deleted: trunk/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Deleted: trunk/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Deleted: trunk/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Deleted: trunk/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (240135 => 240136)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2019-01-18 00:43:25 UTC (rev 240136)
@@ -51,7 +51,6 @@
from checkers.messagesin import MessagesInChecker
from checkers.png import PNGChecker
from checkers.python import PythonChecker
-from checkers.sdkvariant import SDKVariantChecker
from checkers.test_expectations import TestExpectationsChecker
from checkers.text import TextChecker
from checkers.watchlist import WatchListChecker
@@ -417,7 +416,6 @@
categories = categories.union(ChangeLogChecker.categories)
categories = categories.union(PNGChecker.categories)
categories = categories.union(FeatureDefinesChecker.categories)
- categories = categories.union(SDKVariantChecker.categories)
# FIXME: Consider adding all of the pep8 categories. Since they
# are not too meaningful for documentation purposes, for
@@ -571,7 +569,6 @@
XCODEPROJ = 10
CMAKE = 11
FEATUREDEFINES = 12
- SDKVARIANT = 13
class CheckerDispatcher(object):
@@ -659,8 +656,6 @@
return FileType.TEXT
elif os.path.basename(file_path) == "FeatureDefines.xcconfig":
return FileType.FEATUREDEFINES
- elif os.path.basename(file_path) == "SDKVariant.xcconfig":
- return FileType.SDKVARIANT
else:
return FileType.NONE
@@ -725,8 +720,6 @@
checker = WatchListChecker(file_path, handle_style_error)
elif file_type == FileType.FEATUREDEFINES:
checker = FeatureDefinesChecker(file_path, handle_style_error)
- elif file_type == FileType.SDKVARIANT:
- checker = SDKVariantChecker(file_path, handle_style_error)
else:
raise ValueError('Invalid file type "%(file_type)s": the only valid file types '
"are %(NONE)s, %(CPP)s, and %(TEXT)s."
Deleted: trunk/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py (240135 => 240136)
--- trunk/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/sdkvariant.py 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,81 +0,0 @@
-# Copyright (C) 2018 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-"""Supports ensuring equality of SDKVariant.xcconfig files."""
-
-import os
-
-from webkitpy.common.system.systemhost import SystemHost
-
-SDK_VARIANT_FILES = [
- "PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig",
- "Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig",
- "Tools/WebEditingTester/Configurations/SDKVariant.xcconfig",
- "Tools/MiniBrowser/Configurations/SDKVariant.xcconfig",
- "Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig",
- "Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig",
- "Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig",
- "Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig",
- "Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig",
- "Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig",
- "Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig",
- "Source/bmalloc/Configurations/SDKVariant.xcconfig",
- "Source/WTF/Configurations/SDKVariant.xcconfig",
- "Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig",
- "Source/WebInspectorUI/Configurations/SDKVariant.xcconfig",
- "Source/WebKit/Configurations/SDKVariant.xcconfig",
- "Source/_javascript_Core/Configurations/SDKVariant.xcconfig",
- "Source/WebCore/Configurations/SDKVariant.xcconfig",
- "Source/WebCore/PAL/Configurations/SDKVariant.xcconfig",
- "Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig",
- "Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig",
-]
-
-
-class SDKVariantChecker(object):
- categories = set(['SDKVariant/new', 'SDKVariant/equality'])
-
- def __init__(self, file_path, handle_style_error):
- self._file_path = file_path
- self._handle_style_error = handle_style_error
- self._handle_style_error.turn_off_line_filtering()
- self._host = SystemHost()
- self._fs = self._host.filesystem
-
- def check(self, inline=None):
- if self._file_path not in SDK_VARIANT_FILES:
- self._handle_style_error(0, 'SDKVariant/new', 5, "Patch introduces a new SDKVariant.xcconfig, which check-webkit-style doesn't know about. Please add it to the list in SDKVariant.py.")
- return
-
- with self._fs.open_binary_file_for_reading(self._file_path) as filehandle:
- baseline_content = filehandle.read()
-
- other_SDK_VARIANTs_files = SDK_VARIANT_FILES
- other_SDK_VARIANTs_files.remove(self._file_path)
-
- for path in other_SDK_VARIANTs_files:
- with self._fs.open_binary_file_for_reading(path) as filehandle:
- test_content = filehandle.read()
- if baseline_content != test_content:
- self._handle_style_error(0, 'SDKVariant/equality', 5, "Any changes made to SDKVariant should be made to all of them (changed file does not match {0}).".format(path))
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
@@ -106,6 +105,16 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
+WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
+
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
WK_COCOA_TOUCH_iphoneos = cocoatouch;
WK_COCOA_TOUCH_iosmac = cocoatouch;
Deleted: trunk/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/WebEditingTester/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Deleted: trunk/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Deleted: trunk/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/WebKitLauncher/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
@@ -100,6 +99,10 @@
WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
Deleted: trunk/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig (240135 => 240136)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -22,7 +22,6 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
-#include "SDKVariant.xcconfig"
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Deleted: trunk/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig (240135 => 240136)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig 2019-01-18 00:19:07 UTC (rev 240135)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig 2019-01-18 00:43:25 UTC (rev 240136)
@@ -1,45 +0,0 @@
-// Copyright (C) 2019 Apple Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-WK_EMPTY_ = YES;
-WK_NOT_ = YES;
-WK_NOT_YES = NO;
-
-WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
-WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
-WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
-
-WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
-WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
-WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
-
-WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
-
-WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
-WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
-
-EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
-EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);
