rename bsb_dir_group to boolean: -g or not

maybe we can create two rules, one for -g groups one without

Author: bobzhang

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -115,7 +115,7 @@ let emit_module_build
     ?shadows:(if is_dev then
                 Some [{Bsb_ninja_targets.key = Bsb_build_schemas.bsb_dir_group ; 
                        op = 
-                         Overwrite (string_of_int (group_dir_index :> int)) }] 
+                         Overwrite "-g" }] 
               else None)
   ;  
   if has_intf_file then begin           

jscomp/bsb/bsb_ninja_gen.ml

@@ -160,7 +160,6 @@ let output_ninja_and_namespace_map
            bs_dev_dependencies
            (fun x -> x.package_install_path));  
         Bsb_ninja_global_vars.g_ns , g_ns_flg ; 
-        Bsb_build_schemas.bsb_dir_group, "0"  (*TODO: avoid name conflict in the future *)
       |] oc 
   in        
   let  bs_groups, bsc_lib_dirs, static_resources =    

jscomp/bsb/bsb_ninja_rule.ml

@@ -194,7 +194,7 @@ let make_custom_rules
     define
       ~restat:()
       ~command:
-      ("$bsdep -hash " ^ digest ^" $g_ns -g $bsb_dir_group $in")
+      ("$bsdep -hash " ^ digest ^" $g_ns $bsb_dir_group $in")
       "build_deps" in 
   let aux ~name ~read_cmi  ~postbuild =
     let postbuild = has_postbuild && postbuild in 

jscomp/bsb_helper/bsb_helper_depfile_gen.ml

@@ -121,7 +121,7 @@ let oc_cmi buf namespace source =
 *)
 let oc_impl 
     (mlast : string)
-    (index : Bsb_dir_index.t)
+    (dev_group : bool)
     (db : Bsb_db_decode.t)
     (namespace : string option)
     (buf : Ext_buffer.t)
@@ -141,7 +141,6 @@ let oc_impl
       Ext_buffer.add_string buf ns;
       Ext_buffer.add_string buf Literals.suffix_cmi;
   ) ; (* TODO: moved into static files*)
-  let is_not_lib_dir = not (Bsb_dir_index.is_lib_dir index) in 
   let s = extract_dep_raw_string mlast in 
   let offset = ref 1 in 
   let size = String.length s in 
@@ -155,7 +154,7 @@ let oc_impl
       end
     );
     (match  
-      Bsb_db_decode.find db dependent_module is_not_lib_dir 
+      Bsb_db_decode.find db dependent_module dev_group 
     with      
     | None -> ()
     | Some ({dir_name; case }) -> 
@@ -187,7 +186,7 @@ let oc_impl
 *)
 let oc_intf
     mliast    
-    (index : Bsb_dir_index.t)
+    (dev_group : bool)
     (db : Bsb_db_decode.t)
     (namespace : string option)
     (buf : Ext_buffer.t) : unit =     
@@ -204,7 +203,6 @@ let oc_intf
       Ext_buffer.add_string buf Literals.suffix_cmi;
   ) ; 
   let cur_module_name = Ext_filename.module_name mliast in
-  let is_not_lib_dir = not (Bsb_dir_index.is_lib_dir index)  in  
   let s = extract_dep_raw_string mliast in 
   let offset = ref 1 in 
   let size = String.length s in 
@@ -217,7 +215,7 @@ let oc_intf
          exit 2
        end
     );
-    (match  Bsb_db_decode.find db dependent_module is_not_lib_dir 
+    (match  Bsb_db_decode.find db dependent_module dev_group 
      with     
      | None -> ()
      | Some {dir_name; case} ->       
@@ -236,7 +234,7 @@ let oc_intf
 
 let emit_d 
   compilation_kind
-  (index : Bsb_dir_index.t) 
+  (dev_group : bool) 
   (namespace : string option) (mlast : string) (mliast : string) = 
   let data  =
     Bsb_db_decode.read_build_cache 
@@ -252,7 +250,7 @@ let emit_d
   in   
   oc_impl 
     mlast
-    index 
+    dev_group
     data
     namespace
     buf 
@@ -261,7 +259,7 @@ let emit_d
   if mliast <> "" then begin
     oc_intf 
       mliast
-      index 
+      dev_group
       data 
       namespace 
       buf        

jscomp/bsb_helper/bsb_helper_depfile_gen.mli

@@ -32,7 +32,7 @@ val deps_of_channel : in_channel -> string list
 
 val emit_d: 
   kind -> 
-  Bsb_dir_index.t ->  
+  bool ->  
   string  option ->
   string ->
   string -> (* empty string means no mliast *)

jscomp/ext/bsb_dir_index.ml

@@ -29,7 +29,7 @@ type t = int
    1 : dev 1 
    2 : dev 2 
 *)  
-external of_int : int -> t = "%identity"
+
 let lib_dir_index = 0
 
 let is_lib_dir x = x = lib_dir_index

jscomp/ext/bsb_dir_index.mli

@@ -33,7 +33,7 @@ val is_lib_dir : t -> bool
 
 val get_dev_index : unit -> t 
 
-val of_int : int -> t 
+
 
 
 

jscomp/main/bsb_helper_main.ml

@@ -29,7 +29,7 @@ let collect_file name =
   batch_files := name :: !batch_files
 
 (* let output_prefix = ref None *)
-let dev_group = ref 0
+let dev_group = ref false
 let namespace = ref None
 
 
@@ -39,7 +39,7 @@ let usage = "Usage: bsb_helper.exe [options] \nOptions are:"
 
 let () =
   Bsb_helper_arg.parse_exn [
-    "-g",  Set_int dev_group ,
+    "-g",  Set dev_group ,
     " Set the dev group (default to be 0)"
     ;
     "-bs-ns",  String (fun s -> namespace := Some s),
@@ -52,13 +52,13 @@ let () =
   | [x]
     ->  Bsb_helper_depfile_gen.emit_d
           !compilation_kind
-          (Bsb_dir_index.of_int !dev_group )          
+          !dev_group
           !namespace x ""
   | [y; x] (* reverse order *)
     -> 
     Bsb_helper_depfile_gen.emit_d
       !compilation_kind
-      (Bsb_dir_index.of_int !dev_group)
+      !dev_group
       !namespace x y
   | _ -> 
     ()