Merge pull request #3798 from BuckleScript/bsb_tweak

Remove unused code

Author: bobzhang

jscomp/bsb/bsb_build_util.ml

@@ -116,26 +116,7 @@ let resolve_bsb_magic_file ~cwd ~desc p : result  =
 
 (** converting a file from Linux path format to Windows *)
 
-(**
-   If [Sys.executable_name] gives an absolute path, 
-   nothing needs to be done.
-   
-   If [Sys.executable_name] is not an absolute path, for example
-   (rlwrap ./ocaml)
-   it is a relative path, 
-   it needs be adapted based on cwd
-*)
-
-let get_bsc_dir ~cwd = 
-  Filename.dirname 
-    (Ext_path.normalize_absolute_path 
-       (Ext_path.combine cwd  Sys.executable_name))
-
 
-let get_bsc_bsdep cwd = 
-  let dir = get_bsc_dir ~cwd in    
-  Filename.concat dir  "bsc.exe", 
-  Filename.concat dir  "bsb_helper.exe"
 
 (** 
    {[
@@ -173,7 +154,7 @@ let (|?)  m (key, cb) =
   m  |> Ext_json.test key cb
 
 type package_context = {
-  cwd : string ; 
+  proj_dir : string ; 
   top : bool ; 
 }
 
@@ -239,7 +220,7 @@ let rec walk_all_deps_aux
       begin 
         explore_deps Bsb_build_schemas.bs_dependencies;          
         if top then explore_deps Bsb_build_schemas.bs_dev_dependencies;
-        cb {top ; cwd = dir};
+        cb {top ; proj_dir = dir};
         String_hashtbl.add visited cur_package_name dir;
       end
   | _ -> ()

jscomp/bsb/bsb_build_util.mli

@@ -64,21 +64,9 @@ val mkp : string -> unit
    path of [bsb.exe] but also the timestamp, to make it 100% correct, also the integrity of 
    [bsdep.exe] [bsc.exe] etc.
 *)
-val get_bsc_bsdep : string -> string * string
 
 
-(**
-   if [Sys.executable_name] gives an absolute path, 
-   nothing needs to be done
-   if it is a relative path 
-
-   there are two cases: 
-   - bsb.exe
-   - ./bsb.exe 
-   The first should also not be touched
-   Only the latter need be adapted based on project root  
-*)
-val get_bsc_dir : cwd:string -> string                               
+
 
 
 val get_list_string_acc : 
@@ -103,7 +91,7 @@ val resolve_bsb_magic_file :
   result
 
 type package_context = {
-  cwd : string ; 
+  proj_dir : string ; 
   top : bool ; 
 }
 

jscomp/bsb/bsb_clean.ml

@@ -26,9 +26,9 @@
 let (//) = Ext_path.combine
 
 
-let ninja_clean bsc_dir proj_dir =
+let ninja_clean  proj_dir =
   try
-    let cmd = bsc_dir // "ninja.exe" in
+    let cmd = Bsb_global_paths.vendor_ninja in
     let cwd = proj_dir // Bsb_config.lib_bs in
     if Sys.file_exists cwd then
       let eid =
@@ -38,25 +38,26 @@ let ninja_clean bsc_dir proj_dir =
   with  e ->
     Bsb_log.warn "@{<warning>ninja clean failed@} : %s @." (Printexc.to_string e)
 
-let clean_bs_garbage bsc_dir proj_dir =
+let clean_bs_garbage proj_dir =
   Bsb_log.info "@{<info>Cleaning:@} in %s@." proj_dir ;
   let try_remove x =
     let x = proj_dir // x in
     if Sys.file_exists x then
       Bsb_unix.remove_dir_recursive x  in
   try
     Bsb_parse_sources.clean_re_js proj_dir; (* clean re.js files*)
-    ninja_clean bsc_dir proj_dir ;
+    ninja_clean  proj_dir ;
     Ext_list.iter Bsb_config.all_lib_artifacts try_remove ;
   with
     e ->
     Bsb_log.warn "@{<warning>Failed@} to clean due to %s" (Printexc.to_string e)
 
 
-let clean_bs_deps bsc_dir proj_dir =
+let clean_bs_deps  proj_dir =
   Bsb_build_util.walk_all_deps  proj_dir  (fun pkg_cxt ->
       (* whether top or not always do the cleaning *)
-      clean_bs_garbage bsc_dir pkg_cxt.cwd
+      clean_bs_garbage  pkg_cxt.proj_dir
     )
 
-let clean_self bsc_dir proj_dir = clean_bs_garbage bsc_dir proj_dir
+let clean_self  proj_dir = 
+    clean_bs_garbage  proj_dir

jscomp/bsb/bsb_clean.mli

@@ -26,6 +26,10 @@
   TODO: clean staled in source js artifacts
 *)
 
-val clean_bs_deps : string -> string -> unit
+val clean_bs_deps : 
+  string -> 
+  unit
 
-val clean_self : string -> string -> unit
+val clean_self : 
+  string -> 
+  unit

jscomp/bsb/bsb_config_parse.ml

@@ -375,8 +375,7 @@ let extract_js_post_build (map : json_map) cwd : string option =
     With a given [cwd] it works anywhere*)
 let interpret_json 
     ~toplevel_package_specs
-    ~bsc_dir 
-    ~cwd  
+    ~per_proj_dir:(per_proj_dir:string)
 
   : Bsb_config_types.t =
 
@@ -397,15 +396,15 @@ let interpret_json
      1. if [build.ninja] does use [ninja] we need set a variable
      2. we need store it so that we can call ninja correctly
   *)
