relative paths reloaded

Author: bobzhang

jscomp/bsb/bsb_config.ml

@@ -62,7 +62,7 @@ let rev_lib_bs_prefix p = rev_lib_bs // p
 
 let ocaml_bin_install_prefix p = lib_ocaml // p
 
-let proj_rel path = Bsb_ninja_global_vars.lazy_src_root_dir // path
+let proj_rel path = rev_lib_bs // path
 
 (** it may not be a bad idea to hard code the binary path 
     of bsb in configuration time

jscomp/bsb/bsb_ninja_gen.ml

@@ -236,9 +236,9 @@ let output_ninja_and_namespace_map
 
   let oc = open_out_bin (cwd_lib_bs // Literals.build_ninja) in 
   mark_rescript oc;
-  Bsb_ninja_targets.output_kv      
+  (* Bsb_ninja_targets.output_kv      
     Bsb_ninja_global_vars.src_root_dir per_proj_dir                 
-    oc ;
+    oc ; *)
   output_static_resources static_resources rules.copy_resources oc ;
   (** Generate build statement for each file *)        
   Ext_list.iter bs_file_groups 

jscomp/bsb/bsb_ninja_global_vars.ml

@@ -30,9 +30,9 @@
   to be "a" and "$a"
 *)
 
-let src_root_dir = "g_root"
+(* let src_root_dir = "g_root"
 
-let lazy_src_root_dir = "$g_root" 
+let lazy_src_root_dir = "$g_root"  *)
 
 
 

jscomp/bsb/bsb_ninja_rule.ml

@@ -218,7 +218,7 @@ let make_custom_rules
     );
 
     Ext_buffer.add_char_string buf ' ' bsc_flags;
-    Ext_buffer.add_string buf " -bs-ast -o $out $i";   
+    Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";   
     Ext_buffer.contents buf
   in  
   let build_ast =

jscomp/main/js_main.ml

@@ -19,7 +19,13 @@ let output_prefix name =
   | Some oname -> 
     Filename.remove_extension oname
 
-
+let set_abs_input_name sourcefile =     
+  let sourcefile =   
+    if !Location.absname && Filename.is_relative  sourcefile then 
+      Ext_path.absolute_cwd_path sourcefile
+    else sourcefile in 
+  Location.set_input_name sourcefile;
+  sourcefile  
 
 
 let setup_error_printer (syntax_kind : [ `ml | `reason | `rescript ])= 
@@ -59,52 +65,68 @@ let handle_reason (type a) (kind : a Ml_binary.kind) sourcefile ppf opref =
        ppf  tmpfile opref ;    );
   Ast_reason_pp.clean tmpfile 
 
-  
+
 
 let process_file sourcefile 
   ?(kind ) ppf = 
   (* This is a better default then "", it will be changed later 
      The {!Location.input_name} relies on that we write the binary ast 
      properly
   *)
-  Location.set_input_name  sourcefile;    
-  let opref = output_prefix sourcefile in 
   let kind =
     match kind with 
     | None -> Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe sourcefile)  
     | Some kind -> kind in 
   match kind with 
-  | Re -> handle_reason Ml sourcefile ppf opref     
+  | Re -> 
+    let sourcefile = set_abs_input_name  sourcefile in 
+    let opref = output_prefix sourcefile in 
+    handle_reason Ml sourcefile ppf opref     
   | Rei ->
+    let sourcefile = set_abs_input_name  sourcefile in 
+    let opref = output_prefix sourcefile in 
     handle_reason Mli sourcefile ppf opref 
   | Ml ->
+    let sourcefile = set_abs_input_name  sourcefile in 
+    let opref = output_prefix sourcefile in 
     Js_implementation.implementation 
       ~parser:Pparse_driver.parse_implementation
       ppf sourcefile opref 
   | Mli  ->   
+    let sourcefile = set_abs_input_name  sourcefile in 
+    let opref = output_prefix sourcefile in 
     Js_implementation.interface 
       ~parser:Pparse_driver.parse_interface
       ppf sourcefile opref   
   | Res -> 
+    let sourcefile = set_abs_input_name  sourcefile in 
+    let opref = output_prefix sourcefile in 
     setup_error_printer `rescript;
     Js_implementation.implementation 
       ~parser:Res_driver.parse_implementation
       ppf sourcefile opref 
   | Resi ->   
+    let sourcefile = set_abs_input_name  sourcefile in 
+    let opref = output_prefix sourcefile in 
     setup_error_printer `rescript;
     Js_implementation.interface 
       ~parser:Res_driver.parse_interface
       ppf sourcefile opref     
   | Intf_ast 
     ->     
+    let opref = output_prefix sourcefile in 
     Js_implementation.interface_mliast ppf sourcefile opref   
     setup_error_printer ;
   | Impl_ast 
     -> 
+    let opref = output_prefix sourcefile in 
     Js_implementation.implementation_mlast ppf sourcefile opref
     setup_error_printer;  
   | Mlmap 
-    -> Js_implementation.implementation_map ppf sourcefile opref
+    -> 
+    Location.set_input_name  sourcefile;    
+    let opref = output_prefix sourcefile in 
+    Js_implementation.implementation_map ppf sourcefile opref
   | Cmi
     ->
     let cmi_sign = (Cmi_format.read_cmi sourcefile).cmi_sign in