Merge pull request #3748 from BuckleScript/simple_initialization

simple initialization

Author: bobzhang

jscomp/core/bs_conditional_initial.ml

@@ -24,6 +24,21 @@
 
 
 let setup_env () =
+  Clflags.compile_only := true;
+  Clflags.bs_only := true;  
+  Clflags.no_implicit_current_dir := true; 
+  (* default true 
+     otherwise [bsc -I sc src/hello.ml ] will include current directory to search path
+  *)
+  Clflags.assume_no_mli := Clflags.Mli_non_exists;
+  Clflags.unsafe_string := false;
+  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;
+
 #if undefined BS_RELEASE_BUILD then
     Printexc.record_backtrace true;
     (match Ext_sys.getenv_opt "BS_DEBUG_FILE" with 
@@ -40,9 +55,3 @@ let setup_env () =
   ; Switch.cut := 100 (* tweakable but not very useful *)
 #end  
 
-let standard_library =
-#if undefined BS_RELEASE_BUILD then
-  Filename.concat (Filename.dirname Sys.executable_name)  "ocaml"
-#else
-  Config.standard_library
-#end

jscomp/core/bs_conditional_initial.mli

@@ -33,4 +33,3 @@
 *)
 val setup_env : unit -> unit
 
-val standard_library : string 

jscomp/core/ocaml_options.ml

@@ -260,9 +260,15 @@ let print_version_string () =
   print_newline (); 
   exit 0 
 
-  
+let standard_library =
+#if undefined BS_RELEASE_BUILD then
+      Filename.concat (Filename.dirname Sys.executable_name)  "ocaml"
+#else
+      Config.standard_library
+#end  
+
 let print_standard_library () = 
-  print_string Bs_conditional_initial.standard_library; print_newline(); exit 0
+  print_string standard_library; print_newline(); exit 0
 
 let ocaml_options = 
   let set r () = r := true in 

jscomp/main/js_main.ml

@@ -291,22 +291,7 @@ let buckle_script_flags : (string * Arg.spec * string) list =
 
 
 let _ = 
-  (* Default configuration: sync up with 
-    {!Jsoo_main}  *)
-  Clflags.compile_only := true;
-  Clflags.bs_only := true;  
-  Clflags.no_implicit_current_dir := true; 
-  (* default true 
-    otherwise [bsc -I sc src/hello.ml ] will include current directory to search path
-  *)
-  Clflags.assume_no_mli := Clflags.Mli_non_exists;
-  Clflags.unsafe_string := false;
-  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;
+
   Bs_conditional_initial.setup_env ();
   try
     Compenv.readenv ppf Before_args;

jscomp/main/jsoo_main.ml

@@ -56,15 +56,9 @@ end
      *    type: "error" // or "warning" or "info"
      *  }
 *)
-let () =
-  Clflags.compile_only := true;
-  Clflags.bs_only := true;
-  Oprint.out_ident := Outcome_printer_ns.out_ident;
-  Clflags.assume_no_mli := Clflags.Mli_non_exists;
+let () =  
   Bs_conditional_initial.setup_env ();
-  Clflags.dont_write_files := true;
-  Clflags.unsafe_string := false;
-  Clflags.record_event_when_debug := false
+  Clflags.binary_annotations := false
 
 let error_of_exn e =   
 #if OCAML_VERSION =~ ">4.03.0" then

lib/4.02.3/bsdep.ml

@@ -20517,7 +20517,7 @@ module Bs_conditional_initial : sig
 *)
 val setup_env : unit -> unit
 
-val standard_library : string 
+
 end = struct
 #1 "bs_conditional_initial.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -20546,15 +20546,26 @@ end = struct
 
 
 let setup_env () =
+  Clflags.compile_only := true;
+  Clflags.bs_only := true;  
+  Clflags.no_implicit_current_dir := true; 
+  (* default true 
+     otherwise [bsc -I sc src/hello.ml ] will include current directory to search path
+  *)
+  Clflags.assume_no_mli := Clflags.Mli_non_exists;
+  Clflags.unsafe_string := false;
+  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;
+
 
   Lexer.replace_directive_bool "BS" true;
   Lexer.replace_directive_string "BS_VERSION"  Bs_version.version
 
 
-let standard_library =
-
-  Config.standard_library
-
 
 end
 module Compenv : sig