[WIP] Windows Support - esy + dune config

appveyor.yml

@@ -20,7 +20,7 @@ cache:
 install:
     # The x64 is required as a workaround for esy/esy#412
     - ps: Install-Product node 8 x64
-    - npm install -g esy@0.3.4
+    - npm install -g esy@0.4.3
     # Retry is necessary due to esy/esy#413 and esy/esy#414
     - appveyor-retry esy install
 

src/analyze/BuildSystem.re

@@ -130,10 +130,19 @@ let detect = (rootPath, bsconfig) => {
 let getEsyCompiledBase = (root) => {
   let env = Unix.environment()->Array.to_list;
 
+  let correctSlashesOnWindows = (p) => {
+      if (Sys.win32) {
+          let slashRegex = Str.regexp("/");
+          Str.global_replace(slashRegex, "\\\\", p);
+      } else {
+          p
+      }
+  };
+
   switch(Utils.getEnvVar(~env, "cur__original_root"), Utils.getEnvVar(~env, "cur__target_dir")) {
-  | (Some(projectRoot), Some(targetDir)) => Ok(Files.relpath(projectRoot, targetDir))
+  | (Some(projectRoot), Some(targetDir)) => Ok(Files.relpath(correctSlashesOnWindows(projectRoot), correctSlashesOnWindows(targetDir)))
   | (_, _) =>
-    switch (Commands.execResult("esy command-env --json")) {
+    switch (Commands.execResult(~cwd=root, "esy command-env --json")) {
     | Ok(commandEnv) =>
       switch (Json.parse(commandEnv)) {
       | exception (Failure(message)) =>
@@ -149,7 +158,7 @@ let getEsyCompiledBase = (root) => {
             Json.get("cur__original_root", json) |?> Json.string,
             Json.get("cur__target_dir", json) |?> Json.string,
           ) {
-          | (Some(projectRoot), Some(targetDir)) => Ok(Files.relpath(projectRoot, targetDir))
+          | (Some(projectRoot), Some(targetDir)) => Ok(Files.relpath(correctSlashesOnWindows(projectRoot), correctSlashesOnWindows(targetDir)))
           | _ => Error("Couldn't find Esy target directory (missing json entries)")
           }
         )
@@ -219,7 +228,8 @@ let getStdlib = (base, buildSystem) => {
     switch (Utils.getEnvVar(~env, "OCAMLLIB")) {
     | Some(esy_ocamllib) => Ok([esy_ocamllib])
     | None =>
-      let%try_wrap esy_ocamllib = getLine("esy -q sh -- -c 'echo $OCAMLLIB'", ~pwd=base);
+      let echoCommand = Filename.quote("echo $OCAMLLIB");
+      let%try_wrap esy_ocamllib = getLine("esy -q sh -- -c " ++ echoCommand, ~pwd=base);
       [esy_ocamllib];
     };
   | Dune(Opam(switchPrefix)) =>
@@ -234,10 +244,11 @@ let isRunningInEsyNamedSandbox = () => {
 };
 
 let getExecutableInEsyPath = (exeName, ~pwd) => {
+  let whichCommand = Sys.win32 ? "where" : "which"
   if (isRunningInEsyNamedSandbox()) {
-    getLine("which " ++ exeName, ~pwd)
+    getLine(whichCommand ++ " " ++ exeName, ~pwd)
   } else {
-    getLine("esy which " ++ exeName, ~pwd)
+    getLine("esy " ++ whichCommand ++ " " ++ exeName, ~pwd)
   }
 };
 
@@ -302,4 +313,4 @@ let inferPackageManager = (projectRoot) => {
       Log.log("Detected `esy` dependency manager for local use");
       Ok(Esy)
   };
-};
+};

src/analyze_example_tests/ExamplesTests.re

@@ -37,7 +37,7 @@ let projects = [
   ("example-react", ["src", "__tests__"], "npm install"),
   ("name_with_underscore", ["src"], "npm install"),
   ("bs-3.1.5", ["src"], "npm install"),
-  /* ("example-esy-dune-project", ["lib", "bin"], "esy"), */
+  ("example-esy-dune-project", ["lib", "bin"], "esy"),
 ];
 
 
@@ -83,4 +83,4 @@ if (failures == []) {
     | `FileFail(uri, message) => print_endline("- Failed to get compilation info for " ++ uri ++ " : " ++ message)
   });
   exit(10)
-}
+}

util/Commands.re

@@ -2,18 +2,8 @@
 
 let shellEscape = path => Filename.quote(path);
 
-let execFull = (~input=?, ~pwd=?, ~env=Unix.environment(), cmd) => {
-  let cmd =
-    if (Sys.os_type == "Win32") {
-      Printf.sprintf("\"%s\"", cmd)
-    } else {
-      cmd
-    }
-  let env = switch pwd {
-    | None => env
-    | Some(pwd) => Array.map(item => String.length(item) > 4 && String.sub(item, 0, 4) == "PWD=" ? "PWD=" ++ pwd : item, env)
-  };
-  let prevCwd = switch pwd {
+let withCwd = (~cwd, f) => {
+  let prevCwd = switch cwd {
     | None => None
     | Some(pwd) =>
     let prevCwd = Unix.getcwd();
@@ -24,11 +14,32 @@ let execFull = (~input=?, ~pwd=?, ~env=Unix.environment(), cmd) => {
       Some(prevCwd)
     }
   }
-  let (cmd_out, cmd_in, cmd_err) = Unix.open_process_full(cmd, env);
+
+  let ret = f();
+
   switch prevCwd {
     | None => ()
     | Some(prevCwd) => Unix.chdir(prevCwd)
   };
+
+  ret;
+};
+
+let execFull = (~input=?, ~pwd=?, ~env=Unix.environment(), cmd) => {
+  let cmd =
+    if (Sys.os_type == "Win32") {
+      Printf.sprintf("\"%s\"", cmd)
+    } else {
+      cmd
+    }
+  let env = switch pwd {
+    | None => env
+    | Some(pwd) => Array.map(item => String.length(item) > 4 && String.sub(item, 0, 4) == "PWD=" ? "PWD=" ++ pwd : item, env)
+  };
+
+  let (cmd_out, cmd_in, cmd_err) = withCwd(~cwd=pwd, () => {
+      Unix.open_process_full(cmd, env);
+  })
 
   switch input {
   | None => ()
@@ -104,8 +115,8 @@ let execOption = cmd => {
   }
 };
 
-let execResult = cmd => {
-  let (lines, success) = execSync(cmd);
+let execResult = (~cwd=?, cmd) => {
+  let (lines, success) = withCwd(~cwd, () => execSync(cmd));
   if (success) {
     RResult.Ok(String.concat("\n", lines))
   } else {
@@ -138,4 +149,4 @@ let execWithInput = (cmd, input) => {
   } {
   | End_of_file => ([], false)
   }
-};
+};

util/Infix.re

@@ -34,11 +34,11 @@ let logIfAbsent = (message, x) => switch x {
 };
 
 let maybeConcat = (a, b) => {
-  if (b != "" && b.[0] == '/') {
+  if (b != "" && (b.[0] == '/' || (String.length(b) > 1 && b.[1] == ':'))) {
     b
   } else {
     fileConcat(a, b)
   }
 };
 
-let (/+) = fileConcat;
+let (/+) = fileConcat;