Title: [270420] trunk
Revision
270420
Author
[email protected]
Date
2020-12-03 17:22:19 -0800 (Thu, 03 Dec 2020)

Log Message

Adopt FALLBACK_PLATFORM
https://bugs.webkit.org/show_bug.cgi?id=219504

Patch by Adam Roben <[email protected]> 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/_javascript_Core:

* Configurations/SDKVariant.xcconfig:
* _javascript_Core.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.

Modified Paths

Diff

Modified: trunk/PerformanceTests/ChangeLog (270419 => 270420)


--- trunk/PerformanceTests/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/PerformanceTests/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Add C and ObjC tests to APIBench

Modified: trunk/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/_javascript_Core/ChangeLog (270419 => 270420)


--- trunk/Source/_javascript_Core/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,16 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        Adopt FALLBACK_PLATFORM
+        https://bugs.webkit.org/show_bug.cgi?id=219504
+
+        Reviewed by Tim Horton.
+
+        * Configurations/SDKVariant.xcconfig:
+        * _javascript_Core.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  <[email protected]>
 
         [JSC] not using std::make_pair for workaround of (possibly) ASan bug

Modified: trunk/Source/_javascript_Core/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/_javascript_Core/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/_javascript_Core/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (270419 => 270420)


--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2020-12-04 01:22:19 UTC (rev 270420)
@@ -10987,7 +10987,7 @@
 			);
 			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/_javascript_Core.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/_javascript_Core.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/_javascript_Core.framework \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/_javascript_Core.framework\"\n";
 		};
 		3713F014142905240036387F /* Check For Inappropriate Objective-C Class Names */ = {
 			isa = PBXShellScriptBuildPhase;

Modified: trunk/Source/_javascript_Core/Scripts/check-xcfilelists.sh (270419 => 270420)


--- trunk/Source/_javascript_Core/Scripts/check-xcfilelists.sh	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/_javascript_Core/Scripts/check-xcfilelists.sh	2020-12-04 01:22:19 UTC (rev 270420)
@@ -9,4 +9,4 @@
 [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
 [ -f "${SCRIPT}" ] || { echo "### Cannot find generate-xcfilelists script"; exit 1; }
 
-"${SCRIPT}" generate-xcode --project _javascript_Core --platform "${PLATFORM_NAME}" --configuration "${CONFIGURATION}"
+"${SCRIPT}" generate-xcode --project _javascript_Core --platform "${FALLBACK_PLATFORM:-$PLATFORM_NAME}" --configuration "${CONFIGURATION}"

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (270419 => 270420)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Build fix for Mac Catalyst. Include the SystemInfo header.

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/ThirdParty/ChangeLog (270419 => 270420)


--- trunk/Source/ThirdParty/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/ThirdParty/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building 

Modified: trunk/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (270419 => 270420)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         libwebrtc.dylib relies on dead code stripping (fails to link if dead code is not stripped in Debug builds)

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/WTF/ChangeLog (270419 => 270420)


--- trunk/Source/WTF/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WTF/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Refactor macros for low power mode code

Modified: trunk/Source/WTF/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/WTF/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WTF/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/WebCore/ChangeLog (270419 => 270420)


--- trunk/Source/WebCore/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebCore/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         [GPU Process] Disconnect NativeImages from RemoteResourceCacheProxy when RemoteRenderingBackendProxy is destroyed

Modified: trunk/Source/WebCore/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/WebCore/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebCore/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/WebCore/PAL/ChangeLog (270419 => 270420)


--- trunk/Source/WebCore/PAL/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebCore/PAL/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         [macOS] Adopt SPI to prevent establishing XPC connections to Launch Services

Modified: trunk/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebCore/PAL/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/WebCore/Scripts/check-xcfilelists.sh (270419 => 270420)


--- trunk/Source/WebCore/Scripts/check-xcfilelists.sh	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebCore/Scripts/check-xcfilelists.sh	2020-12-04 01:22:19 UTC (rev 270420)
@@ -9,4 +9,4 @@
 [ -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}"

Modified: trunk/Source/WebInspectorUI/ChangeLog (270419 => 270420)


--- trunk/Source/WebInspectorUI/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebInspectorUI/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Web Inspector: implement Multimap.prototype.take()

Modified: trunk/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebInspectorUI/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/WebKit/ChangeLog (270419 => 270420)


--- trunk/Source/WebKit/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKit/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Drop unimplemented suspension functions on GPUConnectionToWebProcess and WebAuthnConnectionToWebProcess

Modified: trunk/Source/WebKit/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/WebKit/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKit/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/WebKit/Scripts/check-xcfilelists.sh (270419 => 270420)


--- trunk/Source/WebKit/Scripts/check-xcfilelists.sh	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKit/Scripts/check-xcfilelists.sh	2020-12-04 01:22:19 UTC (rev 270420)
@@ -9,4 +9,4 @@
 [ -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}"

Modified: trunk/Source/WebKitLegacy/ChangeLog (270419 => 270420)


--- trunk/Source/WebKitLegacy/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKitLegacy/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Consolidate header postprocessing scripts

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (270419 => 270420)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,15 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Consolidate header postprocessing scripts

Modified: trunk/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (270419 => 270420)


--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -127,7 +127,7 @@
 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;

Modified: trunk/Source/WebKitLegacy/scripts/check-xcfilelists.sh (270419 => 270420)


--- trunk/Source/WebKitLegacy/scripts/check-xcfilelists.sh	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/WebKitLegacy/scripts/check-xcfilelists.sh	2020-12-04 01:22:19 UTC (rev 270420)
@@ -9,4 +9,4 @@
 [ -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}"

Modified: trunk/Source/bmalloc/ChangeLog (270419 => 270420)


--- trunk/Source/bmalloc/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/bmalloc/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,13 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Remove bmalloc::logVMFailure() and BSoftLinking.h

Modified: trunk/Source/bmalloc/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Source/bmalloc/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Source/bmalloc/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/ChangeLog (270419 => 270420)


--- trunk/Tools/ChangeLog	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/ChangeLog	2020-12-04 01:22:19 UTC (rev 270420)
@@ -1,3 +1,22 @@
+2020-12-03  Adam Roben  <[email protected]>
+
+        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  <[email protected]>
 
         Serialize NFA to disk before converting it to a DFA when compiling a WKContentRuleList

Modified: trunk/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/ContentExtensionTester/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/ImageDiff/cg/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/MiniBrowser/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/MobileMiniBrowser/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/TestWebKitAPI/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/WebEditingTester/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/WebKitTestRunner/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);

Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig (270419 => 270420)


--- trunk/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig	2020-12-04 00:38:18 UTC (rev 270419)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/SDKVariant.xcconfig	2020-12-04 01:22:19 UTC (rev 270420)
@@ -25,6 +25,10 @@
 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_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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to