Skip to content

Commit 024ecd8

Browse files
David Kilzerddkilzer
David Kilzer
authored and
ddkilzer
committed
Unify copies of SDKVariant.xcconfig
https://bugs.webkit.org/show_bug.cgi?id=244374 <rdar://99169843> Reviewed by Alexey Proskuryakov. - Create Configurations folder and move a copy of SDKVariant.xcconfig into it. - Add Configurations folder to WebKit.xcworkspace. - Update `installsrc` target in Makefile to copy Configurations folder. - Remove duplicate copies of SDKVariant.xcconfig in each project. - Remove SDKVariant.xcconfig from Xcode projects. - Change references to SDKVariant.xcconfig to use a relative path to the single copy. - Remove SDKVariantChecker from check-webkit-style since it's no longer needed. * Configurations/SDKVariant.xcconfig: Rename from Source/JavaScriptCore/Configurations/SDKVariant.xcconfig. * Makefile: (installsrc): * Source/JavaScriptCore/Configurations/Base.xcconfig: * Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: * Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj: * Source/ThirdParty/ANGLE/Configurations/Base.xcconfig: * Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig: Remove. * Source/ThirdParty/gtest/xcode/Config/General.xcconfig: * Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig: Remove. * Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig: * Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig: Remove. * Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj: * Source/WTF/Configurations/Base.xcconfig: * Source/WTF/Configurations/SDKVariant.xcconfig: Remove. * Source/WTF/WTF.xcodeproj/project.pbxproj: * Source/WebCore/Configurations/Base.xcconfig: * Source/WebCore/Configurations/SDKVariant.xcconfig: Remove. * Source/WebCore/PAL/Configurations/Base.xcconfig: * Source/WebCore/PAL/Configurations/SDKVariant.xcconfig: Remove. * Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebGPU/Configurations/Base.xcconfig: * Source/WebGPU/Configurations/SDKVariant.xcconfig: Remove. * Source/WebGPU/WebGPU.xcodeproj/project.pbxproj: * Source/WebInspectorUI/Configurations/Base.xcconfig: * Source/WebInspectorUI/Configurations/SDKVariant.xcconfig: Remove. * Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj: * Source/WebKit/Configurations/Base.xcconfig: * Source/WebKit/Configurations/SDKVariant.xcconfig: Remove. * Source/WebKit/SwiftOverlay/Configurations/Base.xcconfig: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj: * Source/WebKitLegacy/mac/Configurations/Base.xcconfig: * Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig: Remove. * Source/bmalloc/Configurations/Base.xcconfig: * Source/bmalloc/Configurations/SDKVariant.xcconfig: Remove. * Source/bmalloc/bmalloc.xcodeproj/project.pbxproj: * Tools/ContentExtensionTester/Configurations/Base.xcconfig: * Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig: Remove. * Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: * Tools/DumpRenderTree/mac/Configurations/Base.xcconfig: * Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig: Remove. * Tools/ImageDiff/ImageDiff.xcodeproj/project.pbxproj: * Tools/ImageDiff/cg/Configurations/Base.xcconfig: * Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig: Remove. * Tools/MiniBrowser/Configurations/Base.xcconfig: * Tools/MiniBrowser/Configurations/SDKVariant.xcconfig: Remove. * Tools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj: * Tools/MobileMiniBrowser/Configurations/Base.xcconfig: * Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig: Remove. * Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj: * Tools/Scripts/webkitpy/style/checker.py: (_all_categories): (CheckerDispatcher._file_type): (CheckerDispatcher._create_checker): * Tools/Scripts/webkitpy/style/checkers/sdkvariant.py: Remove. * Tools/TestWebKitAPI/Configurations/Base.xcconfig: * Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig: Remove. * Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * Tools/WebEditingTester/Configurations/Base.xcconfig: * Tools/WebEditingTester/Configurations/SDKVariant.xcconfig: Remove. * Tools/WebKitTestRunner/Configurations/Base.xcconfig: * Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig: Remove. * Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: * Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig: * Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig: Remove. * WebKit.xcworkspace/contents.xcworkspacedata: Canonical link: https://commits.webkit.org/253857@main
1 parent 7d5d99e commit 024ecd8

File tree

64 files changed

+26
-1424
lines changed

Some content is hidden

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

64 files changed

+26
-1424
lines changed

‎Source/JavaScriptCore/Configurations/SDKVariant.xcconfig renamed to ‎Configurations/SDKVariant.xcconfig

File renamed without changes.

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@ clean:
4343

4444
installsrc:
4545
$(build_target_for_each_module)
46+
ditto Configurations "$(SRCROOT)/Configurations"
4647

4748
endif # USE_WORKSPACE

‎Source/JavaScriptCore/Configurations/Base.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
2525
#include? "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/PlatformSupport.xcconfig"
26-
#include "SDKVariant.xcconfig"
26+
#include "../../../Configurations/SDKVariant.xcconfig"
2727
#include "WebKitTargetConditionals.xcconfig"
2828

2929
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));

