Add support for libc as a framework crate dependency

Part of #500.
Fixes #331.

Author: madsmtm

Cargo.lock

@@ -1,4 +1,4 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 use std::ops;
 use std::path::{Path, PathBuf};
 
@@ -13,7 +13,6 @@ pub struct Context<'a> {
     pub macro_invocations: HashMap<Location<'a>, Entity<'a>>,
     framework_dir: PathBuf,
     include_dir: PathBuf,
-    system_headers: HashSet<&'static Path>,
 }
 
 impl<'a> Context<'a> {
@@ -23,12 +22,6 @@ impl<'a> Context<'a> {
             macro_invocations: Default::default(),
             framework_dir: sdk.path.join("System/Library/Frameworks"),
             include_dir: sdk.path.join("usr/include"),
-            system_headers: HashSet::from([
-                Path::new("MacTypes.h"),
-                Path::new("objc/objc.h"),
-                Path::new("objc/NSObject.h"),
-                Path::new("objc/NSObjCRuntime.h"),
-            ]),
         }
     }
 
@@ -42,9 +35,12 @@ impl<'a> Context<'a> {
                 if let Ok(path) = path.strip_prefix(&self.framework_dir) {
                     return Some(split_path(path));
                 } else if let Ok(path) = path.strip_prefix(&self.include_dir) {
-                    if self.system_headers.contains(path) {
+                    if path.starts_with("objc") || path == Path::new("MacTypes.h") {
                         return Some(("System".to_string(), None));
                     }
+                    if path.starts_with("sys") {
+                        return Some(("libc".to_string(), None));
+                    }
                 }
             }
         }

crates/header-translator/src/context.rs

@@ -28,6 +28,16 @@ impl File {
         self.stmts.push(stmt);
     }
 
+    pub fn imports<'c>(&self, config: &'c Config) -> BTreeSet<&'c str> {
+        self.stmts
+            .iter()
+            .flat_map(|stmt| stmt.required_items_inner())
+            .filter(|item| item.location().library != self.library_name)
+            // Ignore crate imports for required items from unknown crates
+            .filter_map(|item| item.location().import(config))
+            .collect()
+    }
+
     pub fn crates<'c>(&self, config: &'c Config) -> BTreeSet<&'c str> {
         self.stmts
             .iter()
