Adopt FALLBACK_PLATFORM
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Dec 2020 01:22:19 +0000 (01:22 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Dec 2020 01:22:19 +0000 (01:22 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270420 268f45cc-cd09-0410-ab3c-d52691b4dbfc

41 files changed:
PerformanceTests/ChangeLog
PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/SDKVariant.xcconfig
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/Scripts/check-xcfilelists.sh
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig
Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig
Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig
Source/WTF/ChangeLog
Source/WTF/Configurations/SDKVariant.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/SDKVariant.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/SDKVariant.xcconfig
Source/WebCore/Scripts/check-xcfilelists.sh
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Configurations/SDKVariant.xcconfig
Source/WebKit/ChangeLog
Source/WebKit/Configurations/SDKVariant.xcconfig
Source/WebKit/Scripts/check-xcfilelists.sh
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig
Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKitLegacy/scripts/check-xcfilelists.sh
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/SDKVariant.xcconfig
Tools/ChangeLog
Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig
Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig
Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig
Tools/MiniBrowser/Configurations/SDKVariant.xcconfig
Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig
Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig
Tools/WebEditingTester/Configurations/SDKVariant.xcconfig
Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig
Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig

index a0de5decadae0b58085ab8a030a833f75d4890f7..827753216fd92ae0358ef347846fd61bd913e8c0 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * MediaTime/Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM
+        it if it's defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-30  Tadeu Zagallo  <tzagallo@apple.com>
 
         Add C and ObjC tests to APIBench
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index 8f66d85e3680331c51361ad13f777450c2a7d494..a64cd7b7ff25c323d3eb7b7eb942e3a2b80a9f89 100644 (file)
@@ -1,3 +1,16 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * 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.
+
 2020-12-03  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] not using std::make_pair for workaround of (possibly) ASan bug
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index bc03c78cb1181ff2239ae1b11d3f44c8ea4fd809..87d758653966ceb81669f0c542a9b4fa2f618b55 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
-                       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";
+                       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";
                };
                3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
                        isa = PBXShellScriptBuildPhase;
index 8ceb164c77af772eb756515cc29e3d2658ee9fc8..36d0bc95304f94e38375ec34c58733db9bec40b7 100755 (executable)
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project JavaScriptCore --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project JavaScriptCore --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
index 89ee03a7d7691e7c2228fc79e30917b8d04be221..5a1e28b87ad182a2d4ffcd7be02defed7c78be01 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-02  Dean Jackson  <dino@apple.com>
 
         Build fix for Mac Catalyst. Include the SystemInfo header.
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index 5147097efa12d0f4494443488248a07e9b6be5ee..907034a5fe9ad6abe544f6fa49281458886737ec 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * gtest/xcode/Config/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if
+        it's defined, otherwise use PLATFORM_NAME as before.
+
 2020-10-12  Luming Yin  <luming_yin@apple.com>
 
         [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building 
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index e33fc60dde34a8f78f25f582f42f71c6d82ab5be..88a772c57e8db85ef1d138ff6ab4ee48f5e77cc3 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-01  Youenn Fablet  <youenn@apple.com>
 
         libwebrtc.dylib relies on dead code stripping (fails to link if dead code is not stripped in Debug builds)
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index be27678559182b92710597162937f3f6af86f6c4..33e3af5d4f72e149aa6250bcc8bce88188e53991 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-03  Chris Dumez  <cdumez@apple.com>
 
         Refactor macros for low power mode code
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index 236b82a64d412f54f1b5dcc9aefb8327c879ec9b..26468eb50f2cb60a31034f05b8639473efc6b184 100644 (file)
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * Scripts/check-xcfilelists.sh:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-03  Said Abou-Hallawa  <said@apple.com>
 
         [GPU Process] Disconnect NativeImages from RemoteResourceCacheProxy when RemoteRenderingBackendProxy is destroyed
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index 26fad28cd6a4fef70a7243b7dd7f830b57b7dff1..60be92027c74decc43eac3a8ccecb27a9b15047a 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-30  Per Arne Vollan  <pvollan@apple.com>
 
         [macOS] Adopt SPI to prevent establishing XPC connections to Launch Services
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index c318aa911767ff0b0447a51665df4e51f73a0f6e..72c36ba3d601ca037c974599a5439e4cdd5492ab 100755 (executable)
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebCore --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebCore --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
index e36c466fb5265292f6cc4a7421feeb7cd3ab94bf..fdd211cb6e81a9669dc104b5f0fcc2bac1a49d58 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-21  Brian Burg  <bburg@apple.com>
 
         Web Inspector: implement Multimap.prototype.take()
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index e1692b1a36c752d0bca991f22004d7c24e4a31c5..1d260e8eac96ec0523497d2e4481ad2e8c1d5342 100644 (file)
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * Scripts/check-xcfilelists.sh:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-03  Chris Dumez  <cdumez@apple.com>
 
         Drop unimplemented suspension functions on GPUConnectionToWebProcess and WebAuthnConnectionToWebProcess
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index 0bb128a8bfe9e9030e8663efb50e60f1ac06e754..bfb99e88782ee1cfa91ec8de6ef35ba468012796 100755 (executable)
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebKit --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebKit --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
index a0c9482c4a21e4b7e6c00cd1d75e542c5822f2fe..334aeb8b070029ccdf79021c3d55942e9d31b755 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * scripts/check-xcfilelists.sh: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-12-01  Keith Rollin  <krollin@apple.com>
 
         Consolidate header postprocessing scripts
index 30e913dc8ce668a30ea20c353ae4201b0fa2f2eb..2b143dd68dac00a2f1fa901cf3171c07fa124b25 100644 (file)
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * Configurations/WebKitLegacy.xcconfig:
+        Use FALLBACK_PLATFORM it if it's defined, otherwise use PLATFORM_NAME
+        as before.
+
 2020-12-01  Keith Rollin  <krollin@apple.com>
 
         Consolidate header postprocessing scripts
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index cbcf0b78798659b439d0e8b8c5fd642511e81a5a..863e7877afb21b9c22bb36080a59151356ae0cc9 100644 (file)
@@ -127,7 +127,7 @@ WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
 WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
 WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
 WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME)_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBCORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(FALLBACK_PLATFORM:default=$(PLATFORM_NAME))_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
 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;
