Automatically generate #[link(...)] definitions

Author: madsmtm

crates/header-translator/src/config.rs

@@ -66,6 +66,9 @@ pub struct LibraryData {
     #[serde(default)]
     pub name: Option<String>,
     pub imports: Vec<String>,
+    #[serde(rename = "gnustep-library")]
+    #[serde(default)]
+    pub gnustep_library: Option<String>,
     #[serde(rename = "extra-features")]
     #[serde(default)]
     pub extra_features: Vec<String>,

crates/header-translator/src/library.rs

@@ -4,17 +4,22 @@ use std::fs;
 use std::io;
 use std::path::Path;
 
+use crate::config::LibraryData;
 use crate::file::{File, FILE_PRELUDE};
 
 #[derive(Debug, PartialEq, Default)]
 pub struct Library {
     pub files: BTreeMap<String, File>,
+    link_name: String,
+    gnustep_library: Option<String>,
 }
 
 impl Library {
-    pub fn new() -> Self {
+    pub fn new(name: &str, data: &LibraryData) -> Self {
         Self {
             files: BTreeMap::new(),
+            link_name: name.to_string(),
+            gnustep_library: data.gnustep_library.clone(),
         }
     }
 
@@ -47,6 +52,23 @@ impl fmt::Display for Library {
         writeln!(f, "#![allow(unused_imports)]")?;
         writeln!(f, "#![allow(deprecated)]")?;
 
+        // Link to the correct framework
+        //
+        // FIXME: We always do cfg_attr(feature = "apple", ...) to make compiling things for GNUStep easier.
+        writeln!(
+            f,
+            "#[cfg_attr(feature = \"apple\", link(name = \"{}\", kind = \"framework\"))]",
+            self.link_name
+        )?;
+        if let Some(gnustep_library) = &self.gnustep_library {
+            writeln!(
+                f,
+                "#[cfg_attr(feature = \"gnustep-1-7\", link(name = \"{}\", kind = \"dylib\"))]",
+                gnustep_library
+            )?;
+        }
+        writeln!(f, "extern \"C\" {{}}")?;
+
         for name in self.files.keys() {
             // NOTE: some SDK files have '+' in the file name
             let name = name.replace('+', "_");

crates/header-translator/src/main.rs

@@ -197,7 +197,7 @@ fn parse_sdk(index: &Index<'_>, sdk: &SdkPath, llvm_target: &str, config: &Confi
     let tu = get_translation_unit(index, sdk, llvm_target);
 
     let mut preprocessing = true;
-    let mut result = Output::from_libraries(config.libraries.keys());
+    let mut result = Output::from_libraries(&config.libraries);
 
     let mut library_span = None;
     let mut library_span_name = String::new();

crates/header-translator/src/output.rs

@@ -1,7 +1,7 @@
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::str::FromStr;
 
-use crate::config::Config;
+use crate::config::{Config, LibraryData};
 use crate::library::Library;
 use crate::stmt::Stmt;
 
@@ -11,10 +11,10 @@ pub struct Output {
 }
 
 impl Output {
-    pub fn from_libraries(libraries: impl IntoIterator<Item = impl Into<String>>) -> Self {
+    pub fn from_libraries(libraries: &HashMap<String, LibraryData>) -> Self {
         let libraries = libraries
-            .into_iter()
-            .map(|name| (name.into(), Library::new()))
+            .iter()
+            .map(|(name, data)| (name.into(), Library::new(name, data)))
             .collect();
         Self { libraries }
     }
@@ -58,6 +58,7 @@ impl Output {
         ]
         .into_iter()
         .collect();
+        let mut gnustep_features: BTreeSet<String> = vec![].into_iter().collect();
 
         for (mut library_name, library) in &config.libraries {
             if let Some(alias) = &library.name {
@@ -83,6 +84,10 @@ impl Output {
                     macos_13_features.insert(format!("{library_name}_all"));
                 }
             }
+
+            if library.gnustep_library.is_some() {
+                gnustep_features.insert(format!("{library_name}_all"));
+            }
         }
 
         let _ = features.insert(
@@ -105,6 +110,10 @@ impl Output {
             "unstable-frameworks-macos-13".into(),
             macos_13_features.into_iter().collect(),
         );
+        let _ = features.insert(
+            "unstable-frameworks-gnustep".into(),
+            gnustep_features.into_iter().collect(),
+        );
 
         for (library_name, library) in &self.libraries {
             let library_alias = config.get_library_alias(library_name.clone());

crates/header-translator/translation-config.toml

@@ -27,6 +27,7 @@ tvos = "9.0"
 
 [library.AppKit]
 imports = ["CoreData", "Foundation"]
+gnustep-library = "gnustep-gui"
 extra-features = [
     # Temporary, since some structs and statics use these
     "AppKit_NSApplication",
@@ -189,6 +190,7 @@ ios = "11.0"
 
 [library.Foundation]
 imports = []
+gnustep-library = "gnustep-base"
 extra-features = [
     "objective-c",
     "block",

crates/icrate/Cargo.toml

@@ -194,7 +194,6 @@ unstable-example-metal = [
 
 # Helps with CI
 unstable-frameworks-all = ["unstable-frameworks-ios", "unstable-frameworks-macos-13"]
-unstable-frameworks-gnustep = ["AppKit_all", "Foundation_all"]
 unstable-frameworks-gnustep-32bit = ["Foundation_all"]
 # TODO: Autogenerate this
 unstable-frameworks-ios = ["Foundation_all", "unstable-example-basic_usage", "unstable-example-speech_synthesis"]
@@ -5298,6 +5297,10 @@ WebKit_all = [
     "WebKit_WebUndefined",
     "WebKit_WebView",
 ]
+unstable-frameworks-gnustep = [
+    "AppKit_all",
+    "Foundation_all",
+]
 unstable-frameworks-macos-10-13 = [
     "CloudKit_all",
     "Contacts_all",

crates/icrate/examples/metal.rs

@@ -252,10 +252,19 @@ declare_class!(
                 msg_send_id![mtk_view, currentDrawable];
 
             // prepare for drawing
-            let Some(current_drawable) = current_drawable else { return; };
-            let Some(command_buffer) = command_queue.commandBuffer() else { return; };
-            let Some(pass_descriptor) = (unsafe { mtk_view.currentRenderPassDescriptor() }) else { return; };
-            let Some(encoder) = command_buffer.renderCommandEncoderWithDescriptor(&pass_descriptor) else { return; };
+            let Some(current_drawable) = current_drawable else {
+                return;
+            };
+            let Some(command_buffer) = command_queue.commandBuffer() else {
+                return;
+            };
+            let Some(pass_descriptor) = (unsafe { mtk_view.currentRenderPassDescriptor() }) else {
+                return;
+            };
+            let Some(encoder) = command_buffer.renderCommandEncoderWithDescriptor(&pass_descriptor)
+            else {
+                return;
+            };
 
             // compute the scene properties
             let scene_properties_data = &SceneProperties {

crates/icrate/src/Accessibility/mod.rs

@@ -2,6 +2,3 @@
 mod generated;
 
 pub use self::generated::*;
-
-#[link(name = "Accessibility", kind = "framework")]
-extern "C" {}

crates/icrate/src/AdServices/mod.rs

@@ -2,6 +2,3 @@
 mod generated;
 
 pub use self::generated::*;
-
-#[link(name = "AdServices", kind = "framework")]
-extern "C" {}

crates/icrate/src/AdSupport/mod.rs

@@ -2,6 +2,3 @@
 mod generated;
 
 pub use self::generated::*;
-
-#[link(name = "AdSupport", kind = "framework")]
-extern "C" {}