@@ -62,16 +72,16 @@ impl File {
 
             writeln!(f, "use objc2::__framework_prelude::*;")?;
 
-            let mut crates = self.crates(config);
+            let mut imports = self.imports(config);
             // TODO: Remove this once MainThreadMarker is moved to objc2
-            crates.extend(
+            imports.extend(
                 config.libraries[&self.library_name]
                     .required_dependencies
                     .iter()
                     .map(|krate| &**krate),
             );
 
-            for krate in crates {
+            for krate in imports {
                 let required = config.libraries[&self.library_name]
                     .required_dependencies
                     .contains(krate);

crates/header-translator/src/file.rs

@@ -67,6 +67,19 @@ impl Location {
         if self.library == "block2" {
             return Some("block2");
         }
+        if self.library == "libc" {
+            return Some("libc");
+        }
+        Some(&config.libraries.get(&self.library)?.krate)
+    }
+
+    pub fn import<'a>(&self, config: &'a Config) -> Option<&'a str> {
+        if self.library == "block2" {
+            return Some("block2");
+        }
+        if self.library == "libc" {
+            return None;
+        }
         Some(&config.libraries.get(&self.library)?.krate)
     }
 
@@ -76,7 +89,10 @@ impl Location {
 
     /// Only the library of the emmision location matters.
     pub fn cargo_toml_feature(&self, config: &Config, emission_library: &str) -> Option<String> {
-        if self.library == "System" || self.library == "block2" || self.library == emission_library
+        if self.library == "System"
+            || self.library == "block2"
+            || self.library == "libc"
+            || self.library == emission_library
         {
             None
         } else if let Some(krate) = self.krate(config) {
@@ -103,6 +119,8 @@ impl Location {
     fn feature(&self, config: &Config, emission_location: &Self) -> Option<String> {
         if self.library == "System" {
             None
+        } else if self.library == "libc" {
+            Some("libc".to_string())
         } else if self.library == "block2" {
             Some("block2".to_string())
         } else if self.library == emission_location.library {
@@ -253,12 +271,11 @@ impl ItemIdentifier {
 
         impl fmt::Display for ItemIdentifierPath<'_> {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                write!(f, "{}", self.0.name)
-                // if self.0.is_system() {
-                //     write!(f, "{}", self.0.name)
-                // } else {
-                //     write!(f, "{}::{}", self.0.library, self.0.name)
-                // }
+                if self.0.library() == "libc" {
+                    write!(f, "libc::{}", self.0.name)
+                } else {
+                    write!(f, "{}", self.0.name)
+                }
             }
         }
 

crates/header-translator/src/id.rs

@@ -200,15 +200,19 @@ see that for related crates.", self.data.krate, self.link_name)?;
             .collect();
 
         for (krate, required) in &dependencies {
-            let (path, version) = match *krate {
-                "block2" => ("../../crates/block2".to_string(), "0.5.0"),
-                krate => (format!("../{krate}"), VERSION),
+            let mut table = match *krate {
+                "block2" => InlineTable::from_iter([
+                    ("path", Value::from("../../crates/block2".to_string())),
+                    ("version", Value::from("0.5.0")),
+                ]),
+                // Use a reasonably new version of libc
+                "libc" => InlineTable::from_iter([("version", Value::from("0.2.80"))]),
+                krate => InlineTable::from_iter([
+                    ("path", Value::from(format!("../{krate}"))),
+                    ("version", Value::from(VERSION)),
+                ]),
             };
-            let mut table = InlineTable::from_iter([
-                ("path", Value::from(path)),
-                ("version", Value::from(version)),
-            ]);
-            if self.data.gnustep {
+            if self.data.gnustep && *krate != "libc" {
                 table.insert("default-features", Value::from(false));
             }
             if !required {

crates/header-translator/src/library.rs

@@ -13,9 +13,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased - YYYY-MM-DD
 
 ### Added
+* Added `CoreBluetooth` framework as `objc2-core-bluetooth`.
+* Added `Virtualization` framework as `objc2-virtualization`.
 * Added `objc2_quartz_core::CAMetalDrawable` and
   `objc2_quartz_core::CAMetalLayer`.
 * Added methods to access `CALayer` from `objc2_app_kit::NSView`.
+* Added optional support for a few methods depending on types from `libc`.
 
 ### Removed
 * `objc2_metal`: Removed internal `__MTLPackedFloat3` and made `MTLPackedFloat3` public.

crates/objc2/src/topics/about_generated/CHANGELOG.md

@@ -137,8 +137,6 @@ class.NSMovie.methods.QTMovie.skipped = true
 class.NSTextLayoutFragment.methods."drawAtPoint:inContext:".skipped = true
 class.NSTextLineFragment.methods."drawAtPoint:inContext:".skipped = true
 class.NSTextView.methods."quickLookPreviewableItemsInRanges:".skipped = true
-class.NSRunningApplication.methods.processIdentifier.skipped = true
-class.NSRunningApplication.methods."runningApplicationWithProcessIdentifier:".skipped = true
 class.NSSavePanel.methods.allowedContentTypes.skipped = true
 class.NSSavePanel.methods."setAllowedContentTypes:".skipped = true
 class.NSView.methods.backgroundFilters.skipped = true

framework-crates/objc2-app-kit/Cargo.toml

@@ -210,7 +210,6 @@ enum.anonymous.constants.NS_BigEndian.skipped = true
 class.NSAppleEventDescriptor.methods."descriptorWithDescriptorType:bytes:length:".skipped = true
 class.NSAppleEventDescriptor.methods."descriptorWithDescriptorType:data:".skipped = true
 class.NSAppleEventDescriptor.methods."appleEventWithEventClass:eventID:targetDescriptor:returnID:transactionID:".skipped = true
-class.NSAppleEventDescriptor.methods."descriptorWithProcessIdentifier:".skipped = true
 class.NSAppleEventDescriptor.methods."initWithAEDescNoCopy:".skipped = true
 class.NSAppleEventDescriptor.methods."initWithDescriptorType:bytes:length:".skipped = true
 class.NSAppleEventDescriptor.methods."initWithDescriptorType:data:".skipped = true
@@ -252,9 +251,6 @@ class.NSURLSessionConfiguration.methods."setTLSMinimumSupportedProtocolVersion:"
 class.NSURLSessionConfiguration.methods.TLSMaximumSupportedProtocolVersion.skipped = true
 class.NSURLSessionConfiguration.methods."setTLSMaximumSupportedProtocolVersion:".skipped = true
 class.NSXPCConnection.methods.auditSessionIdentifier.skipped = true
-class.NSXPCConnection.methods.processIdentifier.skipped = true
-class.NSXPCConnection.methods.effectiveUserIdentifier.skipped = true
-class.NSXPCConnection.methods.effectiveGroupIdentifier.skipped = true
 class.NSXPCInterface.methods."setXPCType:forSelector:argumentIndex:ofReply:".skipped = true
 class.NSXPCInterface.methods."XPCTypeForSelector:argumentIndex:ofReply:".skipped = true
 class.NSXPCCoder.methods."encodeXPCObject:forKey:".skipped = true

framework-crates/objc2-app-kit/translation-config.toml

@@ -7,9 +7,6 @@ maccatalyst = "13.0"
 ios = "13.0"
 visionos = "1.0"
 
-# Needs `pid_t`
-class.MXMetaData.methods.pid.skipped = true
-
 # fails to strip const from `typedef const NSString *const MXLaunchTaskID;`
 typedef.MXLaunchTaskID.skipped = true