Skip to content

Commit

Permalink
[Xcode] Add "maccatalyst" as a supported platform in the xcfilelist g…
Browse files Browse the repository at this point in the history
…enerator

rdar://128709129
https://bugs.webkit.org/show_bug.cgi?id=274690

Reviewed by Alexey Proskuryakov.

As of 278812@main, generate_xcfilelists_lib is using WK_PLATFORM_NAME,
which means it needs to handle Mac Catalyst. Add it as a supported
platform. In practice this does not change xcfilelist contents, since
the generator was already running in Catalyst builds, it was just
considering them to be the "macosx" platform.

* Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py:
(JavaScriptCoreGenerator):
(WebCoreGenerator):
(WebKitGenerator):
(WebKitLegacyGenerator):
(TestWebKitAPIGenerator):

Canonical link: https://commits.webkit.org/279301@main
  • Loading branch information
emw-apple committed May 25, 2024
1 parent 5901213 commit be37d4d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Tools/Scripts/webkitpy/generate_xcfilelists_lib/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ def _get_temp_dir(self):


class JavaScriptCoreGenerator(BaseGenerator):
VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production", "Profiling")

@util.LogEntryExit
Expand All @@ -743,7 +743,7 @@ def _get_generate_unified_sources_script(self):


class WebCoreGenerator(BaseGenerator):
VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production")

@util.LogEntryExit
Expand All @@ -760,7 +760,7 @@ def _get_generate_unified_sources_script(self):


class WebKitGenerator(BaseGenerator):
VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production")

@util.LogEntryExit
Expand All @@ -781,7 +781,7 @@ def _get_generate_unified_sources_script(self):


class WebKitLegacyGenerator(BaseGenerator):
VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production")

@util.LogEntryExit
Expand Down Expand Up @@ -820,7 +820,7 @@ def _get_generate_derived_sources_script(self):


class TestWebKitAPIGenerator(BaseGenerator):
VALID_PLATFORMS = ("macosx", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_PLATFORMS = ("macosx", "maccatalyst", "iphoneos", "iphonesimulator", "watchos", "watchsimulator", "appletvos", "appletvsimulator", "xros", "xrsimulator")
VALID_CONFIGURATIONS = ("Debug", "Release", "Production")

@util.LogEntryExit
Expand Down

0 comments on commit be37d4d

Please sign in to comment.