Default interface methods (#93)

Author: jadamcrain

.github/workflows/ci.yml

@@ -141,11 +141,8 @@ jobs:
         run: Copy-Item -Path .cargo/config-windows.toml -Destination .cargo/config.toml
       - name: Caching
         uses: Swatinem/rust-cache@v1
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release
+      - name: Build FFI and JNI
+        run: cargo build -p foo-ffi -p foo-ffi-java --release --target ${{ matrix.target }}
       - name: C bindings
         uses: actions-rs/cargo@v1
         with:
@@ -190,11 +187,8 @@ jobs:
           override: true
       - name: Caching
         uses: Swatinem/rust-cache@v1
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release
+      - name: Build FFI and JNI
+        run: cargo build -p foo-ffi -p foo-ffi-java --release
       - name: C bindings
         uses: actions-rs/cargo@v1
         with:
@@ -247,12 +241,10 @@ jobs:
           toolchain: stable
           target: ${{ matrix.target }}
           override: true
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: true
-          command: build
-          args: --release --target ${{ matrix.target }}
+      - name: Install Rust Cross
+        run: cargo install cross
+      - name: Build FFI and JNI
+        run: cross build -p foo-ffi -p foo-ffi-java --release --target ${{ matrix.target }}
       - name: C bindings
         uses: actions-rs/cargo@v1
         with:

Cargo.lock

@@ -9,6 +9,6 @@ oo-bindgen = { path = "../oo-bindgen" }
 c-oo-bindgen = { path = "../generators/c-oo-bindgen" }
 dotnet-oo-bindgen = { path = "../generators/dotnet-oo-bindgen" }
 java-oo-bindgen = { path = "../generators/java-oo-bindgen" }
-clap = "3.2.17"
+clap = { version = "^4", features = ["derive"] }
 pathdiff = "0.2"
 tracing = "^0.1"

ci-script/Cargo.toml

@@ -1,22 +1,26 @@
 use crate::{BindingBuilder, BindingBuilderSettings};
+use dotnet_oo_bindgen::TargetFramework;
 use oo_bindgen::backend::PlatformLocations;
 use std::path::PathBuf;
 use std::process::Command;
 
 pub(crate) struct DotnetBindingBuilder {
     settings: BindingBuilderSettings,
+    target_framework: TargetFramework,
     platforms: PlatformLocations,
     extra_files: Vec<PathBuf>,
 }
 
 impl DotnetBindingBuilder {
     pub(crate) fn new(
         settings: BindingBuilderSettings,
+        target_framework: TargetFramework,
         platforms: PlatformLocations,
         extra_files: &[PathBuf],
     ) -> Self {
         Self {
             settings,
+            target_framework,
             platforms,
             extra_files: extra_files.to_vec(),
         }
@@ -52,6 +56,7 @@ impl BindingBuilder for DotnetBindingBuilder {
             extra_files: self.extra_files.clone(),
             platforms: self.platforms.clone(),
             generate_doxygen,
+            target_framework: self.target_framework,
         };
 
         dotnet_oo_bindgen::generate_dotnet_bindings(&self.settings.library, &config).unwrap();

ci-script/src/builders/dotnet.rs

@@ -1,49 +1,32 @@
-use clap::{App, Arg, ArgMatches};
+use clap::Parser;
+use dotnet_oo_bindgen::TargetFramework;
+use std::path::PathBuf;
 
-pub(crate) fn build() -> ArgMatches {
-    App::new("oo-bindgen")
-        .arg(
-            Arg::with_name("c")
-                .long("c")
-                .takes_value(false)
-                .help("Build C bindings"),
-        )
-        .arg(
-            Arg::with_name("dotnet")
-                .long("dotnet")
-                .takes_value(false)
-                .help("Build .NET Core bindings"),
-        )
-        .arg(
-            Arg::with_name("java")
-                .long("java")
-                .takes_value(false)
-                .help("Build Java (JNI) bindings"),
-        )
-        .arg(
-            Arg::with_name("doxygen")
-                .long("doxygen")
-                .takes_value(false)
-                .help("Generate Doxygen documentation"),
-        )
-        .arg(
-            Arg::with_name("no-tests")
-                .long("no-tests")
-                .takes_value(false)
-                .help("Do not run the unit tests"),
-        )
-        .arg(
-            Arg::with_name("package")
-                .long("package")
-                .takes_value(true)
-                .help("Generate package with the provided modules"),
-        )
-        .arg(
-            Arg::with_name("extra-files")
-                .short('f')
-                .long("extra-files")
-                .takes_value(true)
-                .help("Path to extra files to include in the generated bindings"),
-        )
-        .get_matches()
+#[derive(Parser)]
+#[command(author, version, about, long_about = None)]
+pub(crate) struct Args {
+    /// build the C bindings
+    #[arg(long = "c", default_value_t = false)]
+    pub(crate) build_c: bool,
+    /// build the .NET bindings
+    #[arg(long = "dotnet", default_value_t = false)]
+    pub(crate) build_dotnet: bool,
+    /// build the Java bindings
+    #[arg(long = "java", default_value_t = false)]
+    pub(crate) build_java: bool,
+    /// Target .NET framework, which indirectly determines the C# language version
+    #[arg(value_enum, short = 't', long = "target-dotnet-framework", default_value_t = TargetFramework::NetStandard2_0)]
+    pub(crate) target_framework: TargetFramework,
+    /// generate doxygen documentation
+    #[arg(long = "doxygen", default_value_t = false)]
+    pub(crate) generate_doxygen: bool,
+    /// do NOT run the unit tests
+    #[arg(long = "no-tests", default_value_t = false)]
+    pub(crate) no_tests: bool,
+    /// Generate package from the provided directory
+    #[arg(long = "package")]
+    pub(crate) package: Option<PathBuf>,
+    /// Path(s) to extra files to include in the generated bindings
+    #[arg(short = 'f', long = "extra-files")]
+    pub(crate) extra_files: Vec<PathBuf>,
 }