Implement option to use the Meson naming convention under MSVC

Fixes #280

Author: amyspark

src/build.rs

@@ -1020,7 +1020,7 @@ impl CPackage {
 
         let install_paths = InstallPaths::new(name, args, rustc_target, &capi_config);
         let build_targets =
-            BuildTargets::new(name, rustc_target, root_output, libkinds, &capi_config)?;
+            BuildTargets::new(name, rustc_target, root_output, libkinds, &capi_config, args.get_flag("meson"))?;
 
         let finger_print = FingerPrint::new(&id, root_output, &build_targets, &install_paths);
 
@@ -1209,6 +1209,7 @@ pub fn cbuild(
                     &root_output,
                     &libkinds,
                     capi_config,
+                    args.get_flag("meson")
                 )?;
 
                 if let (Some(from_static_lib), Some(to_static_lib)) = (

src/build_targets.rs

@@ -43,6 +43,7 @@ fn extra_targets(
 
 #[derive(Debug, Clone)]
 pub struct BuildTargets {
+    pub name: String,
     pub include: Option<PathBuf>,
     pub static_lib: Option<PathBuf>,
     pub shared_lib: Option<PathBuf>,
@@ -52,6 +53,7 @@ pub struct BuildTargets {
     pub pc: PathBuf,
     pub target: Target,
     pub extra: ExtraTargets,
+    pub use_meson_naming_convention: bool,
 }
 
 impl BuildTargets {
@@ -61,6 +63,7 @@ impl BuildTargets {
         targetdir: &Path,
         libkinds: &[&str],
         capi_config: &CApiConfig,
+        use_meson_naming_convention: bool,
     ) -> anyhow::Result<BuildTargets> {
         let pc = targetdir.join(format!("{}.pc", &capi_config.pkg_config.filename));
         let include = if capi_config.header.enabled {
@@ -139,6 +142,8 @@ impl BuildTargets {
             impl_lib,
             debug_info,
             def,
+            use_meson_naming_convention,
+            name: name.into(),
             target: target.clone(),
             extra: Default::default(),
         })

src/cli.rs

@@ -50,6 +50,9 @@ struct Common {
     #[clap(long = "crt-static")]
     /// Build the library embedding the C runtime
     crt_static: bool,
+    #[clap(default_value = "false")]
+    /// Use the Linux/Meson library naming convention on Windows
+    meson: bool,
 }
 
 fn base_cli() -> Command {

src/install.rs

@@ -228,10 +228,19 @@ pub fn cinstall(ws: &Workspace, packages: &[CPackage]) -> anyhow::Result<()> {
 
         if let Some(ref static_lib) = build_targets.static_lib {
             ws.gctx().shell().status("Installing", "static library")?;
-            copy(
-                static_lib,
-                install_path_lib.join(static_lib.file_name().unwrap()),
-            )?;
+            let lib_type = LibType::from_build_targets(build_targets);
+            let file_name = match lib_type {
+                LibType::Windows => {
+                    if build_targets.use_meson_naming_convention {
+                        format!("lib{}.a", build_targets.name).into()
+                    } else {
+                        static_lib.file_name().unwrap().to_owned()
+                    }
+                }
+                _ => static_lib.file_name().unwrap().to_owned(),
+            };
+
+            copy(static_lib, install_path_lib.join(file_name))?;
         }
 
         if let Some(ref debug_info) = build_targets.debug_info {
@@ -268,7 +277,11 @@ pub fn cinstall(ws: &Workspace, packages: &[CPackage]) -> anyhow::Result<()> {
                     lib.install(capi_config, shared_lib, &install_path_lib)?;
                 }
                 LibType::Windows => {
-                    let lib_name = shared_lib.file_name().unwrap();
+                    let lib_name = if build_targets.use_meson_naming_convention {
+                        format!("lib{}.dll", build_targets.name).into()
+                    } else {
+                        shared_lib.file_name().unwrap().to_owned()
+                    };
 
                     if capi_config.library.install_subdir.is_none() {
                         let install_path_bin = append_to_destdir(destdir.as_deref(), &paths.bindir);
@@ -281,7 +294,11 @@ pub fn cinstall(ws: &Workspace, packages: &[CPackage]) -> anyhow::Result<()> {
                     }
                     if capi_config.library.import_library {
                         let impl_lib = build_targets.impl_lib.as_ref().unwrap();
-                        let impl_lib_name = impl_lib.file_name().unwrap();
+                        let impl_lib_name = if build_targets.use_meson_naming_convention {
+                            format!("{}.lib", build_targets.name).into()
+                        } else {
+                            impl_lib.file_name().unwrap().to_owned()
+                        };
                         copy(impl_lib, install_path_lib.join(impl_lib_name))?;
                         let def = build_targets.def.as_ref().unwrap();
                         let def_name = def.file_name().unwrap();