Skip to content

Commit b6db47d

Browse files
jernoblejernoble
committed
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
https://bugs.webkit.org/show_bug.cgi?id=189553 Reviewed by Tim Horton. .: * Makefile.shared: PerformanceTests: * MediaTime/Configurations/Base.xcconfig: * MediaTime/Configurations/SDKVariant.xcconfig: Added. Source/bmalloc: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Source/JavaScriptCore: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Source/ThirdParty/libwebrtc: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Source/WebCore: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. * Configurations/WebCore.xcconfig: Source/WebCore/PAL: * Configurations/Base.xcconfig: * Configurations/PAL.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Source/WebInspectorUI: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Source/WebKit: * Configurations/Base.xcconfig: * Configurations/BaseTarget.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Source/WebKitLegacy/mac: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. * Configurations/WebKitLegacy.xcconfig: Source/WTF: * Configurations/Base.xcconfig: * Configurations/SDKVariant.xcconfig: Added. Tools: Add a check-webkit-style check that ensures all SDKVariant.xcconfig files match. * ContentExtensionTester/Configurations/Base.xcconfig: * ContentExtensionTester/Configurations/SDKVariant.xcconfig: Added. * DumpRenderTree/mac/Configurations/Base.xcconfig: * DumpRenderTree/mac/Configurations/SDKVariant.xcconfig: Added. * ImageDiff/cg/Configurations/Base.xcconfig: * ImageDiff/cg/Configurations/SDKVariant.xcconfig: Added. * MiniBrowser/Configurations/Base.xcconfig: * MiniBrowser/Configurations/SDKVariant.xcconfig: Added. * MobileMiniBrowser/Configurations/Base.xcconfig: * MobileMiniBrowser/Configurations/SDKVariant.xcconfig: Added. * Scripts/webkitpy/style/checker.py: (_all_categories): (FileType): (CheckerDispatcher._file_type): (CheckerDispatcher._create_checker): * Scripts/webkitpy/style/checkers/sdkvariant.py: Added. (SDKVariantChecker): (SDKVariantChecker.__init__): (SDKVariantChecker.check): * TestWebKitAPI/Configurations/Base.xcconfig: * TestWebKitAPI/Configurations/SDKVariant.xcconfig: Added. * WebEditingTester/Configurations/Base.xcconfig: * WebEditingTester/Configurations/SDKVariant.xcconfig: Added. * WebKitLauncher/Configurations/SDKVariant.xcconfig: Added. * WebKitTestRunner/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/SDKVariant.xcconfig: Added. * lldb/lldbWebKitTester/Configurations/Base.xcconfig: * lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig: Added. Canonical link: https://commits.webkit.org/208052@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240124 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 17b13f1 commit b6db47d

61 files changed

Lines changed: 1216 additions & 149 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2019-01-17 Jer Noble <jer.noble@apple.com>
2+
3+
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
4+
https://bugs.webkit.org/show_bug.cgi?id=189553
5+
6+
Reviewed by Tim Horton.
7+
8+
* Makefile.shared:
9+
110
2019-01-17 Per Arne Vollan <pvollan@apple.com>
211

312
[Win] gperf command not found

‎Makefile.shared‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ ifneq (,$(ARCHS))
3434
endif
3535
endif
3636

37-
ifeq (iosmac,$(SDK_VARIANT))
38-
XCODE_OPTIONS += SDK_VARIANT=iosmac
39-
XCODE_OPTIONS += WK_ALTERNATE_FRAMEWORKS_DIR=/System/iOSSupport
37+
ifneq (,$(SDK_VARIANT))
38+
XCODE_OPTIONS += SDK_VARIANT="$(SDK_VARIANT)"
4039
endif
4140

4241
DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")

‎PerformanceTests/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2019-01-17 Jer Noble <jer.noble@apple.com>
2+
3+
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
4+
https://bugs.webkit.org/show_bug.cgi?id=189553
5+
6+
Reviewed by Tim Horton.
7+
8+
* MediaTime/Configurations/Base.xcconfig:
9+
* MediaTime/Configurations/SDKVariant.xcconfig: Added.
10+
111
2018-12-20 Caio Lima <ticaiolima@gmail.com>
212

313
[BigInt] We should enable CSE into arithmetic operations that speculate BigIntUse

‎PerformanceTests/MediaTime/Configurations/Base.xcconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
25+
#include "SDKVariant.xcconfig"
2526

2627
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
2728
USE_INTERNAL_SDK_Production = YES;