index 65f9610cd130f7b4bf636dea481c071b2e03c750..341ed5a00c19337e5816a0c21063600fd50cce72 100755 (executable)
@@ -9,4 +9,4 @@ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project WebKitLegacy --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project WebKitLegacy --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"
index bd4c25b5bdce184369756d0db07ab1879939e4d9..050b4456170a686a1373389bc5b642b2184cd8e4 100644 (file)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig: Use FALLBACK_PLATFORM it if it's
+        defined, otherwise use PLATFORM_NAME as before.
+
 2020-11-04  David Kilzer  <ddkilzer@apple.com>
 
         Remove bmalloc::logVMFailure() and BSoftLinking.h
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index c7bef9ee6c4b18301a49ef17a980dd8870a81dfc..40f6f63044010b9092b23d1087c1b3a8a726e9d2 100644 (file)
@@ -1,3 +1,22 @@
+2020-12-03  Adam Roben  <aroben@apple.com>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * 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.
+
 2020-12-03  Alex Christensen  <achristensen@webkit.org>
 
         Serialize NFA to disk before converting it to a DFA when compiling a WKContentRuleList
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);
index fcdf7e65a67c61fb19ef19c428652f336c180e8e..554004608e9876ec7df5c85e36a3cd5d7bf0d1a6 100644 (file)
@@ -25,6 +25,10 @@ WK_EMPTY_ = YES;
 WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
+WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM)));
+WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
+WK_DEFAULT_PLATFORM_NAME_NO = $(FALLBACK_PLATFORM);
+
 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)));
@@ -38,7 +42,7 @@ 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);
+WK_PLATFORM_NAME_ALTERNATE_NO = $(WK_DEFAULT_PLATFORM_NAME);
 
 EFFECTIVE_PLATFORM_NAME = $(EFFECTIVE_PLATFORM_NAME_ALTERNATE_$(WK_USE_ALTERNATE_PLATFORM_NAME));
 EFFECTIVE_PLATFORM_NAME_ALTERNATE_YES = -$(WK_ALTERNATE_PLATFORM_NAME);