-  match  Ext_json_parse.parse_json_from_file (cwd // Literals.bsconfig_json) with
+  match  Ext_json_parse.parse_json_from_file (per_proj_dir // Literals.bsconfig_json) with
   | Obj { map } ->
     let package_name, namespace = 
       extract_package_name_and_namespace  map in 
-    let refmt = extract_refmt map cwd in 
-    let gentype_config  = extract_gentype_config map cwd in  
+    let refmt = extract_refmt map per_proj_dir in 
+    let gentype_config  = extract_gentype_config map per_proj_dir in  
     let bs_suffix = extract_bs_suffix_exn map in   
     (* The default situation is empty *)
-    let built_in_package = check_stdlib map cwd in
+    let built_in_package = check_stdlib map per_proj_dir in
     let package_specs =     
       match String_map.find_opt map Bsb_build_schemas.package_specs with 
       | Some x ->
@@ -417,14 +416,14 @@ let interpret_json
         if p = "" then 
           Bsb_exception.invalid_spec "invalid pp, empty string found"
         else 
-          Some (Bsb_build_util.resolve_bsb_magic_file ~cwd ~desc:Bsb_build_schemas.pp_flags p).path
+          Some (Bsb_build_util.resolve_bsb_magic_file ~cwd:per_proj_dir ~desc:Bsb_build_schemas.pp_flags p).path
       ) in 
     let reason_react_jsx = extract_reason_react_jsx map in 
-    let bs_dependencies = extract_dependencies map cwd Bsb_build_schemas.bs_dependencies in 
+    let bs_dependencies = extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies in 
     let toplevel = toplevel_package_specs = None in 
     let bs_dev_dependencies = 
       if toplevel then 
-        extract_dependencies map cwd Bsb_build_schemas.bs_dev_dependencies
+        extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dev_dependencies
       else [] in 
     begin match String_map.find_opt map Bsb_build_schemas.sources with 
       | Some sources -> 
@@ -433,7 +432,7 @@ let interpret_json
         let groups, number_of_dev_groups = Bsb_parse_sources.scan
             ~ignored_dirs:(extract_ignored_dirs map)
             ~toplevel
-            ~root: cwd
+            ~root: per_proj_dir
             ~cut_generators
             ~bs_suffix
             ~namespace
@@ -446,7 +445,7 @@ let interpret_json
           warning = extract_warning map;
           external_includes = extract_string_list map Bsb_build_schemas.bs_external_includes;
           bsc_flags = extract_string_list map Bsb_build_schemas.bsc_flags ;
-          ppx_files = extract_ppx map ~cwd Bsb_build_schemas.ppx_flags;
+          ppx_files = extract_ppx map ~cwd:per_proj_dir Bsb_build_schemas.ppx_flags;
           pp_file = pp_flags ;          
           bs_dependencies ;
           bs_dev_dependencies ;
@@ -460,7 +459,7 @@ let interpret_json
              ]}
           *)          
           refmt;
