From a39e82d4a2cb2f960ced46f1c471845e2b10c265 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 26 Dec 2023 12:56:17 -0500 Subject: [PATCH 1/2] Don't attempt to get file if no statements --- crates/header-translator/src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/header-translator/src/main.rs b/crates/header-translator/src/main.rs index 9828f808c..a43fa901c 100644 --- a/crates/header-translator/src/main.rs +++ b/crates/header-translator/src/main.rs @@ -277,8 +277,9 @@ fn parse_sdk(index: &Index<'_>, sdk: &SdkPath, llvm_target: &str, config: &Confi } preprocessing = false; // No more includes / macro expansions after this line - let file = library.files.get_mut(&file_name).expect("file"); + let mut maybe_file = library.files.get_mut(&file_name); for stmt in Stmt::parse(&entity, &context) { + let file: &mut File = maybe_file.as_mut().expect("file"); file.add_stmt(stmt); } } From 8b66dbe8bac2b614cf5251a9c2e00e839881346c Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 26 Dec 2023 12:56:32 -0500 Subject: [PATCH 2/2] Add ServiceManagement framework --- crates/header-translator/framework-includes.h | 2 ++ .../src/data/ServiceManagement.rs | 2 ++ crates/header-translator/src/data/mod.rs | 1 + .../header-translator/translation-config.toml | 32 +++++++++++++++++++ crates/icrate/Cargo.toml | 9 ++++++ crates/icrate/src/generated | 2 +- 6 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 crates/header-translator/src/data/ServiceManagement.rs diff --git a/crates/header-translator/framework-includes.h b/crates/header-translator/framework-includes.h index 0f77a986b..a5e0f79ec 100644 --- a/crates/header-translator/framework-includes.h +++ b/crates/header-translator/framework-includes.h @@ -87,6 +87,8 @@ #import +#import + #import #import diff --git a/crates/header-translator/src/data/ServiceManagement.rs b/crates/header-translator/src/data/ServiceManagement.rs new file mode 100644 index 000000000..89a871f29 --- /dev/null +++ b/crates/header-translator/src/data/ServiceManagement.rs @@ -0,0 +1,2 @@ +data! { +} diff --git a/crates/header-translator/src/data/mod.rs b/crates/header-translator/src/data/mod.rs index ab08f51bf..4c109d269 100644 --- a/crates/header-translator/src/data/mod.rs +++ b/crates/header-translator/src/data/mod.rs @@ -48,6 +48,7 @@ data! { mod MetricKit; mod OSAKit; mod PhotoKit; + mod ServiceManagement; mod SoundAnalysis; mod Speech; mod StoreKit; diff --git a/crates/header-translator/translation-config.toml b/crates/header-translator/translation-config.toml index a5b4fa0c4..e493b8d26 100644 --- a/crates/header-translator/translation-config.toml +++ b/crates/header-translator/translation-config.toml @@ -404,6 +404,14 @@ maccatalyst = "13.0" ios = "2.0" tvos = "9.0" +[library.ServiceManagement] +imports = ["Foundation"] +macos = "10.6" +maccatalyst = "13.0" +ios = "12.1" +tvos = "12.1" +watchos = "5.1" + [library.SoundAnalysis] imports = ["Foundation"] macos = "10.15" @@ -1734,3 +1742,27 @@ skipped = true skipped = true [class.CWInterface.methods.associateToEnterpriseNetwork_identity_username_password_error] skipped = true + +# Items from ServiceManagement that uses types from CoreFoundation +[fn.SMJobBless] +skipped = true +[fn.SMLoginItemSetEnabled] +skipped = true +[static.kSMDomainSystemLaunchd] +skipped = true +[static.kSMDomainUserLaunchd] +skipped = true +[static.kSMErrorDomainFramework] +skipped = true +[static.kSMErrorDomainIPC] +skipped = true +[static.kSMErrorDomainLaunchd] +skipped = true +[fn.SMCopyAllJobDictionaries] +skipped = true +[fn.SMJobCopyDictionary] +skipped = true +[fn.SMJobRemove] +skipped = true +[fn.SMJobSubmit] +skipped = true diff --git a/crates/icrate/Cargo.toml b/crates/icrate/Cargo.toml index 1d0cc7bb2..0851051ba 100644 --- a/crates/icrate/Cargo.toml +++ b/crates/icrate/Cargo.toml @@ -4797,6 +4797,14 @@ PhotoKit_all = [ "PhotoKit_PHProjectChangeRequest", "PhotoKit_PHVideoRequestOptions", ] +ServiceManagement = [ + "Foundation", +] +ServiceManagement_SMAppService = [] +ServiceManagement_all = [ + "ServiceManagement", + "ServiceManagement_SMAppService", +] SoundAnalysis = [ "Foundation", ] @@ -5602,6 +5610,7 @@ unstable-frameworks-macos-10-12 = [ "Metal_all", "OSAKit_all", "PhotoKit_all", + "ServiceManagement_all", "StoreKit_all", "WebKit_all", "unstable-example-basic_usage", diff --git a/crates/icrate/src/generated b/crates/icrate/src/generated index 19561a844..47b1e44cd 160000 --- a/crates/icrate/src/generated +++ b/crates/icrate/src/generated @@ -1 +1 @@ -Subproject commit 19561a8440284ee83dbc718a5d3896660b90aee9 +Subproject commit 47b1e44cd7269057cc4f5f14e9e1e4fcc433c334