Merge pull request #3803 from jan-lindemann/feature/install-flag

Mono-Repository Improvement for Parallel Compilation

Author: bobzhang

jscomp/bsb/bsb_world.mli

@@ -23,10 +23,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-(*val install_targets:
+val install_targets:
   string ->
   Bsb_config_types.t option ->
-  unit*)
+  unit
 
 val make_world_deps:
   string ->

jscomp/build_tests/install/.gitignore

@@ -0,0 +1,26 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/bs
+*.mlast
+*.mliast
+.vscode
+.merlin
+*.bs.js

jscomp/build_tests/install/bsconfig.json

@@ -0,0 +1,20 @@
+{
+    "name": "install",
+    "version": "0.1.0",
+    "sources": {
+      "dir" : "src",
+      "subdirs" : true
+    },
+    "package-specs": {
+      "module": "commonjs",
+      "in-source": true
+    },
+    "suffix": ".bs.js",
+    "bs-dependencies": [
+    ],
+    "warnings": {
+      "error" : "+101"
+    },
+    "refmt": 3
+  }
+  

jscomp/build_tests/install/input.js

@@ -0,0 +1,32 @@
+var p = require("child_process");
+var fs = require("fs");
+var path = require("path");
+var assert = require("assert");
+
+p.spawnSync(`bsb`, [`-clean`], {
+  encoding: "utf8",
+  cwd: __dirname,
+  stdio: [0, 1, 2]
+});
+p.spawnSync(`bsb`, [`-install`], {
+  encoding: "utf8",
+  cwd: __dirname,
+  stdio: [0, 1, 2]
+});
+
+var fooExists = fs.existsSync(path.join(__dirname, "lib", "ocaml", "Foo.cmi"));
+assert.ok(fooExists == false);
+
+p.spawnSync(`bsb`, {
+  encoding: "utf8",
+  cwd: __dirname,
+  stdio: [0, 1, 2]
+});
+p.spawnSync(`bsb` ,[`-install`], {
+  encoding: "utf8",
+  cwd: __dirname,
+  stdio: [0, 1, 2]
+});
+
+fooExists = fs.existsSync(path.join(__dirname, "lib", "ocaml", "Foo.cmi"));
+assert.ok(fooExists);

jscomp/build_tests/install/package.json

@@ -0,0 +1,18 @@
+{
+    "name": "install",
+    "version": "0.1.0",
+    "scripts": {
+      "clean": "bsb -clean-world",
+      "build": "bsb -make-world",
+      "install": "bsb -install",
+      "watch": "bsb -make-world -w"
+    },
+    "keywords": [
+      "BuckleScript"
+    ],
+    "author": "",
+    "license": "MIT",
+    "devDependencies": {
+      "bs-platform": "^5.1.0-dev.1"
+    }
+  }

jscomp/build_tests/install/src/Foo.re

@@ -0,0 +1 @@
+let main = () => Js.log("hello");

jscomp/main/bsb_main.ml

@@ -36,6 +36,7 @@ let regen = "-regen"
 let separator = "--"
 let watch_mode = ref false
 let make_world = ref false 
+let do_install = ref false
 let set_make_world () = make_world := true
 let bs_version_string = Bs_version.version
 
@@ -62,6 +63,8 @@ let bsb_main_flags : (string * Arg.spec * string) list=
     " Clean only current project";
     "-make-world", Arg.Unit set_make_world,
     " Build all dependencies and itself ";
+    "-install", Arg.Set do_install,
+    " Install public interface files into lib/ocaml";
     "-init", Arg.String (fun path -> generate_theme_with_path := Some path),
     " Init sample project to get started. Note (`bsb -init sample` will create a sample project while `bsb -init .` will reuse current directory)";
     "-theme", Arg.String set_theme,
@@ -131,6 +134,23 @@ let handle_anonymous_arg arg =
 let program_exit () =
   exit 0
 
