remove previous hacks avoiding pass -bs-v $empty

Author: bobzhang

jscomp/bsb/bsb_ninja_rule.ml

@@ -177,8 +177,8 @@ let make_custom_rules
     begin match bs_dependencies, bs_dev_dependencies with 
     | [], [] -> ()
     | _, _  -> 
-      Ext_buffer.add_string buf " -bs-v ";    
-      Ext_buffer.add_ninja_prefix_var buf '-' Bsb_ninja_global_vars.g_finger;
+      Ext_buffer.add_string buf " -bs-v";    
+      Ext_buffer.add_ninja_prefix_var buf Bsb_ninja_global_vars.g_finger;
     end;
     Ext_buffer.add_string buf " $i";
     begin match postbuild with 

jscomp/ext/ext_buffer.ml

@@ -110,14 +110,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position

jscomp/ext/ext_buffer.mli

@@ -111,7 +111,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 

lib/4.06.1/bsb.ml

@@ -648,7 +648,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 
@@ -772,14 +771,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position
@@ -12934,8 +12933,8 @@ let make_custom_rules
     begin match bs_dependencies, bs_dev_dependencies with 
     | [], [] -> ()
     | _, _  -> 
-      Ext_buffer.add_string buf " -bs-v ";    
-      Ext_buffer.add_ninja_prefix_var buf '-' Bsb_ninja_global_vars.g_finger;
+      Ext_buffer.add_string buf " -bs-v";    
+      Ext_buffer.add_ninja_prefix_var buf Bsb_ninja_global_vars.g_finger;
     end;
     Ext_buffer.add_string buf " $i";
     begin match postbuild with 

lib/4.06.1/bsb_helper.ml

@@ -1667,7 +1667,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 
@@ -1791,14 +1790,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -6463,7 +6463,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 
@@ -6587,14 +6586,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position

lib/4.06.1/unstable/bspack.ml

@@ -8811,7 +8811,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 
@@ -8935,14 +8934,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position

lib/4.06.1/unstable/js_compiler.ml

@@ -69217,7 +69217,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 
@@ -69341,14 +69340,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -69217,7 +69217,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 
@@ -69341,14 +69340,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position

lib/4.06.1/whole_compiler.ml

@@ -353418,7 +353418,6 @@ val add_string_char :
 
 val add_ninja_prefix_var : 
    t -> 
-   char -> 
    string -> 
    unit 
 
@@ -353542,14 +353541,14 @@ let add_char_string b c s  =
   b.position <- new_position
 
 (* equivalent to add_char " "; add_char "$"; add_string s  *)
-let add_ninja_prefix_var b char s =  
+let add_ninja_prefix_var b s =  
   let s_len = String.length s in
   let len = s_len + 2 in 
   let new_position = b.position + len in
   if new_position > b.length then resize b len;
   let b_buffer = b.buffer in 
   let b_position = b.position in 
-  Bytes.unsafe_set b_buffer b_position char ; 
+  Bytes.unsafe_set b_buffer b_position ' ' ; 
   Bytes.unsafe_set b_buffer (b_position + 1) '$' ; 
   Ext_bytes.unsafe_blit_string s 0 b_buffer (b_position + 2) s_len;
   b.position <- new_position