Skip to content

Commit 572d1c8

Browse files
kmiller68kmiller68
committed
Restore support for OVERRIDE_SUPPORTS_TEXT_BASED_API
https://bugs.webkit.org/show_bug.cgi?id=305142 rdar://167789155 Reviewed by Elliott Williams. https://commits.webkit.org/305167@main removed `OVERRIDE_SUPPORTS_TEXT_BASED_API` however this feature was commonly used in local development since it can save 30-60 seconds for incremental builds. This change restores the feature. Additionally, use $(OVERRIDE_*:default=YES) for TAPI and for module validation. Lastly, remove dead config code around `WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS` in JavaScriptCore.xcconfig Canonical link: https://commits.webkit.org/305385@main
1 parent c42e05d commit 572d1c8

7 files changed

Lines changed: 16 additions & 36 deletions

File tree

‎Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2009-2025 Apple Inc. All rights reserved.
1+
// Copyright (C) 2009-2026 Apple Inc. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions
@@ -24,10 +24,7 @@
2424
#include "BaseTarget.xcconfig"
2525

2626
DEFINES_MODULE = YES;
27-
ENABLE_MODULE_VERIFIER = $(ENABLE_MODULE_VERIFIER_$(OVERRIDE_ENABLE_MODULE_VERIFIER));
28-
ENABLE_MODULE_VERIFIER_ = YES;
29-
ENABLE_MODULE_VERIFIER_NO = NO;
30-
ENABLE_MODULE_VERIFIER_YES = YES;
27+
ENABLE_MODULE_VERIFIER = $(OVERRIDE_ENABLE_MODULE_VERIFIER:default=YES);
3128
OTHER_MODULE_VERIFIER_FLAGS = -- -I$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) -I$(WK_ADDITIONAL_SDKS)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(OTHER_MODULE_VERIFIER_FLAGS_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
3229
OTHER_MODULE_VERIFIER_FLAGS_ = -iframework "$(WK_PRIVATE_SDK_DIR)$(WK_OVERRIDE_FRAMEWORKS_DIR)" -isystem "$(WK_PRIVATE_SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)";
3330

@@ -80,24 +77,7 @@ MODULEMAP_PRIVATE_FILE_ = ;
8077
MODULEMAP_PRIVATE_FILE_NO = ;
8178
MODULEMAP_PRIVATE_FILE_YES = $(SRCROOT)/JavaScriptCore_Private.modulemap;
8279

83-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_$(WK_PLATFORM_NAME));
84-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_iphoneos = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_IOS_17));
85-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_iphonesimulator = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_IOS_17));
86-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_IOS_SINCE_17 = YES;
87-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_maccatalyst = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_MACCATALYST_14));
88-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_MACCATALYST_SINCE_14 = YES;
89-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_macosx = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_MACOS_1400));
90-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_MACOS_SINCE_1400 = YES;
91-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_appletvos = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_TVOS_17));
92-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_appletvsimulator = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_TVOS_17));
93-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_TVOS_SINCE_17 = YES;
94-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_watchos = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_WATCHOS_10));
95-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_watchsimulator = $(WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS$(WK_WATCHOS_10));
96-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_WATCHOS_SINCE_10 = YES;
97-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_xros = YES;
98-
WK_SUPPORTS_OTHER_TAPI_FLAGS_STATICLIBS_xrsimulator = YES;
99-
100-
SUPPORTS_TEXT_BASED_API = YES;
80+
SUPPORTS_TEXT_BASED_API = $(OVERRIDE_SUPPORTS_TEXT_BASED_API:default=YES);
10181
TAPI_USE_SRCROOT = YES;
10282
TAPI_ENABLE_PROJECT_HEADERS = YES;
10383
TAPI_VERIFY_MODE = Pedantic;

‎Source/WebCore/Configurations/WebCore.xcconfig‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,11 @@ OTHER_LDFLAGS_SHARED_CACHE = $(OTHER_LDFLAGS_SHARED_CACHE_$(ALLOW_SHARED_CACHE))
206206
OTHER_LDFLAGS_SHARED_CACHE_NO = -Wl,-not_for_dyld_shared_cache;
207207

208208
// Enable InstallAPI support, when built with WEBCORE_ENABLE_INSTALLAPI=YES.
209-
SUPPORTS_TEXT_BASED_API = $(SUPPORTS_TEXT_BASED_API_$(TARGET_NAME));
209+
SUPPORTS_TEXT_BASED_API = $(SUPPORTS_TEXT_BASED_API_$(OVERRIDE_SUPPORTS_TEXT_BASED_API));
210+
SUPPORTS_TEXT_BASED_API_ = $(SUPPORTS_TEXT_BASED_API_$(TARGET_NAME));
210211
SUPPORTS_TEXT_BASED_API_WebCore = $(WEBCORE_ENABLE_INSTALLAPI)
212+
SUPPORTS_TEXT_BASED_API_NO = NO;
213+
SUPPORTS_TEXT_BASED_API_YES = YES;
211214
TAPI_USE_SRCROOT = YES;
212215
TEXT_BASED_API_FILE = WebCore.tbd
213216

