Merge pull request #2375 from BuckleScript/bs_deriving_abstract

make standard_library path consistent between BS_DEBUG and release mode

Author: bobzhang

jscomp/all.depend

@@ -409,7 +409,8 @@ core/ocaml_types.cmx : common/ext_log.cmx ext/ext_list.cmx \
 core/ocaml_stdlib_slots.cmx :
 core/bs_conditional_initial.cmx : common/js_config.cmx common/bs_version.cmx \
     core/bs_conditional_initial.cmi
-core/ocaml_options.cmx : common/bs_version.cmx core/ocaml_options.cmi
+core/ocaml_options.cmx : common/bs_version.cmx \
+    core/bs_conditional_initial.cmx core/ocaml_options.cmi
 core/ocaml_parse.cmx : syntax/ppx_entry.cmx common/js_config.cmx \
     ext/ext_path.cmx core/ocaml_parse.cmi
 core/js_op.cmx :

jscomp/core/bs_conditional_initial.ml

@@ -29,3 +29,10 @@ let setup_env () =
 #end       
   Lexer.replace_directive_bool "BS" true;
   Lexer.replace_directive_string "BS_VERSION"  Bs_version.version
+
+let standard_library =   
+#if BS_DEBUG then   
+  Filename.concat (Filename.dirname Sys.executable_name)  "ocaml"
+#else   
+  Config.standard_library
+#end

jscomp/core/bs_conditional_initial.mli

@@ -32,3 +32,5 @@
     Is understood, also make sure the playground do the same initialization. 
 *)
 val setup_env : unit -> unit
+
+val standard_library : string 

jscomp/core/ocaml_options.ml

@@ -253,32 +253,34 @@ let show_config () =
   exit 0;
 ;;
 
-let ocaml_options = 
-  let bs_version_string = 
-    "BuckleScript " ^ Bs_version.version ^
-    " (Using OCaml" ^ Config.version ^ " )" in
-
-  let print_version_and_library compiler =
-    Printf.printf "The OCaml %s, version " compiler;
-    print_string bs_version_string; print_newline();
-    print_string "Standard library directory: ";
-    print_string Config.standard_library; print_newline();
-    exit 0 in
-
-  let print_standard_library = Compenv.print_standard_library in
-
-  let print_version_string () = 
-    print_string bs_version_string;
-    print_newline (); 
-    exit 0 in
+let bs_version_string = 
+  "BuckleScript " ^ Bs_version.version ^
+  " (Using OCaml" ^ Config.version ^ " )" 
+
+let print_version_string () = 
+  print_string bs_version_string;
+  print_newline (); 
+  exit 0 
+
+  
+let print_standard_library () = 
+  print_string Bs_conditional_initial.standard_library; print_newline(); exit 0
+
+let print_version_and_library compiler =
+  Printf.printf "The OCaml %s, version " compiler;
+  print_string bs_version_string; print_newline();
+  print_string "Standard library directory: ";
+  print_string Bs_conditional_initial.standard_library; print_newline();
+  exit 0 
 
+let ocaml_options = 
   let set r () = r := true in 
   let unset r () = r := false in 
   let _absname = set Location.absname in 
   let _color option = 
-      match Clflags.parse_color_setting option with
-      | None -> ()
-      | Some setting -> Clflags.color := setting in 
+    match Clflags.parse_color_setting option with
+    | None -> ()
+    | Some setting -> Clflags.color := setting in 
   let _annot = set annotations in 
   let _binannot = set binary_annotations in 
   let _c = set compile_only in 

lib/bsdep.ml

@@ -20503,6 +20503,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.
@@ -20535,6 +20536,10 @@ let setup_env () =
   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 
 #1 "compenv.mli"

lib/whole_compiler.ml

@@ -20503,6 +20503,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.
@@ -20535,6 +20536,10 @@ let setup_env () =
   Lexer.replace_directive_bool "BS" true;
   Lexer.replace_directive_string "BS_VERSION"  Bs_version.version
 
+let standard_library =   
+   
+  Config.standard_library
+
 end
 module Ident : sig 
 #1 "ident.mli"
@@ -115547,32 +115552,35 @@ let show_config () =
   exit 0;
 ;;
 
-let ocaml_options = 
-  let bs_version_string = 
-    "BuckleScript " ^ Bs_version.version ^
-    " (Using OCaml" ^ Config.version ^ " )" in
+let bs_version_string = 
+  "BuckleScript " ^ Bs_version.version ^
+  " (Using OCaml" ^ Config.version ^ " )" 
 
-  let print_version_and_library compiler =
-    Printf.printf "The OCaml %s, version " compiler;
-    print_string bs_version_string; print_newline();
-    print_string "Standard library directory: ";
-    print_string Config.standard_library; print_newline();
-    exit 0 in
+let print_version_string () = 
+  print_string bs_version_string;
+  print_newline (); 
+  exit 0 
 
-  let print_standard_library = Compenv.print_standard_library in
+  
+let print_standard_library () = 
+  (* Compenv.print_standard_library *)
+  print_string Bs_conditional_initial.standard_library; print_newline(); exit 0
 
-  let print_version_string () = 
-    print_string bs_version_string;
-    print_newline (); 
-    exit 0 in
+let print_version_and_library compiler =
+  Printf.printf "The OCaml %s, version " compiler;
+  print_string bs_version_string; print_newline();
+  print_string "Standard library directory: ";
+  print_string Bs_conditional_initial.standard_library; print_newline();
+  exit 0 
 
+let ocaml_options = 
   let set r () = r := true in 
   let unset r () = r := false in 
   let _absname = set Location.absname in 
   let _color option = 
-      match Clflags.parse_color_setting option with
-      | None -> ()
-      | Some setting -> Clflags.color := setting in 
+    match Clflags.parse_color_setting option with
+    | None -> ()
+    | Some setting -> Clflags.color := setting in 
   let _annot = set annotations in 
   let _binannot = set binary_annotations in 
   let _c = set compile_only in