+let install_target config_opt =
+  let config =
+    match config_opt with
+    | None ->
+    let config = Bsb_config_parse.interpret_json ~toplevel_package_specs:None ~per_proj_dir:Bsb_global_paths.cwd in
+    let _ = Ext_list.iter config.file_groups.files (fun group -> 
+    let check_file = match group.public with
+      | Export_all -> fun _ -> true
+      | Export_none -> fun _ -> false
+      | Export_set set ->  
+        fun module_name ->
+        String_set.mem set module_name in
+    String_map.iter group.sources (fun  module_name module_info -> if check_file module_name then begin String_hash_set.add config.files_to_install module_info.name_sans_extension end)) in 
+    config
+    | Some config -> config in
+  Bsb_world.install_targets Bsb_global_paths.cwd (Some config)
+
 (* see discussion #929, if we catch the exception, we don't have stacktrace... *)
 let () =
   try begin 
@@ -155,8 +175,9 @@ let () =
             | None -> 
               (* [-make-world] should never be combined with [-package-specs] *)
               let make_world = !make_world in 
-              let force_regenerate = !force_regenerate in  
-              if not make_world && not force_regenerate then
+              let force_regenerate = !force_regenerate in
+              let do_install = !do_install in 
+              if not make_world && not force_regenerate && not do_install then
                 (* [regenerate_ninja] is not triggered in this case
                    There are several cases we wish ninja will not be triggered.
                    [bsb -clean-world]
@@ -180,7 +201,9 @@ let () =
                       [bsb -regen ]
                    *)
                  end else if make_world then begin
-                   ninja_command_exit  [||] 
+                   ninja_command_exit [||] 
+                 end else if do_install then begin
+                   install_target config_opt
                  end)
           end
         | `Split (bsb_args,ninja_args)
@@ -195,6 +218,8 @@ let () =
             (* [-make-world] should never be combined with [-package-specs] *)
             if !make_world then
               Bsb_world.make_world_deps Bsb_global_paths.cwd config_opt ninja_args;
+            if !do_install then
+              install_target config_opt;
             if !watch_mode then program_exit ()
             else ninja_command_exit  ninja_args 
           end

lib/4.02.3/bsb.ml

@@ -16742,10 +16742,10 @@ module Bsb_world : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-(*val install_targets:
+val install_targets:
   string ->
   Bsb_config_types.t option ->
-  unit*)
+  unit
 
 val make_world_deps:
   string ->
@@ -16909,6 +16909,7 @@ let regen = "-regen"
 let separator = "--"
 let watch_mode = ref false
 let make_world = ref false 
+let do_install = ref false
 let set_make_world () = make_world := true
 let bs_version_string = Bs_version.version
 
@@ -16935,6 +16936,8 @@ let bsb_main_flags : (string * Arg.spec * string) list=
     " Clean only current project";
     "-make-world", Arg.Unit set_make_world,
     " Build all dependencies and itself ";
+    "-install", Arg.Set do_install,
+    " Install public interface files into lib/ocaml";
     "-init", Arg.String (fun path -> generate_theme_with_path := Some path),
     " Init sample project to get started. Note (`bsb -init sample` will create a sample project while `bsb -init .` will reuse current directory)";
     "-theme", Arg.String set_theme,
@@ -17004,6 +17007,23 @@ let handle_anonymous_arg arg =
 let program_exit () =
   exit 0
 
+let install_target config_opt =
+  let config =
+    match config_opt with
+    | None ->
+    let config = Bsb_config_parse.interpret_json ~toplevel_package_specs:None ~per_proj_dir:Bsb_global_paths.cwd in
+    let _ = Ext_list.iter config.file_groups.files (fun group -> 
+    let check_file = match group.public with
+      | Export_all -> fun _ -> true
+      | Export_none -> fun _ -> false
+      | Export_set set ->  
+        fun module_name ->
+        String_set.mem set module_name in
+    String_map.iter group.sources (fun  module_name module_info -> if check_file module_name then begin String_hash_set.add config.files_to_install module_info.name_sans_extension end)) in 
+    config
+    | Some config -> config in
+  Bsb_world.install_targets Bsb_global_paths.cwd (Some config)
+
 (* see discussion #929, if we catch the exception, we don't have stacktrace... *)
 let () =
   try begin 
@@ -17028,8 +17048,9 @@ let () =
             | None -> 
               (* [-make-world] should never be combined with [-package-specs] *)
               let make_world = !make_world in 
-              let force_regenerate = !force_regenerate in  
-              if not make_world && not force_regenerate then
+              let force_regenerate = !force_regenerate in
+              let do_install = !do_install in 
+              if not make_world && not force_regenerate && not do_install then
                 (* [regenerate_ninja] is not triggered in this case
                    There are several cases we wish ninja will not be triggered.
                    [bsb -clean-world]
@@ -17053,7 +17074,9 @@ let () =
                       [bsb -regen ]
                    *)
                  end else if make_world then begin
-                   ninja_command_exit  [||] 
+                   ninja_command_exit [||] 
+                 end else if do_install then begin
+                   install_target config_opt
                  end)
           end
         | `Split (bsb_args,ninja_args)
