Merge pull request #1112 from bloomberg/bsdoc

add install support, this is transparent to users, when -make-world it will install its dependencies at the same time, while dev does not need install

Author: bobzhang

jscomp/bin/bsb.ml

@@ -2723,6 +2723,9 @@ val lib_bs : string
 val rev_lib_bs_prefix : string -> string
 
 val no_dev: bool ref 
+
+(** default not install, only when -make-world, its dependencies will be installed  *)
+val install : bool ref 
 end = struct
 #1 "bsb_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2770,6 +2773,8 @@ let proj_rel path = lazy_src_root_dir // path
 *)
 
 let no_dev = ref false 
+
+let install = ref false 
 end
 module Ext_array : sig 
 #1 "ext_array.mli"
@@ -7504,6 +7509,7 @@ let handle_file_group oc ~package_specs ~js_post_build_cmd  acc (group: Bsb_buil
       bs_dependencies
       info  =
     let installable =
+      !Bsb_config.install &&
       match group.public with
       | Export_all -> true
       | Export_none -> false
@@ -8353,15 +8359,18 @@ let separator = "--"
 
 
 let internal_package_specs = "-internal-package-specs"
+let internal_install = "-internal-install"    
 let build_bs_deps package_specs   = 
   let bsc_dir = Bsb_build_util.get_bsc_dir cwd in 
   let bsb_exe = bsc_dir // "bsb.exe" in 
   Bsb_default.walk_all_deps true cwd 
     (fun top cwd -> 
        if not top then 
          Bsb_unix.run_command_execv true
-           {cmd = bsb_exe; cwd = cwd; args  = 
-                                        [| bsb_exe ; no_dev; internal_package_specs; package_specs; regen; separator |]})
+           {cmd = bsb_exe; 
+            cwd = cwd; 
+            args  = 
+              [| bsb_exe ; internal_install ; no_dev; internal_package_specs; package_specs; regen; separator |]})
 
 let annoymous filename =
   String_vec.push  filename targets
@@ -8373,7 +8382,7 @@ let lib_bs = "lib" // "bs"
 let lib_amdjs = "lib" // "amdjs"
 let lib_goog = "lib" // "goog"
 let lib_js = "lib" // "js"
-
+let lib_ocaml = "lib" // "ocaml" (* installed binary artifacts *)
 let clean_bs_garbage cwd = 
   print_string "Doing cleaning in ";
   print_endline cwd; 
@@ -8385,7 +8394,8 @@ let clean_bs_garbage cwd =
     aux lib_bs ; 
     aux lib_amdjs ; 
     aux lib_goog;
-    aux lib_js    
+    aux lib_js ;
+    aux lib_ocaml   
   with 
     e -> 
     prerr_endline ("Failed to clean due to " ^ Printexc.to_string e)
@@ -8394,10 +8404,16 @@ let clean_bs_deps () =
   Bsb_default.walk_all_deps true cwd  (fun top cwd -> 
       clean_bs_garbage cwd 
     )
