make it work nicely

Author: jfrolich

src/build.rs

@@ -452,7 +452,7 @@ pub fn incremental_build(
 pub fn write_build_ninja(build_state: &BuildState) {
     for package in build_state.packages.values() {
         // write empty file:
-        let mut f = File::create(std::path::Path::new(&package.get_bs_build_path()).join("build.ninja"))
+        let mut f = File::create(std::path::Path::new(&package.get_build_path()).join("build.ninja"))
             .expect("Unable to write file");
         f.write_all(b"").expect("unable to write to ninja file");
     }

src/build/clean.rs

@@ -356,7 +356,7 @@ pub fn clean(path: &str, show_progress: bool, bsc_path: Option<String>) -> Resul
         let path = std::path::Path::new(&path_str);
         let _ = std::fs::remove_dir_all(path);
 
-        let path_str = package.get_bs_build_path();
+        let path_str = package.get_ocaml_build_path();
         let path = std::path::Path::new(&path_str);
         let _ = std::fs::remove_dir_all(path);
     });

src/build/compile.rs

@@ -611,13 +611,13 @@ fn compile_file(
                     // and in lib/ocaml when referencing modules in other packages
                     let _ = std::fs::copy(
                         std::path::Path::new(&package.path).join(path),
-                        std::path::Path::new(&package.get_bs_build_path()).join(path),
+                        std::path::Path::new(&package.get_build_path()).join(path),
                     )
                     .expect("copying source file failed");
 
                     let _ = std::fs::copy(
                         std::path::Path::new(&package.path).join(path),
-                        std::path::Path::new(&package.get_bs_build_path())
+                        std::path::Path::new(&package.get_build_path())
                             .join(std::path::Path::new(path).file_name().unwrap()),
                     )
                     .expect("copying source file failed");

src/build/logs.rs

@@ -16,8 +16,8 @@ enum Location {
 
 fn get_log_file_path(package: &packages::Package, subfolder: Location) -> String {
     let build_folder = match subfolder {
-        Location::Bs => package.get_bs_build_path(),
-        Location::Ocaml => package.get_build_path(),
+        Location::Bs => package.get_build_path(),
+        Location::Ocaml => package.get_ocaml_build_path(),
     };
 
     build_folder.to_owned() + "/.compiler.log"

src/build/packages.rs

@@ -63,12 +63,12 @@ pub struct Package {
 }
 
 pub fn get_build_path(canonical_path: &str) -> String {
-    format!("{}/lib/ocaml", canonical_path)
+    format!("{}/lib/bs", canonical_path)
 }
 
 impl Package {
-    pub fn get_bs_build_path(&self) -> String {
-        format!("{}/lib/bs", self.path)
+    pub fn get_ocaml_build_path(&self) -> String {
+        format!("{}/lib/ocaml", self.path)
     }
 
     pub fn get_build_path(&self) -> String {
@@ -553,13 +553,14 @@ pub fn make(
      * the IO */
     let result = extend_with_children(filter, map);
 
-    result.values().for_each(|package| {
-        if let Some(dirs) = &package.dirs {
-            dirs.iter().for_each(|dir| {
-                let _ = std::fs::create_dir_all(std::path::Path::new(&package.get_bs_build_path()).join(dir));
-            })
-        }
-    });
+    // not necessary anymore because we create the dirs in parse
+    // result.values().for_each(|package| {
+    //     if let Some(dirs) = &package.dirs {
+    //         dirs.iter().for_each(|dir| {
+    //             let _ = std::fs::create_dir_all(std::path::Path::new(&package.get_bs_build_path()).join(dir));
+    //         })
+    //     }
+    // });
 
     Ok(result)
 }
@@ -581,7 +582,7 @@ pub fn parse_packages(build_state: &mut BuildState) {
                 build_state.module_names.extend(package_modules)
             }
             let build_path_abs = package.get_build_path();
-            let bs_build_path = package.get_bs_build_path();
+            let bs_build_path = package.get_ocaml_build_path();
             helpers::create_build_path(&build_path_abs);
             helpers::create_build_path(&bs_build_path);
 

src/build/parse.rs

@@ -213,24 +213,23 @@ pub fn generate_asts(
                         .namespace
                         .to_suffix()
                         .expect("namespace should be set for mlmap module");
-                    // copy the mlmap to the bs build path for editor tooling
                     let base_build_path = package.get_build_path() + "/" + &suffix;
-                    let base_bs_build_path = package.get_bs_build_path() + "/" + &suffix;
+                    let base_ocaml_build_path = package.get_ocaml_build_path() + "/" + &suffix;
                     let _ = std::fs::copy(
                         base_build_path.to_string() + ".cmi",
-                        base_bs_build_path.to_string() + ".cmi",
+                        base_ocaml_build_path.to_string() + ".cmi",
                     );
                     let _ = std::fs::copy(
                         base_build_path.to_string() + ".cmt",
-                        base_bs_build_path.to_string() + ".cmt",
+                        base_ocaml_build_path.to_string() + ".cmt",
                     );
                     let _ = std::fs::copy(
                         base_build_path.to_string() + ".cmj",
-                        base_bs_build_path.to_string() + ".cmj",
+                        base_ocaml_build_path.to_string() + ".cmj",
                     );
                     let _ = std::fs::copy(
                         base_build_path.to_string() + ".mlmap",
-                        base_bs_build_path.to_string() + ".mlmap",
+                        base_ocaml_build_path.to_string() + ".mlmap",
                     );
                     match (mlmap_hash, mlmap_hash_after) {
                         (Some(digest), Some(digest_after)) => !digest.eq(&digest_after),
@@ -362,7 +361,6 @@ fn generate_ast(
         ))
     };
     if let Ok((ast_path, _)) = &result {
-        // let dir = std::path::Path::new(filename).parent().unwrap();
         let _ = std::fs::copy(
             Path::new(&build_path_abs).join(&ast_path),
             std::path::Path::new(&package.get_build_path()).join(ast_path.file_name().unwrap()),

src/helpers.rs

@@ -236,7 +236,7 @@ pub fn get_bs_compiler_asset(
 
     let dir = std::path::Path::new(&source_file).parent().unwrap();
 
-    std::path::Path::new(&package.get_bs_build_path())
+    std::path::Path::new(&package.get_build_path())
         .join(dir)
         .join(file_path_to_compiler_asset_basename(source_file, namespace) + extension)
         .to_str()

src/sourcedirs.rs

@@ -85,7 +85,7 @@ pub fn print(buildstate: &BuildState) {
 
             // Write sourcedirs.json
             write_sourcedirs_files(
-                package.get_bs_build_path(),
+                package.get_build_path(),
                 &SourceDirs {
                     dirs: &dirs.clone().into_iter().collect::<Vec<Dir>>(),
                     pkgs: &pkgs.clone().flatten().collect::<Vec<Pkg>>(),
@@ -109,7 +109,7 @@ pub fn print(buildstate: &BuildState) {
 
     // Write sourcedirs.json
     write_sourcedirs_files(
-        root_package.get_bs_build_path(),
+        root_package.get_build_path(),
         &SourceDirs {
             dirs: &merged_dirs.into_iter().collect::<Vec<Dir>>(),
             pkgs: &merged_pkgs.into_iter().collect::<Vec<Pkg>>(),