Skip to content

Commit 05d1911

Browse files
arobenwebkit-commit-queue
aroben
authored and
webkit-commit-queue
committed
Adopt FALLBACK_PLATFORM
https://bugs.webkit.org/show_bug.cgi?id=219504 Patch by Adam Roben <aroben@apple.com> on 2020-12-03 Reviewed by Tim Horton. PerformanceTests: * MediaTime/Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/bmalloc: * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/JavaScriptCore: * Configurations/SDKVariant.xcconfig: * JavaScriptCore.xcodeproj/project.pbxproj: * Scripts/check-xcfilelists.sh: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/ThirdParty: * gtest/xcode/Config/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/ThirdParty/ANGLE: * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/ThirdParty/libwebrtc: * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/WebCore: * Configurations/SDKVariant.xcconfig: * Scripts/check-xcfilelists.sh: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/WebCore/PAL: * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/WebInspectorUI: * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/WebKit: * Configurations/SDKVariant.xcconfig: * Scripts/check-xcfilelists.sh: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/WebKitLegacy: * scripts/check-xcfilelists.sh: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/WebKitLegacy/mac: * Configurations/SDKVariant.xcconfig: * Configurations/WebKitLegacy.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Source/WTF: * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Tools: * ContentExtensionTester/Configurations/SDKVariant.xcconfig: * DumpRenderTree/mac/Configurations/SDKVariant.xcconfig: * ImageDiff/cg/Configurations/SDKVariant.xcconfig: * MiniBrowser/Configurations/SDKVariant.xcconfig: * MobileMiniBrowser/Configurations/SDKVariant.xcconfig: * TestWebKitAPI/Configurations/SDKVariant.xcconfig: * WebEditingTester/Configurations/SDKVariant.xcconfig: * WebKitTestRunner/Configurations/SDKVariant.xcconfig: * lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME as before. Canonical link: https://commits.webkit.org/232103@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270420 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 1000c0e commit 05d1911

41 files changed

Lines changed: 269 additions & 27 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.

‎PerformanceTests/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-12-03 Adam Roben <aroben@apple.com>
2+
3+
Adopt FALLBACK_PLATFORM
4+
https://bugs.webkit.org/show_bug.cgi?id=219504
5+
6+
Reviewed by Tim Horton.
7+
8+
* MediaTime/Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM
9+
it if it's defined, otherwise use PLATFORM_NAME as before.
10+
111
2020-11-30 Tadeu Zagallo <tzagallo@apple.com>
212

313
Add C and ObjC tests to APIBench

‎PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
2525
WK_NOT_ = YES;
2626
WK_NOT_YES = NO;
2727

28+
WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
29+
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
30+
WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
31+
2832
WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
2933
WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
3034
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
3842

3943
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4044
WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
41-
WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
45+
WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
4246

4347
EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4448
EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2020-12-03 Adam Roben <aroben@apple.com>
2+
3+
Adopt FALLBACK_PLATFORM
4+
https://bugs.webkit.org/show_bug.cgi?id=219504
5+
6+
Reviewed by Tim Horton.
7+
8+
* Configurations/SDKVariant.xcconfig:
9+
* JavaScriptCore.xcodeproj/project.pbxproj:
10+
* Scripts/check-xcfilelists.sh:
11+
Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
12+
as before.
13+
114
2020-12-03 Yusuke Suzuki <ysuzuki@apple.com>
215

316
[JSC] not using std::make_pair for workaround of (possibly) ASan bug

‎Source/JavaScriptCore/Configurations/SDKVariant.xcconfig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
2525
WK_NOT_ = YES;
2626
WK_NOT_YES = NO;
2727

28+
WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
29+
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
30+
WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
31+
2832
WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
2933
WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
3034
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
3842

3943
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4044
WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
41-
WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
45+
WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
4246

4347
EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4448
EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10987,7 +10987,7 @@
1098710987
);
1098810988
runOnlyForDeploymentPostprocessing = 1;
1098910989
shellPath = /bin/sh;
10990-
shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"\n";
10990+
shellScript = "if [[ ${FALLBACK_PLATFORM:-$PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\" ]]; then\n mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks\"\nfi\n\nln -s -h -f ../Frameworks/JavaScriptCore.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/JavaScriptCore.framework\"\n";
1099110991
};
1099210992
3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
1099310993
isa = PBXShellScriptBuildPhase;

‎Source/JavaScriptCore/Scripts/check-xcfilelists.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
99
[ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
1010
[ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
1111

12-
"${SCRIPT}" generate-xcode --project JavaScriptCore --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
12+
"${SCRIPT}" generate-xcode --project JavaScriptCore --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"

‎Source/ThirdParty/ANGLE/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-12-03 Adam Roben <aroben@apple.com>
2+
3+
Adopt FALLBACK_PLATFORM
4+
https://bugs.webkit.org/show_bug.cgi?id=219504
5+
6+
Reviewed by Tim Horton.
7+
8+
* Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
9+
defined, otherwise use PLATFORM_NAME as before.
10+
111
2020-12-02 Dean Jackson <dino@apple.com>
212

313
Build fix for Mac Catalyst. Include the SystemInfo header.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
2525
WK_NOT_ = YES;
2626
WK_NOT_YES = NO;
2727

28+
WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
29+
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
30+
WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
31+
2832
WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
2933
WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
3034
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
3842

3943
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4044
WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
41-
WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
45+
WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
4246

4347
EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4448
EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

‎Source/ThirdParty/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-12-03 Adam Roben <aroben@apple.com>
2+
3+
Adopt FALLBACK_PLATFORM
4+
https://bugs.webkit.org/show_bug.cgi?id=219504
5+
6+
Reviewed by Tim Horton.
7+
8+
* gtest/xcode/Config/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if
9+
it's defined, otherwise use PLATFORM_NAME as before.
10+
111
2020-10-12 Luming Yin <luming_yin@apple.com>
212

313
[macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
2525
WK_NOT_ = YES;
2626
WK_NOT_YES = NO;
2727

28+
WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
29+
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
30+
WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
31+
2832
WK_ALTERNATE_FRAMEWORKS_DIR = $(WK_ALTERNATE_FRAMEWORKS_DIR_$(SDK_VARIANT));
2933
WK_ALTERNATE_FRAMEWORKS_DIR_iosmac = /System/iOSSupport;
3034
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
@@ -38,7 +42,7 @@ WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
3842

3943
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4044
WK_PLATFORM_NAME_ALTERNATE_YES = $(WK_ALTERNATE_PLATFORM_NAME);
41-
WK_PLATFORM_NAME_ALTERNATE_NO = $(PLATFORM_NAME);
45+
WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
4246

4347
EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
4448
EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);

0 commit comments

Comments
 (0)