+
+
+
+
 let bsb_main_flags =
   [
     "-w", Arg.Set watch_mode,
     " Watch mode" ;
+    internal_install, Arg.Set Bsb_config.install,
+    " (internal)Install public interface or not, when make-world it will install(in combination with -regen to make sure it has effect)"; 
     no_dev, Arg.Set Bsb_config.no_dev, 
     " (internal)Build dev dependencies in make-world and dev group(in combination with -regen)";
     regen, Arg.Set force_regenerate,
@@ -8542,9 +8558,9 @@ let () =
             (* don't regenerate files when we only run [bsb -clean-world] *)
             let deps = regenerate_ninja cwd bsc_dir !force_regenerate in 
             make_world_deps deps ;  
-          if  !watch_mode then 
-            watch ()
-            (* ninja is not triggered in this case *)
+            if  !watch_mode then 
+              watch ()
+              (* ninja is not triggered in this case *)
         end
       | `Split (bsb_args,ninja_args)
         ->

jscomp/bsb/bsb_config.ml

@@ -42,4 +42,6 @@ let proj_rel path = lazy_src_root_dir // path
     of bsb in configuration time
 *)
 
-let no_dev = ref false 
+let no_dev = ref false 
+
+let install = ref false 

jscomp/bsb/bsb_config.mli

@@ -32,4 +32,7 @@ val lib_bs : string
 (* we need generate path relative to [lib/bs] directory in the opposite direction *)
 val rev_lib_bs_prefix : string -> string
 
-val no_dev: bool ref 
+val no_dev: bool ref 
+
+(** default not install, only when -make-world, its dependencies will be installed  *)
+val install : bool ref 

jscomp/bsb/bsb_main.ml

@@ -259,15 +259,18 @@ let separator = "--"
 
 
 let internal_package_specs = "-internal-package-specs"
+let internal_install = "-internal-install"    
 let build_bs_deps package_specs   = 
   let bsc_dir = Bsb_build_util.get_bsc_dir cwd in 
   let bsb_exe = bsc_dir // "bsb.exe" in 
   Bsb_default.walk_all_deps true cwd 
     (fun top cwd -> 
        if not top then 
          Bsb_unix.run_command_execv true
-           {cmd = bsb_exe; cwd = cwd; args  = 
-                                        [| bsb_exe ; no_dev; internal_package_specs; package_specs; regen; separator |]})
+           {cmd = bsb_exe; 
+            cwd = cwd; 
+            args  = 
+              [| bsb_exe ; internal_install ; no_dev; internal_package_specs; package_specs; regen; separator |]})
 
 let annoymous filename =
   String_vec.push  filename targets
@@ -279,7 +282,7 @@ let lib_bs = "lib" // "bs"
 let lib_amdjs = "lib" // "amdjs"
 let lib_goog = "lib" // "goog"
 let lib_js = "lib" // "js"
-
+let lib_ocaml = "lib" // "ocaml" (* installed binary artifacts *)
 let clean_bs_garbage cwd = 
   print_string "Doing cleaning in ";
   print_endline cwd; 
@@ -291,7 +294,8 @@ let clean_bs_garbage cwd =
     aux lib_bs ; 
     aux lib_amdjs ; 
     aux lib_goog;
-    aux lib_js    
+    aux lib_js ;
+    aux lib_ocaml   
   with 
     e -> 
     prerr_endline ("Failed to clean due to " ^ Printexc.to_string e)
@@ -300,10 +304,16 @@ let clean_bs_deps () =
   Bsb_default.walk_all_deps true cwd  (fun top cwd -> 
       clean_bs_garbage cwd 
     )
+
+
+
+
 let bsb_main_flags =
   [
     "-w", Arg.Set watch_mode,
     " Watch mode" ;
+    internal_install, Arg.Set Bsb_config.install,
+    " (internal)Install public interface or not, when make-world it will install(in combination with -regen to make sure it has effect)"; 
     no_dev, Arg.Set Bsb_config.no_dev, 
     " (internal)Build dev dependencies in make-world and dev group(in combination with -regen)";
     regen, Arg.Set force_regenerate,
@@ -448,9 +458,9 @@ let () =
             (* don't regenerate files when we only run [bsb -clean-world] *)
             let deps = regenerate_ninja cwd bsc_dir !force_regenerate in 
             make_world_deps deps ;  
-          if  !watch_mode then 
-            watch ()
-            (* ninja is not triggered in this case *)
+            if  !watch_mode then 
+              watch ()
+              (* ninja is not triggered in this case *)
         end
       | `Split (bsb_args,ninja_args)
         ->

jscomp/bsb/bsb_ninja.ml

@@ -296,6 +296,7 @@ let handle_file_group oc ~package_specs ~js_post_build_cmd  acc (group: Bsb_buil
       bs_dependencies
       info  =
     let installable =
+      !Bsb_config.install &&
       match group.public with
       | Export_all -> true
       | Export_none -> false