@@ -17068,6 +17091,8 @@ let () =
             (* [-make-world] should never be combined with [-package-specs] *)
             if !make_world then
               Bsb_world.make_world_deps Bsb_global_paths.cwd config_opt ninja_args;
+            if !do_install then
+              install_target config_opt;
             if !watch_mode then program_exit ()
             else ninja_command_exit  ninja_args 
           end

lib/4.02.3/unstable/bsb_native.ml

@@ -16841,10 +16841,10 @@ module Bsb_world : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-(*val install_targets:
+val install_targets:
   string ->
   Bsb_config_types.t option ->
-  unit*)
+  unit
 
 val make_world_deps:
   string ->
@@ -17008,6 +17008,7 @@ let regen = "-regen"
 let separator = "--"
 let watch_mode = ref false
 let make_world = ref false 
+let do_install = ref false
 let set_make_world () = make_world := true
 let bs_version_string = Bs_version.version
 
@@ -17034,6 +17035,8 @@ let bsb_main_flags : (string * Arg.spec * string) list=
     " Clean only current project";
     "-make-world", Arg.Unit set_make_world,
     " Build all dependencies and itself ";
+    "-install", Arg.Set do_install,
+    " Install public interface files into lib/ocaml";
     "-init", Arg.String (fun path -> generate_theme_with_path := Some path),
     " Init sample project to get started. Note (`bsb -init sample` will create a sample project while `bsb -init .` will reuse current directory)";
     "-theme", Arg.String set_theme,
@@ -17103,6 +17106,23 @@ let handle_anonymous_arg arg =
 let program_exit () =
   exit 0
 
+let install_target config_opt =
+  let config =
+    match config_opt with
+    | None ->
+    let config = Bsb_config_parse.interpret_json ~toplevel_package_specs:None ~per_proj_dir:Bsb_global_paths.cwd in
+    let _ = Ext_list.iter config.file_groups.files (fun group -> 
+    let check_file = match group.public with
+      | Export_all -> fun _ -> true
+      | Export_none -> fun _ -> false
+      | Export_set set ->  
+        fun module_name ->
+        String_set.mem set module_name in
+    String_map.iter group.sources (fun  module_name module_info -> if check_file module_name then begin String_hash_set.add config.files_to_install module_info.name_sans_extension end)) in 
+    config
+    | Some config -> config in
+  Bsb_world.install_targets Bsb_global_paths.cwd (Some config)
+
 (* see discussion #929, if we catch the exception, we don't have stacktrace... *)
 let () =
   try begin 
@@ -17127,8 +17147,9 @@ let () =
             | None -> 
               (* [-make-world] should never be combined with [-package-specs] *)
               let make_world = !make_world in 
-              let force_regenerate = !force_regenerate in  
-              if not make_world && not force_regenerate then
+              let force_regenerate = !force_regenerate in
+              let do_install = !do_install in 
+              if not make_world && not force_regenerate && not do_install then
                 (* [regenerate_ninja] is not triggered in this case
                    There are several cases we wish ninja will not be triggered.
                    [bsb -clean-world]
@@ -17152,7 +17173,9 @@ let () =
                       [bsb -regen ]
                    *)
                  end else if make_world then begin
-                   ninja_command_exit  [||] 
+                   ninja_command_exit [||] 
+                 end else if do_install then begin
+                   install_target config_opt
                  end)
           end
         | `Split (bsb_args,ninja_args)
@@ -17167,6 +17190,8 @@ let () =
             (* [-make-world] should never be combined with [-package-specs] *)
             if !make_world then
               Bsb_world.make_world_deps Bsb_global_paths.cwd config_opt ninja_args;
+            if !do_install then
+              install_target config_opt;
             if !watch_mode then program_exit ()
             else ninja_command_exit  ninja_args 
           end