‎Source/WebGPU/Configurations/WebGPU.xcconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2009-2025 Apple Inc. All rights reserved.
1+
// Copyright (C) 2009-2026 Apple Inc. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions
@@ -73,7 +73,7 @@ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = gnu23 gnu++23;
7373
MODULE_VERIFIER_KIND = builtin;
7474
OTHER_MODULE_VERIFIER_FLAGS = -- -I$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) -I$(WK_ADDITIONAL_SDKS)$(WK_LIBRARY_HEADERS_FOLDER_PATH);
7575

76-
SUPPORTS_TEXT_BASED_API = YES;
76+
SUPPORTS_TEXT_BASED_API = $(OVERRIDE_SUPPORTS_TEXT_BASED_API:default=YES);
7777
TAPI_USE_SRCROOT = YES;
7878
TAPI_VERIFY_MODE = Pedantic;
7979

‎Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ GCC_DYNAMIC_NO_PIC = NO;
2929
GCC_PRECOMPILE_PREFIX_HEADER = YES;
3030
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(inherited) FRAMEWORK_NAME=WebInspectorUI;
3131

32-
SUPPORTS_TEXT_BASED_API = YES;
32+
SUPPORTS_TEXT_BASED_API = $(OVERRIDE_SUPPORTS_TEXT_BASED_API:default=YES);
3333
TAPI_USE_SRCROOT = YES;
3434

3535
SKIP_INSTALL[sdk=iphone*] = YES;

‎Source/WebKit/Configurations/Base.xcconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2010-2024 Apple Inc. All rights reserved.
1+
// Copyright (C) 2010-2026 Apple Inc. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions
@@ -131,7 +131,7 @@ WK_ENABLE_SWIFTUI[sdk=appletv*] = NO;
131131
WK_ENABLE_SWIFTUI[sdk=xros2.*] = NO;
132132
WK_ENABLE_SWIFTUI[sdk=xrsimulator2.*] = NO;
133133

134-
SUPPORTS_TEXT_BASED_API = YES;
134+
SUPPORTS_TEXT_BASED_API = $(OVERRIDE_SUPPORTS_TEXT_BASED_API:default=YES);
135135

136136
OTHER_TAPI_FLAGS = $(inherited) -DRELEASE_WITHOUT_OPTIMIZATIONS;
137137
TAPI_USE_SRCROOT = YES;

‎Source/WebKit/Configurations/WebKit.xcconfig‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2010-2024 Apple Inc. All rights reserved.
1+
// Copyright (C) 2010-2026 Apple Inc. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions
@@ -31,10 +31,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
3131
INFOPLIST_FILE = Info.plist;
3232

3333
DEFINES_MODULE = YES;
34-
ENABLE_MODULE_VERIFIER = $(ENABLE_MODULE_VERIFIER_$(OVERRIDE_ENABLE_MODULE_VERIFIER));
35-
ENABLE_MODULE_VERIFIER_ = YES;
36-
ENABLE_MODULE_VERIFIER_NO = NO;
37-
ENABLE_MODULE_VERIFIER_YES = YES;
34+
ENABLE_MODULE_VERIFIER = $(OVERRIDE_ENABLE_MODULE_VERIFIER:default=YES);
3835
OTHER_MODULE_VERIFIER_FLAGS = -- "-I$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(OTHER_MODULE_VERIFIER_FLAGS_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
3936
OTHER_MODULE_VERIFIER_FLAGS_ = -iframework "$(WK_PRIVATE_SDK_DIR)$(WK_OVERRIDE_FRAMEWORKS_DIR)" -isystem "$(WK_PRIVATE_SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)";
4037

‎Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2009-2023 Apple Inc. All rights reserved.
1+
// Copyright (C) 2009-2026 Apple Inc. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions
@@ -110,7 +110,7 @@ OTHER_LDFLAGS = $(inherited) -lobjc -lsqlite3 -framework CFNetwork -framework Co
110110
SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
111111
SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit.order;
112112

113-
SUPPORTS_TEXT_BASED_API = YES;
113+
SUPPORTS_TEXT_BASED_API = $(OVERRIDE_SUPPORTS_TEXT_BASED_API:default=YES);
114114
TAPI_USE_SRCROOT = YES;
115115
TAPI_VERIFY_MODE = Pedantic;
116116

0 commit comments

Comments
 (0)