Merge pull request #3805 from BuckleScript/fix_3796

Fix #3796

Author: bobzhang

jscomp/bsb/bsb_ninja_rule.ml

@@ -226,7 +226,7 @@ let make_custom_rules
       ~name:"ml_cmi" in 
   let build_package = 
     define
-      ~command:"$bsc -w -49 -color always -no-alias-deps -bs-cmi-only $in"
+      ~command:"$bsc -w -49 -color always -no-alias-deps  $in"
       ~restat:()
       "build_package"
   in 

jscomp/common/js_config.ml

@@ -98,6 +98,8 @@ let bs_suffix = ref false
 let debug = ref false
 
 let cmi_only = ref false  
+let cmj_only = ref false
+
 let force_cmi = ref false
 let force_cmj = ref false
 

jscomp/common/js_config.mli

@@ -94,6 +94,8 @@ val bs_suffix : bool ref
 val debug : bool ref
 
 val cmi_only  : bool ref
+val cmj_only : bool ref 
+(* stopped after generating cmj *)
 val force_cmi : bool ref 
 val force_cmj : bool ref
 

jscomp/core/bs_conditional_initial.ml

@@ -35,7 +35,6 @@ let setup_env () =
   Clflags.debug := true;
   Clflags.record_event_when_debug := false;
   Clflags.binary_annotations := true; 
-  Clflags.transparent_modules := true;
   (* Turn on [-no-alias-deps] by default -- double check *)
   Oprint.out_ident := Outcome_printer_ns.out_ident;
 

jscomp/core/js_implementation.ml

@@ -153,11 +153,13 @@ let after_parsing_impl ppf  outputprefix ast =
         (typedtree, coercion)
         |> Translmod.transl_implementation modulename
         |> (fun lambda -> 
+            let js_program =  
             print_if ppf Clflags.dump_rawlambda Printlambda.lambda (get_lambda lambda)
-            |>
-            Lam_compile_main.lambda_as_module
-              finalenv  
-              outputprefix 
+            |> Lam_compile_main.compile outputprefix finalenv in 
+            if not !Js_config.cmj_only then 
+              Lam_compile_main.lambda_as_module
+                js_program
+                outputprefix 
           );
       end;
       process_with_gentype (outputprefix ^ ".cmt")        
@@ -198,6 +200,7 @@ let make_structure_item ~ns cunit : Parsetree.structure_item =
   keep in sync {!Bsb_namespace_map_gen.output}
 *)
 let implementation_map ppf sourcefile outputprefix = 
+  let () = Js_config.cmj_only := true in 
   let ichan = open_in_bin sourcefile in 
   seek_in ichan (Ext_digest.length +1);
   let list_of_modules = Ext_io.rev_lines_of_chann ichan in 

jscomp/core/lam_compile_main.ml

@@ -292,11 +292,10 @@ let compile
 let (//) = Filename.concat  
 
 let lambda_as_module 
-    finalenv 
+    (lambda_output : J.deps_program)
     (output_prefix : string)
-    (lam : Lambda.lambda) = 
-  let lambda_output = 
-    compile  output_prefix finalenv lam in
+     : unit = 
+  if not !Js_config.cmj_only then begin 
   let basename =  
     Ext_namespace.change_ext_ns_suffix 
       (Filename.basename
@@ -327,7 +326,7 @@ let lambda_as_module
             ) output_chan )
 
 #end
-
+      end
 (* We can use {!Env.current_unit = "Pervasives"} to tell if it is some specific module, 
     We need handle some definitions in standard libraries in a special way, most are io specific, 
     includes {!Pervasives.stdin, Pervasives.stdout, Pervasives.stderr}

jscomp/core/lam_compile_main.mli

@@ -44,7 +44,6 @@ val compile :
   J.deps_program
 
 val lambda_as_module :  
-  Env.t ->
+  J.deps_program ->
   string ->
-  Lambda.lambda -> 
   unit

jscomp/depends/ast_extract.ml

@@ -40,7 +40,7 @@ type 'a kind = 'a Ml_binary.kind
 let read_parse_and_extract (type t) (k : t kind) (ast : t) : String_set.t =
   Depend.free_structure_names := String_set.empty;
   Ext_ref.protect Clflags.transparent_modules false begin fun _ -> 
-  List.iter
+  List.iter (* check *)
     (fun modname  ->
 #if OCAML_VERSION =~ ">4.03.0" then
        ignore @@ 

lib/4.02.3/bsb.ml

@@ -12733,7 +12733,7 @@ let make_custom_rules
       ~name:"ml_cmi" in 
   let build_package = 
     define
-      ~command:"$bsc -w -49 -color always -no-alias-deps -bs-cmi-only $in"
+      ~command:"$bsc -w -49 -color always -no-alias-deps  $in"
       ~restat:()
       "build_package"
   in 

lib/4.02.3/bsdep.ml

@@ -20557,7 +20557,6 @@ let setup_env () =
   Clflags.debug := true;
   Clflags.record_event_when_debug := false;
   Clflags.binary_annotations := true; 
-  Clflags.transparent_modules := true;
   (* Turn on [-no-alias-deps] by default -- double check *)
   Oprint.out_ident := Outcome_printer_ns.out_ident;
 
@@ -29733,6 +29732,8 @@ val bs_suffix : bool ref
 val debug : bool ref
 
 val cmi_only  : bool ref
+val cmj_only : bool ref 
+(* stopped after generating cmj *)
 val force_cmi : bool ref 
 val force_cmj : bool ref
 
@@ -29841,6 +29842,8 @@ let bs_suffix = ref false
 let debug = ref false
 
 let cmi_only = ref false  
+let cmj_only = ref false
+
 let force_cmi = ref false
 let force_cmj = ref false