reuse g_dev_incls instead of via shadowing

Author: bobzhang

jscomp/bsb/bsb_ninja_file_groups.ml

@@ -49,24 +49,16 @@ let handle_generators oc
 let make_common_shadows     
     package_specs 
     dirname 
-    dir_index 
   : Bsb_ninja_targets.shadow list 
   =
 
-    { key = Bsb_ninja_global_vars.g_pkg_flg;
+   [{ key = Bsb_ninja_global_vars.g_pkg_flg;
       op = 
         Append
           (Bsb_package_specs.package_flag_of_package_specs
              package_specs dirname
           )
-    } ::
-    (if Bsb_dir_index.is_lib_dir dir_index  then [] else
-       [         
-        { key =  Bsb_ninja_global_vars.g_dev_incls;
-          op = OverwriteVar (Bsb_dir_index.bsc_dev_includes );          
-        }
-       ]
-    )   
+    }] 
 
 
 
@@ -105,7 +97,7 @@ let emit_module_build
   let common_shadows = 
     make_common_shadows package_specs
       (Filename.dirname output_cmi)
-      group_dir_index in  
+      in  
   let ast_rule =     
     if is_re then 
       rules.build_ast_from_re

jscomp/bsb/bsb_ninja_gen.ml

@@ -185,7 +185,7 @@ let output_ninja_and_namespace_map
              Bsb_db_util.conflict_module_info k a (Map_string.find_exn lib k)            
         ) ;
       Bsb_ninja_targets.output_kv 
-        Bsb_dir_index.bsc_dev_includes
+        Bsb_ninja_global_vars.g_dev_incls
         (Bsb_build_util.include_dirs source_dirs.(1)) oc
       ;
       bs_groups,source_dirs.(0), static_resources

jscomp/ext/bsb_dir_index.ml

@@ -40,15 +40,6 @@ let get_dev_index ( ) =  1
 
 
 
-(** bsb generate pre-defined variables [bsc_group_i_includes]
-  for each rule, there is variable [bsc_extra_excludes]
-  [g_dev_incls] are for app test etc
-  it will be like
-  {[
-    g_dev_incls = ${bsc_group_1_includes}
-  ]}
-  where [bsc_group_1_includes] will be pre-calcuated
-*)
-let bsc_dev_includes = "bsc_group_1_includes"
+
 
 

jscomp/ext/bsb_dir_index.mli

@@ -37,6 +37,3 @@ val of_int : int -> t
 
 
 
-
-val bsc_dev_includes :  string 
-