tweak dyndep

Author: bobzhang

jscomp/bsb/bsb_ninja_rule.ml

@@ -37,14 +37,13 @@ let get_name (x : t) oc = x.name oc
 let print_rule (oc : out_channel) 
   ?description 
   ?(restat : unit option)  
-  ?dyndep 
+  ?(dyndep : unit option)
   ~command   
   name  =
   output_string oc "rule "; output_string oc name ; output_string oc "\n";
   output_string oc "  command = "; output_string oc command; output_string oc "\n";
-  Ext_option.iter dyndep (fun f ->
-      output_string oc "  dyndep = "; output_string oc f; output_string oc  "\n"
-    );
+  (if dyndep <> None then
+      output_string oc "  dyndep = 1\n");
   (if restat <>  None then   
      output_string oc "  restat = 1\n");
   begin match description with 
@@ -254,14 +253,14 @@ let make_custom_rules
       ~command:(mk_ml_cmj_cmd 
                   ~read_cmi  ~is_dev:false 
                   ~postbuild)
-      ~dyndep:"$in_e.d"
+      ~dyndep:()
       ~restat:() (* Always restat when having mli *)
       name,
     define
       ~command:(mk_ml_cmj_cmd 
                   ~read_cmi  ~is_dev:true
                   ~postbuild)
-      ~dyndep:"$in_e.d"
+      ~dyndep:()
       ~restat:() (* Always restat when having mli *)
       (name ^ "_dev")
   in 

jscomp/bsb/bsb_ninja_targets.ml

@@ -27,7 +27,6 @@ let oc_list xs  oc =
   Ext_list.iter xs (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
 
 let output_build
-    (* ?(order_only_deps=[]) *)
     ~outputs
     ~inputs
     ~rule
@@ -38,12 +37,6 @@ let output_build
   output_string oc " : ";
   output_string oc rule;
   oc_list inputs oc;
-  (* if order_only_deps <> [] then
-    begin
-      output_string oc " ||";                
-      oc_list order_only_deps oc 
-    end
-  ; *)
   output_string oc "\n"
 
 let phony ?(order_only_deps=[]) ~inputs ~output oc =

lib/4.06.1/bsb.ml

@@ -13058,14 +13058,13 @@ let get_name (x : t) oc = x.name oc
 let print_rule (oc : out_channel) 
   ?description 
   ?(restat : unit option)  
-  ?dyndep 
+  ?(dyndep : unit option)
   ~command   
   name  =
   output_string oc "rule "; output_string oc name ; output_string oc "\n";
   output_string oc "  command = "; output_string oc command; output_string oc "\n";
-  Ext_option.iter dyndep (fun f ->
-      output_string oc "  dyndep = "; output_string oc f; output_string oc  "\n"
-    );
+  (if dyndep <> None then
+      output_string oc "  dyndep = 1\n");
   (if restat <>  None then   
      output_string oc "  restat = 1\n");
   begin match description with 
@@ -13275,14 +13274,14 @@ let make_custom_rules
       ~command:(mk_ml_cmj_cmd 
                   ~read_cmi  ~is_dev:false 
                   ~postbuild)
-      ~dyndep:"$in_e.d"
+      ~dyndep:()
       ~restat:() (* Always restat when having mli *)
       name,
     define
       ~command:(mk_ml_cmj_cmd 
                   ~read_cmi  ~is_dev:true
                   ~postbuild)
-      ~dyndep:"$in_e.d"
+      ~dyndep:()
       ~restat:() (* Always restat when having mli *)
       (name ^ "_dev")
   in 
@@ -13414,7 +13413,6 @@ let oc_list xs  oc =
   Ext_list.iter xs (fun s -> output_string oc Ext_string.single_space ; output_string oc s)
 
 let output_build
-    (* ?(order_only_deps=[]) *)
     ~outputs
     ~inputs
     ~rule
@@ -13425,12 +13423,6 @@ let output_build
   output_string oc " : ";
   output_string oc rule;
   oc_list inputs oc;
-  (* if order_only_deps <> [] then
-    begin
-      output_string oc " ||";                
-      oc_list order_only_deps oc 
-    end
-  ; *)
   output_string oc "\n"
 
 let phony ?(order_only_deps=[]) ~inputs ~output oc =