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
+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
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)));
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);
+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
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)));
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);
);
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;
[ -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}"
+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.
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)));
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);
+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
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)));
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);
+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)
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)));
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);
+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
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)));
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);
+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
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)));
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);
+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
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)));
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);
[ -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}"
+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()
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)));
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);
+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
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)));
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);
[ -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}"
+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
+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
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)));
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);
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;
[ -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}"
+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
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)));
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);
+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
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)));
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);
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)));
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);
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)));
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);
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)));
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);
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)));
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);
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)));
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);
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)));
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);
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)));
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);
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)));
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);
git://git.webkit.org / WebKit-https.git / commitdiff