‎Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -4648,7 +4648,6 @@
46484648
A1712B4011C7B235007A5315 /* RegExpKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegExpKey.h; sourceTree = "<group>"; };
46494649
A18193E11B4E0CDB00FC1029 /* IntlCollatorConstructor.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntlCollatorConstructor.lut.h; sourceTree = "<group>"; };
46504650
A18193E21B4E0CDB00FC1029 /* IntlCollatorPrototype.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntlCollatorPrototype.lut.h; sourceTree = "<group>"; };
4651-
A1B89B88221E002A00EB4CEA /* SDKVariant.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SDKVariant.xcconfig; sourceTree = "<group>"; };
46524651
A1B9E2331B4E0D6700BC7FED /* IntlCollator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntlCollator.cpp; sourceTree = "<group>"; };
46534652
A1B9E2341B4E0D6700BC7FED /* IntlCollator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntlCollator.h; sourceTree = "<group>"; };
46544653
A1B9E2351B4E0D6700BC7FED /* IntlCollatorConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntlCollatorConstructor.cpp; sourceTree = "<group>"; };
@@ -7053,7 +7052,6 @@
70537052
1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */,
70547053
1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */,
70557054
5DAFD6CB146B686300FBEFB4 /* JSC.xcconfig */,
7056-
A1B89B88221E002A00EB4CEA /* SDKVariant.xcconfig */,
70577055
E3D6F6EF25D791B300C20EB4 /* TestAPI.xcconfig */,
70587056
BC021BF2136900C300FC5467 /* ToolExecutable.xcconfig */,
70597057
1C9051420BA9E8A70081E9D0 /* Version.xcconfig */,

‎Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,6 @@
14101410
7BCF49C228AD1C8C0090D34A /* apple_platform_utils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = apple_platform_utils.mm; sourceTree = "<group>"; };
14111411
7BCF49C328AD1C8C0090D34A /* CircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularBuffer.h; sourceTree = "<group>"; };
14121412
7BCF49C428AD1C8C0090D34A /* apple_platform_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = apple_platform_utils.h; sourceTree = "<group>"; };
1413-
A1B89B89221E003A00EB4CEA /* SDKVariant.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = SDKVariant.xcconfig; sourceTree = "<group>"; };
14141413
A264F89316974DED006FAA5A /* DiagnosticsBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DiagnosticsBase.cpp; sourceTree = "<group>"; };
14151414
A264F89416974DED006FAA5A /* DiagnosticsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagnosticsBase.h; sourceTree = "<group>"; };
14161415
A264F89516974DED006FAA5A /* DirectiveHandlerBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectiveHandlerBase.cpp; sourceTree = "<group>"; };
@@ -2730,7 +2729,6 @@
27302729
FFE0D91526A0B4E80071ADAE /* AngleMetalLib.xcconfig */,
27312730
5D7C59C61208C68B001C873E /* Base.xcconfig */,
27322731
5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */,
2733-
A1B89B89221E003A00EB4CEA /* SDKVariant.xcconfig */,
27342732
3153ACFF239071D900D51DD8 /* Version.xcconfig */,
27352733
3153ACFE239071D900D51DD8 /* WebKitTargetConditionals.xcconfig */,
27362734
);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
22
#include? "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/PlatformSupport.xcconfig"
3-
#include "SDKVariant.xcconfig"
3+
#include "../../../../Configurations/SDKVariant.xcconfig"
44
#include "WebKitTargetConditionals.xcconfig"
55

66
CODE_SIGN_IDENTITY = -;

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

-64
This file was deleted.

‎Source/ThirdParty/gtest/xcode/Config/General.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99

1010
#include? "../../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
11-
#include "SDKVariant.xcconfig"
11+
#include "../../../../../Configurations/SDKVariant.xcconfig"
1212

1313
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
1414
USE_INTERNAL_SDK_Production = YES;

‎Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig

-64
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
2525
#include? "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/PlatformSupport.xcconfig"
26-
#include "SDKVariant.xcconfig"
26+
#include "../../../../Configurations/SDKVariant.xcconfig"
2727
#include "WebKitTargetConditionals.xcconfig"
2828

2929
CODE_SIGN_IDENTITY = -;

‎Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig

-64
This file was deleted.

‎Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -8981,7 +8981,6 @@
89818981
5D7C59C51208C68B001C873E /* libwebrtc.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libwebrtc.xcconfig; sourceTree = "<group>"; };
89828982
5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
89838983
5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
8984-
A1B89B8A221E004C00EB4CEA /* SDKVariant.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SDKVariant.xcconfig; sourceTree = "<group>"; };
89858984
CD381F252581591F0077DEC8 /* WebKitVP8Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitVP8Decoder.h; sourceTree = "<group>"; };
89868985
CD381F282581591F0077DEC8 /* WebKitVP8Decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitVP8Decoder.cpp; sourceTree = "<group>"; };
89878986
CD381F2A2581FEBA0077DEC8 /* WebKitDecoderReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitDecoderReceiver.cpp; sourceTree = "<group>"; };
@@ -16850,7 +16849,6 @@
1685016849
5D7C59C51208C68B001C873E /* libwebrtc.xcconfig */,
1685116850
5C08848A1E4A978C00403995 /* libyuv.xcconfig */,
1685216851
5C4B4A8F1E42C431002651C8 /* opus.xcconfig */,
16853-
A1B89B8A221E004C00EB4CEA /* SDKVariant.xcconfig */,
1685416852
5C11A0331E4576A9004F0987 /* usrsctp.xcconfig */,
1685516853
37119A8020CCB6DD002C6DC9 /* Version.xcconfig */,
1685616854
37119A8120CCB6DD002C6DC9 /* WebKitTargetConditionals.xcconfig */,

‎Source/WTF/Configurations/Base.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +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"
25+
#include "../../../Configurations/SDKVariant.xcconfig"
2626

2727
CODE_SIGN_IDENTITY = -;
2828

‎Source/WTF/Configurations/SDKVariant.xcconfig

-64
This file was deleted.

0 commit comments

Comments
 (0)