oof

Author: bbqsrc

Cargo.lock

@@ -9,5 +9,6 @@ thiserror = "1.0"
 tempfile = "3.10"
 tracing = "0.1"
 tracing-subscriber = "0.3.19"
+indexmap = "2.9.0"
 
 [dev-dependencies]

Cargo.toml

@@ -4,6 +4,7 @@ use std::io::Write as _;
 use std::path::PathBuf;
 use std::process::{Command, Stdio};
 use std::sync::{Mutex, OnceLock};
+use indexmap::IndexMap;
 use thiserror::Error;
 
 const VSWHERE_URL: &str =
@@ -102,7 +103,7 @@ pub enum MsvcEnvError {
 #[derive(Debug, Clone)]
 pub struct MsvcEnvironment {
     /// All environment variables from vcvars
-    pub vars: HashMap<String, String>,
+    pub vars: IndexMap<String, String>,
 }
 
 pub struct MsvcEnv;
@@ -253,7 +254,7 @@ impl MsvcEnv {
     }
 
     /// Gets the environment variables after running vcvars
-    fn vcvars_environment(&self, arch: MsvcArch) -> Result<HashMap<String, String>, MsvcEnvError> {
+    fn vcvars_environment(&self, arch: MsvcArch) -> Result<IndexMap<String, String>, MsvcEnvError> {
         let vsdevcmd_path = self.vsdevcmd_path()?;
         let mut child = Command::new("cmd")
             .stdin(Stdio::piped())
@@ -292,7 +293,7 @@ impl MsvcEnv {
                 Some((key, value)) => Some((key.to_string(), value.to_string())),
                 None => None,
             })
-            .collect::<HashMap<String, String>>();
+            .collect::<IndexMap<String, String>>();
 
         Ok(output)
     }

src/lib.rs

@@ -1,5 +1,33 @@
 use msvc_env::MsvcEnv;
-use std::env;
+use std::{
+    env,
+    path::{Path, Prefix},
+};
+
+fn unixify_path(path: &Path) -> String {
+    let p = path.components()
+        .filter_map(|c| Some(match c {
+            std::path::Component::Prefix(prefix_component) => match prefix_component.kind() {
+                Prefix::Disk(os_str) => format!("/{}", os_str as char).to_lowercase(),
+                _ => format!("{}", prefix_component.as_os_str().to_str().unwrap()),
+            },
+            std::path::Component::RootDir => return None,
+            std::path::Component::CurDir => ".".to_string(),
+            std::path::Component::ParentDir => "..".to_string(),
+            std::path::Component::Normal(os_str) => os_str.to_str().unwrap().replace(" ", "\\ "),
+        }))
+        .collect::<Vec<_>>();
+    // eprintln!("P: {:?}", p);
+    p.join("/")
+}
+
+fn unixify_path_env(path: &str) -> String {
+    path.split(";")
+        .map(|p| Path::new(p))
+        .map(unixify_path)
+        .collect::<Vec<_>>()
+        .join(":")
+}
 
 fn main() {
     tracing_subscriber::fmt::init();
@@ -51,7 +79,13 @@ fn main() {
                 format!("{:?}", value).replace(r"\\", r"\")
             );
         } else if !(key.contains("(") || key.contains(")")) {
-            println!("export {:?}={:?}", key, value);
+            if key.to_uppercase() == "PATH" {
+                println!("export MSVC_PATH={:?}", unixify_path_env(&value));
+                println!("export OLD_PATH=\"$PATH\"");
+                println!("export PATH=\"$MSVC_PATH:$OLD_PATH\"");
+            } else {
+                println!("export {}={:?}", key, value);
+            }
         }
     }
 }