Merge pull request #3794 from BuckleScript/call_gentype_from_buckle

Calling genType from buckle instead from the patched compiler

Author: bobzhang

jscomp/common/bs_version.ml

@@ -22,7 +22,7 @@
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

jscomp/core/js_implementation.ml

@@ -27,6 +27,23 @@ let print_if ppf flag printer arg =
   arg
 
 
+let process_with_gentype filename =    
+  match !Clflags.bs_gentype with
+  | None -> ()
+  | Some cmd -> 
+    let comm = (cmd ^ 
+                " -bs-version " ^ Bs_version.version ^
+                " -cmt-add " ^ 
+                filename ^ 
+                ( ":" ^ !Location.input_name)) in 
+    if !Clflags.verbose then begin 
+      prerr_string "+ ";
+      prerr_endline comm;
+      prerr_newline ()
+    end ;                        
+    ignore 
+      (Sys.command comm
+      )
 
 let after_parsing_sig ppf  outputprefix ast  =
   if !Js_config.binary_ast then
@@ -76,6 +93,7 @@ let after_parsing_sig ppf  outputprefix ast  =
 #end        
         Typemod.save_signature modulename tsg outputprefix !Location.input_name
           initial_env sg ;
+        process_with_gentype (outputprefix ^ ".cmti");  
       end
     end
 
@@ -142,7 +160,7 @@ let after_parsing_impl ppf  outputprefix ast =
               outputprefix 
           );
       end;
-        Stypes.dump (Some (outputprefix ^ ".annot"));
+      process_with_gentype (outputprefix ^ ".cmt")        
     end
 let implementation ppf fname outputprefix =
   Compmisc.init_path false;

lib/4.02.3/bsb.ml

@@ -55,7 +55,7 @@ end = struct
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

lib/4.02.3/bsdep.ml

@@ -55,7 +55,7 @@ end = struct
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

lib/4.02.3/bsppx.ml

@@ -16164,7 +16164,7 @@ end = struct
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

lib/4.02.3/unstable/bsb_native.ml

@@ -55,7 +55,7 @@ end = struct
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

lib/4.02.3/unstable/js_compiler.ml

@@ -16071,7 +16071,7 @@ end = struct
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
@@ -50054,11 +50054,7 @@ let save_cmt filename modname binary_annots sourcefile initial_env sg =
       cmt_use_summaries = need_to_clear_env;
     } in
     output_cmt oc cmt;
-    close_out oc;
-    (* TODO: does not make sense to do post-proccesing for [Partial_implementaiton]*)
-    match !Clflags.bs_gentype with
-    | None -> ()
-    | Some cmd -> ignore (Sys.command (cmd ^ " -cmt-add " ^ filename ^ (match sourcefile with None -> "" | Some sourcefile -> ":" ^ sourcefile)))
+    close_out oc
   end;
   clear ()
 

lib/4.02.3/unstable/native_ppx.ml

@@ -15284,7 +15284,7 @@ end = struct
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

lib/4.02.3/whole_compiler.ml

@@ -5270,7 +5270,7 @@ end = struct
  * 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 version = "5.1.1"
+let version = "5.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
@@ -38275,11 +38275,7 @@ let save_cmt filename modname binary_annots sourcefile initial_env sg =
       cmt_use_summaries = need_to_clear_env;
     } in
     output_cmt oc cmt;
-    close_out oc;
-    (* TODO: does not make sense to do post-proccesing for [Partial_implementaiton]*)
-    match !Clflags.bs_gentype with
-    | None -> ()
-    | Some cmd -> ignore (Sys.command (cmd ^ " -cmt-add " ^ filename ^ (match sourcefile with None -> "" | Some sourcefile -> ":" ^ sourcefile)))
+    close_out oc
   end;
   clear ()
 
@@ -123404,6 +123400,23 @@ let print_if ppf flag printer arg =
   arg
 
 
+let process_with_gentype filename =    
+  match !Clflags.bs_gentype with
+  | None -> ()
+  | Some cmd -> 
+    let comm = (cmd ^ 
+                " -bs-version " ^ Bs_version.version ^
+                " -cmt-add " ^ 
+                filename ^ 
+                ( ":" ^ !Location.input_name)) in 
+    if !Clflags.verbose then begin 
+      prerr_string "+ ";
+      prerr_endline comm;
+      prerr_newline ()
+    end ;                        
+    ignore 
+      (Sys.command comm
+      )
 
 let after_parsing_sig ppf  outputprefix ast  =
   if !Js_config.binary_ast then
@@ -123446,6 +123459,7 @@ let after_parsing_sig ppf  outputprefix ast  =
 
         Typemod.save_signature modulename tsg outputprefix !Location.input_name
           initial_env sg ;
+        process_with_gentype (outputprefix ^ ".cmti");  
       end
     end
 
@@ -123510,7 +123524,7 @@ let after_parsing_impl ppf  outputprefix ast =
               outputprefix 
           );
       end;
-        Stypes.dump (Some (outputprefix ^ ".annot"));
+      process_with_gentype (outputprefix ^ ".cmt")        
     end
 let implementation ppf fname outputprefix =
   Compmisc.init_path false;