‎PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright (C) 2019 Apple Inc. All rights reserved.
2+
//
3+
// Redistribution and use in source and binary forms, with or without
4+
// modification, are permitted provided that the following conditions
5+
// are met:
6+
// 1. Redistributions of source code must retain the above copyright
7+
// notice, this list of conditions and the following disclaimer.
8+
// 2. Redistributions in binary form must reproduce the above copyright
9+
// notice, this list of conditions and the following disclaimer in the
10+
// documentation and/or other materials provided with the distribution.
11+
//
12+
// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
13+
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
14+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
15+
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
16+
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
17+
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
18+
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
19+
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
20+
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
22+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23+
24+
WK_EMPTY_ = YES;
25+
WK_NOT_ = YES;
26+
WK_NOT_YES = NO;
27+
28+
WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
29+
WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
30+
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
31+
32+
WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
33+
WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
34+
WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
35+
36+
WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
37+
WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
38+
39+
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
40+
WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
41+
WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
42+
43+
EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
44+
EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
45+
EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2019-01-17 Jer Noble <jer.noble@apple.com>
2+
3+
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
4+
https://bugs.webkit.org/show_bug.cgi?id=189553
5+
6+
Reviewed by Tim Horton.
7+
8+
* Configurations/Base.xcconfig:
9+
* Configurations/SDKVariant.xcconfig: Added.
10+
111
2019-01-17 Saam barati <sbarati@apple.com>
212

313
StringObjectUse should not be a structure check for the original string object structure

‎Source/JavaScriptCore/Configurations/Base.xcconfig‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
25+
#include "SDKVariant.xcconfig"
2526

2627
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
2728
USE_INTERNAL_SDK_Production = YES;
@@ -151,12 +152,7 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
151152
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
152153
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
153154

154-
WK_EMPTY_ = YES;
155-
WK_NOT_ = YES;
156-
WK_NOT_YES = NO;
157-
158155
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
159-
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
160156

161157
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
162158
WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
@@ -167,13 +163,6 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRA
167163
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
168164
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
169165

170-
WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
171-
WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
172-
173-
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
174-
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
175-
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
176-
177166
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
178167
WK_COCOA_TOUCH_iphoneos = cocoatouch;
179168
WK_COCOA_TOUCH_iosmac = cocoatouch;

‎Source/JavaScriptCore/Configurations/SDKVariant.xcconfig‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright (C) 2019 Apple Inc. All rights reserved.
2+
//
3+
// Redistribution and use in source and binary forms, with or without
4+
// modification, are permitted provided that the following conditions
5+
// are met:
6+
// 1. Redistributions of source code must retain the above copyright
7+
// notice, this list of conditions and the following disclaimer.
8+
// 2. Redistributions in binary form must reproduce the above copyright
9+
// notice, this list of conditions and the following disclaimer in the
10+
// documentation and/or other materials provided with the distribution.
11+
//
12+
// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
13+
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
14+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
15+
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
16+
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
17+
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
18+
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
19+
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
20+
// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
22+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23+
24+
WK_EMPTY_ = YES;
25+
WK_NOT_ = YES;
26+
WK_NOT_YES = NO;
27+
28+
WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
29+
WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
30+
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
31+
32+
WK_ALTERNATE_PLATFORM_NAME = $(WK_ALTERNATE_PLATFORM_NAME_$(SDK_VARIANT));
33+
WK_ALTERNATE_PLATFORM_NAME_iosmac = iosmac;
34+
WK_USE_ALTERNATE_PLATFORM_NAME = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_PLATFORM_NAME)));
35+
36+
WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
37+
WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
38+
39+
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
40+
WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
41+
WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
42+
43+
EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
44+
EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
45+
EFFECTIVE_PLATFORM_NAME_ALTERNATE_NO = $(EFFECTIVE_PLATFORM_NAME);

‎Source/ThirdParty/ANGLE/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2019-01-17 Jer Noble <jer.noble@apple.com>
2+
3+
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds
4+
https://bugs.webkit.org/show_bug.cgi?id=189553
5+
6+
Reviewed by Tim Horton.
7+
8+
* Configurations/Base.xcconfig:
9+
* Configurations/SDKVariant.xcconfig: Added.
10+
111
2019-01-15 David Kilzer <ddkilzer@apple.com>
212

313
clang-tidy: Fix unnecessary copy of for loop variables in ANGLE

‎Source/ThirdParty/ANGLE/Configurations/Base.xcconfig‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
2+
#include "SDKVariant.xcconfig"
23

34
CODE_SIGN_IDENTITY = -;
45

@@ -75,20 +76,10 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
7576
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
7677
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
7778

78-
WK_EMPTY_ = YES;
79-
WK_NOT_ = YES;
80-
WK_NOT_YES = NO;
81-
82-
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
83-
8479
ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
8580
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
8681
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
8782

88-
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
89-
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
90-
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
91-
9283
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
9384
WK_LLVM_LTO_NO = NO;
9485
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);

0 commit comments

Comments
 (0)