Skip to content
Permalink
Browse files
Don't install webpushd on catalyst
https://bugs.webkit.org/show_bug.cgi?id=241860

Reviewed by Alexey Proskuryakov.

* Source/JavaScriptCore/Configurations/SDKVariant.xcconfig:
* Source/ThirdParty/ANGLE/Configurations/SDKVariant.xcconfig:
* Source/ThirdParty/gtest/xcode/Config/SDKVariant.xcconfig:
* Source/ThirdParty/libwebrtc/Configurations/SDKVariant.xcconfig:
* Source/WTF/Configurations/SDKVariant.xcconfig:
* Source/WebCore/Configurations/SDKVariant.xcconfig:
* Source/WebCore/PAL/Configurations/SDKVariant.xcconfig:
* Source/WebGPU/Configurations/SDKVariant.xcconfig:
* Source/WebInspectorUI/Configurations/SDKVariant.xcconfig:
* Source/WebKit/Configurations/BaseTarget.xcconfig:
* Source/WebKit/Configurations/SDKVariant.xcconfig:
* Source/WebKitLegacy/mac/Configurations/SDKVariant.xcconfig:
* Source/bmalloc/Configurations/SDKVariant.xcconfig:

Canonical link: https://commits.webkit.org/251753@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@295748 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
saambarati committed Jun 22, 2022
1 parent 431f4db commit 501d0564b9cb816be7669ad23695171cacdcbb44
Showing 24 changed files with 234 additions and 5 deletions.
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -134,11 +134,10 @@ OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PAT
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_VERSIONED_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;

// webpushd should not be installed when building for downlevel.
WK_SKIP_INSTALL_WEBPUSHD[sdk=macos*] = $(WK_SKIP_INSTALL_WEBPUSHD_STAGING_$(USE_STAGING_INSTALL_PATH)_RELOCATABLE_$(WK_RELOCATABLE_FRAMEWORKS))
WK_SKIP_INSTALL_WEBPUSHD_STAGING_YES_RELOCATABLE_YES = YES
WK_SKIP_INSTALL_WEBPUSHD_STAGING_YES_RELOCATABLE_ = YES
WK_SKIP_INSTALL_WEBPUSHD_STAGING__RELOCATABLE_YES = YES
WK_SKIP_INSTALL_WEBPUSHD[sdk=macosx*] = $(WK_OR_$(WK_RELOCATABLE_FRAMEWORKS)_$(WK_IS_CATALYST));
// webpushd should not be installed when building for downlevel on <= 12.
WK_SKIP_INSTALL_WEBPUSHD[sdk=macosx11*] = YES;
WK_SKIP_INSTALL_WEBPUSHD[sdk=macosx12*] = YES;

WK_HAVE_CORE_PREDICTION = YES;

@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);
@@ -26,6 +26,16 @@ WK_NOT_ = YES;
WK_NOT_NO = YES;
WK_NOT_YES = NO;

WK_OR__ = NO
WK_OR_NO_NO = NO
WK_OR__NO = NO
WK_OR_NO_ = NO
WK_OR_YES_ = YES
WK_OR__YES = YES
WK_OR_YES_NO = YES
WK_OR_NO_YES = YES
WK_OR_YES_YES = YES

WK_DEFAULT_PLATFORM_NAME = $(WK_DEFAULT_PLATFORM_NAME_$(WK_EMPTY_$(FALLBACK_PLATFORM_NAME)));
WK_DEFAULT_PLATFORM_NAME_YES = $(PLATFORM_NAME);
WK_DEFAULT_PLATFORM_NAME_ = $(FALLBACK_PLATFORM_NAME);

0 comments on commit 501d056

Please sign in to comment.