-          js_post_build_cmd = (extract_js_post_build map cwd);
+          js_post_build_cmd = (extract_js_post_build map per_proj_dir);
           package_specs = 
             (match toplevel_package_specs with 
              | None ->  package_specs

jscomp/bsb/bsb_config_parse.mli

@@ -30,8 +30,7 @@ val package_specs_from_bsconfig :
 
 val interpret_json : 
     toplevel_package_specs:Bsb_package_specs.t option -> 
-    bsc_dir:string -> 
-    cwd:string -> 
+    per_proj_dir:string -> 
     Bsb_config_types.t
 
 

jscomp/bsb/bsb_global_paths.ml

@@ -0,0 +1,69 @@
+(* Copyright (C) 2019 - Authors of BuckleScript
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+let cwd = Sys.getcwd ()
+
+
+(**
+   If [Sys.executable_name] gives an absolute path, 
+   nothing needs to be done.
+   
+   If [Sys.executable_name] is not an absolute path, for example
+   (rlwrap ./ocaml)
+   it is a relative path, 
+   it needs be adapted based on cwd
+
+   if [Sys.executable_name] gives an absolute path, 
+   nothing needs to be done
+   if it is a relative path 
+
+   there are two cases: 
+   - bsb.exe
+   - ./bsb.exe 
+   The first should also not be touched
+   Only the latter need be adapted based on project root  
+*)
+
+let bsc_dir  = 
+  Filename.dirname 
+    (Ext_path.normalize_absolute_path 
+       (Ext_path.combine cwd  Sys.executable_name))
+
+let vendor_bsc =        
+  Filename.concat bsc_dir  "bsc.exe"
+
+
+let vendor_ninja = 
+    Filename.concat bsc_dir "ninja.exe"      
+
+let vendor_bsdep =     
+  Filename.concat bsc_dir "bsb_helper.exe"
+
+
+let vendor_bsppx = 
+  Filename.concat bsc_dir "bsppx.exe"
+  
+;; assert (Sys.file_exists bsc_dir)       
+
+

jscomp/bsb/bsb_global_paths.mli

@@ -0,0 +1,36 @@
+(* Copyright (C) 2019 - Authors of BuckleScript
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+val cwd : string 
+
+val bsc_dir : string 
+
+val vendor_bsc : string
+
+val vendor_ninja : string
+
+val vendor_bsdep : string
+
+val vendor_bsppx : string

jscomp/bsb/bsb_merlin_gen.ml

@@ -97,7 +97,7 @@ let warning_to_merlin_flg (warning: Bsb_warning.t option) : string=
   merlin_flg ^ Bsb_warning.get_warning_flag warning
 
 
-let merlin_file_gen ~cwd
+let merlin_file_gen ~per_proj_dir:(per_proj_dir:string)
     built_in_ppx
     ({file_groups = res_files ; 
       generate_merlin;
@@ -185,7 +185,7 @@ let merlin_file_gen ~cwd
           end
       ) ;
     Buffer.add_string buffer "\n";
-    revise_merlin (cwd // merlin) buffer 
+    revise_merlin (per_proj_dir // merlin) buffer 
   end
 
 

jscomp/bsb/bsb_merlin_gen.mli

@@ -26,4 +26,4 @@
 
 
 val merlin_file_gen : 
-    cwd:string -> string  -> Bsb_config_types.t ->  unit 
+    per_proj_dir:string -> string  -> Bsb_config_types.t ->  unit