Skip to content

Emit target_os = ... cfgs on framework dependencies #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 21, 2024
Merged

Emit target_os = ... cfgs on framework dependencies #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35fa58c
Remove broken GNUStep support in CoreData, QuartzCore and CoreImage
madsmtm May 20, 2024
fae819a
Fix version support in `objc2-input-method-kit`
madsmtm May 20, 2024
5957098
Remove app extension support in `Unavailable`
madsmtm May 20, 2024
63523ce
Add PlatformCfg helper for outputting `target_os = ...` cfgs
madsmtm May 21, 2024
4d0e3a6
Add `cfg`-gates for platform-specific framework usage
madsmtm May 20, 2024
3bdc9bb
Use negative `cfg`-gates to make things look a bit nicer
madsmtm May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ env:
FRAMEWORKS_MACOS_12: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-business-chat --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit
FRAMEWORKS_MACOS_13: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit
FRAMEWORKS_MACOS_14: --package=objc2-accessibility --package=objc2-accounts --package=objc2-ad-services --package=objc2-ad-support --package=objc2-app-kit --package=objc2-app-tracking-transparency --package=objc2-authentication-services --package=objc2-automatic-assessment-configuration --package=objc2-automator --package=objc2-av-kit --package=objc2-background-assets --package=objc2-business-chat --package=objc2-call-kit --package=objc2-class-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-image --package=objc2-core-location --package=objc2-core-ml --package=objc2-core-motion --package=objc2-core-wlan --package=objc2-data-detection --package=objc2-device-check --package=objc2-event-kit --package=objc2-exception-handling --package=objc2-extension-kit --package=objc2-external-accessory --package=objc2-file-provider --package=objc2-file-provider-ui --package=objc2-finder-sync --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-identity-lookup --package=objc2-input-method-kit --package=objc2-link-presentation --package=objc2-local-authentication --package=objc2-local-authentication-embedded-ui --package=objc2-mail-kit --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-fx --package=objc2-metal-kit --package=objc2-metric-kit --package=objc2-ml-compute --package=objc2-multipeer-connectivity --package=objc2-natural-language --package=objc2-nearby-interaction --package=objc2-network-extension --package=objc2-osa-kit --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-screen-capture-kit --package=objc2-sensitive-content-analysis --package=objc2-service-management --package=objc2-social --package=objc2-sound-analysis --package=objc2-speech --package=objc2-store-kit --package=objc2-symbols --package=objc2-uniform-type-identifiers --package=objc2-user-notifications --package=objc2-virtualization --package=objc2-vision --package=objc2-web-kit
FRAMEWORKS_IOS_10: --package=objc2-foundation --package=objc2-metal --package=objc2-ui-kit
FRAMEWORKS_GNUSTEP: --package=objc2-app-kit --package=objc2-core-data --package=objc2-foundation
FRAMEWORKS_IOS_10: --package=objc2-accounts --package=objc2-ad-support --package=objc2-av-kit --package=objc2-call-kit --package=objc2-cloud-kit --package=objc2-contacts --package=objc2-contacts-ui --package=objc2-core-bluetooth --package=objc2-core-data --package=objc2-core-image --package=objc2-core-location --package=objc2-core-motion --package=objc2-event-kit --package=objc2-external-accessory --package=objc2-foundation --package=objc2-game-controller --package=objc2-game-kit --package=objc2-health-kit --package=objc2-local-authentication --package=objc2-map-kit --package=objc2-media-player --package=objc2-metal --package=objc2-metal-kit --package=objc2-multipeer-connectivity --package=objc2-network-extension --package=objc2-photos --package=objc2-photos-ui --package=objc2-quartz-core --package=objc2-social --package=objc2-speech --package=objc2-store-kit --package=objc2-ui-kit --package=objc2-user-notifications
FRAMEWORKS_GNUSTEP: --package=objc2-app-kit --package=objc2-foundation
# END AUTOMATICALLY GENERATED

# The current nightly Rust version. Keep this synced with `rust-toolchain.toml`
Expand Down
57 changes: 21 additions & 36 deletions crates/header-translator/src/availability.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//! <https://docs.swift.org/swift-book/ReferenceManual/Attributes.html#ID583>
use std::fmt;

use clang::{Entity, PlatformAvailability, Version};
Expand All @@ -8,27 +7,24 @@ use crate::context::Context;
#[derive(Debug, Clone, PartialEq, Default)]
struct Unavailable {
ios: bool,
ios_app_extension: bool,
macos: bool,
macos_app_extension: bool,
maccatalyst: bool,
watchos: bool,
tvos: bool,
visionos: bool,
}

#[derive(Debug, Clone, PartialEq, Default)]
struct Versions {
ios: Option<Version>,
ios_app_extension: Option<Version>,
macos: Option<Version>,
macos_app_extension: Option<Version>,
maccatalyst: Option<Version>,
watchos: Option<Version>,
tvos: Option<Version>,
visionos: Option<Version>,
pub struct Versions {
pub(crate) macos: Option<Version>,
pub(crate) maccatalyst: Option<Version>,
pub(crate) ios: Option<Version>,
pub(crate) tvos: Option<Version>,
pub(crate) watchos: Option<Version>,
pub(crate) visionos: Option<Version>,
}

/// <https://docs.swift.org/swift-book/ReferenceManual/Attributes.html#ID583>
#[derive(Debug, Clone, PartialEq)]
pub struct Availability {
unavailable: Unavailable,
Expand Down Expand Up @@ -76,48 +72,36 @@ impl Availability {

// TODO: Ensure that a specific platform only appears once
match &*availability.platform {
"ios" => set(
availability,
&mut unavailable.ios,
&mut introduced.ios,
&mut deprecated.ios,
),
"ios_app_extension" => set(
availability,
&mut unavailable.ios_app_extension,
&mut introduced.ios_app_extension,
&mut deprecated.ios_app_extension,
),
"macos" => set(
availability,
&mut unavailable.macos,
&mut introduced.macos,
&mut deprecated.macos,
),
"macos_app_extension" => set(
availability,
&mut unavailable.macos_app_extension,
&mut introduced.macos_app_extension,
&mut deprecated.macos_app_extension,
),
"maccatalyst" => set(
availability,
&mut unavailable.maccatalyst,
&mut introduced.maccatalyst,
&mut deprecated.maccatalyst,
),
"watchos" => set(
"ios" => set(
availability,
&mut unavailable.watchos,
&mut introduced.watchos,
&mut deprecated.watchos,
&mut unavailable.ios,
&mut introduced.ios,
&mut deprecated.ios,
),
"tvos" => set(
availability,
&mut unavailable.tvos,
&mut introduced.tvos,
&mut deprecated.tvos,
),
"watchos" => set(
availability,
&mut unavailable.watchos,
&mut introduced.watchos,
&mut deprecated.watchos,
),
"xros" => set(
availability,
&mut unavailable.visionos,
Expand All @@ -127,6 +111,9 @@ impl Availability {
"swift" => {
_swift = Some(availability);
}
platform if platform.ends_with("_app_extension") => {
// Ignore availability attributes for app extensions
}
platform => error!(?platform, "unknown availability platform"),
}
}
Expand All @@ -145,9 +132,7 @@ impl Availability {
self.deprecated,
Versions {
ios: None,
ios_app_extension: None,
macos: None,
macos_app_extension: None,
maccatalyst: None,
watchos: None,
tvos: None,
Expand Down
Loading