Merge branch 'commit-generated-bindings'

Author: faern

generate_bindings.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+# Always have the latest version of bindgen and rustfmt installed before using this script
+
+export DYLD_LIBRARY_PATH=$(rustc +stable --print sysroot)/lib
+
+SDK_VERSION=`xcodebuild -sdk macosx -version SDKVersion`
+SDK_PATH=`xcodebuild -sdk macosx -version Path`
+FRAMEWORK_PATH="$SDK_PATH/System/Library/Frameworks/"
+HEADER_PATH="$FRAMEWORK_PATH/SystemConfiguration.framework/Headers/SCDynamicStore.h"
+
+BINDING_PATH="./system-configuration-sys/src/dynamic_store.rs"
+
+BINDGEN_VERSION=`bindgen --version`
+
+echo "Using macOS SDK at: $SDK_PATH"
+echo "Using $BINDGEN_VERSION"
+echo ""
+
+echo "Generating bindings for $HEADER_PATH"
+bindgen \
+    --whitelist-function "SCDynamicStore.*" \
+    --whitelist-var "kSCDynamicStore.*" \
+    --blacklist-type "(__)?CF.*" \
+    --blacklist-type "Boolean" \
+    --blacklist-type "dispatch_queue_[ts]" \
+    --raw-line "// Generated using:" \
+    --raw-line "// $BINDGEN_VERSION" \
+    --raw-line "// macOS SDK $SDK_VERSION." \
+    --raw-line "" \
+    --raw-line "use core_foundation_sys::array::CFArrayRef;" \
+    --raw-line "use core_foundation_sys::base::{Boolean, CFIndex, CFAllocatorRef, CFTypeID};" \
+    --raw-line "use core_foundation_sys::string::CFStringRef;" \
+    --raw-line "use core_foundation_sys::dictionary::CFDictionaryRef;" \
+    --raw-line "use core_foundation_sys::propertylist::CFPropertyListRef;" \
+    --raw-line "use core_foundation_sys::runloop::CFRunLoopSourceRef;" \
+    --raw-line "" \
+    --raw-line "/// This is a temporary solution." \
+    --raw-line "pub type dispatch_queue_t = *mut ::std::os::raw::c_void;" \
+    -o $BINDING_PATH \
+    $HEADER_PATH -- \
+    -I$SDK_PATH/usr/include \
+    -F$FRAMEWORK_PATH
+
+rustfmt $BINDING_PATH

system-configuration-sys/Cargo.toml

@@ -2,15 +2,11 @@
 name = "system-configuration-sys"
 version = "0.1.0"
 authors = ["Mullvad VPN <admin@mullvad.net>", "Linus Färnstrand <linus@mullvad.net>", "Andrej Mihajlov <and@mullvad.net>"]
-description = "Low level bindings to System Configuration framework for macOS"
+description = "Low level bindings to SystemConfiguration framework for macOS"
 keywords = ["macos", "system", "configuration", "bindings"]
-categories = ["api-bindings", "external-ffi-bindings"]
+categories = ["external-ffi-bindings", "os::macos-apis"]
 repository = "https://github.com/mullvad/system-configuration-rs"
 license = "MIT/Apache-2.0"
-build = "build.rs"
 
 [dependencies]
 core-foundation-sys = "0.5"
-
-[build-dependencies]
-bindgen = "0.31"

system-configuration-sys/build.rs

@@ -6,49 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate bindgen;
-
-use std::env;
-use std::path::Path;
-use std::process::Command;
-use std::str;
-
 fn main() {
     if std::env::var("TARGET").unwrap().contains("-apple") {
         println!("cargo:rustc-link-lib=framework=SystemConfiguration");
     }
-
-    let out_dir = env::var("OUT_DIR").expect("OUT_DIR missing from environment");
-    let sdk_path = get_macos_sdk_path();
-    let framework_path = format!("{}/System/Library/Frameworks/", sdk_path);
-    let sc_header_dir = format!("{}/SystemConfiguration.framework/Headers/", framework_path);
-
-    let sc_header_path = format!("{}/SCDynamicStore.h", sc_header_dir);
-    let _ = bindgen::builder()
-        .header(sc_header_path)
-        .clang_arg(format!("-I{}/usr/include", sdk_path))
-        .clang_arg(format!("-F{}", framework_path))
-        .whitelist_function("SCDynamicStore.*")
-        .whitelist_var("kSCDynamicStore.*")
-        .blacklist_type("(__)?CF.*")
-        .blacklist_type("Boolean")
-        .raw_line("use core_foundation_sys::array::CFArrayRef;")
-        .raw_line("use core_foundation_sys::base::{Boolean, CFIndex, CFAllocatorRef, CFTypeID};")
-        .raw_line("use core_foundation_sys::string::CFStringRef;")
-        .raw_line("use core_foundation_sys::dictionary::CFDictionaryRef;")
-        .raw_line("use core_foundation_sys::propertylist::CFPropertyListRef;")
-        .raw_line("use core_foundation_sys::runloop::CFRunLoopSourceRef;")
-        .generate()
-        .expect("Unable to generate bindings")
-        .write_to_file(Path::new(&out_dir).join("SCDynamicStore.rs"))
-        .expect("Unable to write SCDynamicStore.rs");
-}
-
-fn get_macos_sdk_path() -> String {
-    let output = Command::new("xcodebuild")
-        .args(&["-sdk", "macosx", "Path", "-version"])
-        .output()
-        .expect("Unable to get macOS SDK path with \"xcodebuild\"");
-    let stdout = str::from_utf8(&output.stdout).expect("xcodebuild did not print valid utf-8");
-    stdout.trim().to_owned()
 }