improve the robustness of devbuild

- no cycle for cmi/cmj data sets
- not encoding version into cmi/cmj, when reading internals, it is already too late to detect

Author: bobzhang

jscomp/core/bs_cmi_load.ml

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
+#if BS_RELEASE_BUILD then
 
 let load_cmi ~unit_name : Env.Persistent_signature.t option =
   match Config_util.find_opt (unit_name ^".cmi") with 
@@ -40,3 +40,32 @@ let load_cmi ~unit_name : Env.Persistent_signature.t option =
         Some {filename = Sys.executable_name ; 
               cmi }
       | None -> None
+
+let check () = 
+  Ext_array.iter 
+    Builtin_cmi_datasets.module_sets_cmi
+    (fun (name,l) ->
+       prerr_endline (">checking " ^ name);
+       let cmi = Lazy.force l in 
+       (match cmi.cmi_crcs with 
+        | (unit , Some digest) :: _  ->
+          Format.fprintf Format.err_formatter "%s -> %s@." unit (Digest.to_hex digest)
+        | _ -> ());
+       prerr_endline ("<checking " ^ name);
+    );
+  Ext_array.iter 
+    Builtin_cmj_datasets.module_sets
+    (fun (name,l) ->
+       prerr_endline (">checking " ^ name);
+       let cmj = Lazy.force l in 
+       Format.fprintf Format.err_formatter "%b@." cmj.pure;
+       prerr_endline ("<checking " ^ name);
+    ) 
+#else
+
+let check () = ()
+let load_cmi ~unit_name : Env.Persistent_signature.t option =
+  match Config_util.find_opt (unit_name ^".cmi") with 
+  | Some filename -> Some {filename; cmi = Cmi_format.read_cmi filename}
+  | None -> None 
+#end    

jscomp/core/builtin_check.ml

@@ -30,6 +30,7 @@
 
 
 let load_builin_unit unit_name : Js_cmj_format.cmj_load_info = 
+#if BS_RELEASE_BUILD then  
   match Ext_string_array.find_sorted_assoc 
           Builtin_cmj_datasets.module_sets
           unit_name with
@@ -43,7 +44,8 @@ let load_builin_unit unit_name : Js_cmj_format.cmj_load_info =
     {package_path =  
       Filename.dirname (Filename.dirname Sys.executable_name); cmj_table}
   | None
-    ->     
+    ->  
+#end         
     Bs_exception.error (Cmj_not_found unit_name)
 (* 
 let load_unit_no_file unit_name : Js_cmj_format.cmj_load_info = 

jscomp/core/js_cmj_load.ml

@@ -132,7 +132,7 @@ let () =
       get_files Literals.suffix_cmj stdlib @             
       get_files Literals.suffix_cmj "others") in 
   from_cmj cmj_files
-    (Filename.concat "core" "builtin_cmj_datasets.ml");
+    (Filename.concat "main" "builtin_cmj_datasets.ml");
   let cmi_files = 
     "runtime" // "js.cmi" ::       
     (get_files Literals.suffix_cmi stdlib @
@@ -143,5 +143,5 @@ let () =
        not (x |~ "internal"))
   in     
   from_cmi cmi_files
-    (Filename.concat "core" "builtin_cmi_datasets.ml")
+    (Filename.concat "main" "builtin_cmi_datasets.ml")
 

jscomp/core/builtin_cmi_datasets.ml renamed to jscomp/main/builtin_cmi_datasets.ml

@@ -209,7 +209,7 @@ let buckle_script_flags : (string * Arg.spec * string) list =
   ("-nostdlib", Arg.Set Js_config.no_stdlib,
     " Don't use stdlib")
   ::
-  ("-bs-internal-check", Arg.Unit (Builtin_check.check ),
+  ("-bs-internal-check", Arg.Unit (Bs_cmi_load.check ),
     " Built in check corrupted data"
   )
   ::  

jscomp/core/builtin_cmi_datasets.mli renamed to jscomp/main/builtin_cmi_datasets.mli

@@ -3,7 +3,8 @@ rule bspack
     command = ./bin/bspack.exe $flags -bs-main $main -o $out  $post_process
     depfile = $out.d
     generator = true
-
+native_ocaml_path = ../ocaml/
+snapshot_path = 4.06.1
 LTO= ../scripts/buckle_lto.js
 OCAML_SRC_UTILS=$native_ocaml_path/utils
 OCAML_SRC_PARSING=$native_ocaml_path/parsing
@@ -67,6 +68,8 @@ build $SNAP/unstable/js_compiler.ml: bspack | ./bin/bspack.exe
 build $SNAP/unstable/js_refmt_compiler.ml: bspack | ./bin/bspack.exe
     flags = -D BS_BROWSER=true -D BS_RELEASE_BUILD=true -bs-MD  -module-alias Config=Config_whole_compiler  -bs-exclude-I config   -I $OCAML_SRC_UTILS -I $OCAML_SRC_PARSING -I $OCAML_SRC_TYPING -I $OCAML_SRC_BYTECOMP -I $OCAML_SRC_DRIVER -I js_parser -I stubs -I ext -I syntax -I depends -I common -I core -I super_errors -I bsb -I outcome_printer -I js_parser -I main -I refmt
     main  = Jsoo_refmt_main
+
+subninja build.ninja    
 # -o $@
 # Check it later 
 # rule bsbnative