provide make-world option (#1053)

Author: bobzhang

jscomp/Makefile

@@ -227,7 +227,10 @@ CORE_CMXS=$(addprefix core/, $(addsuffix .cmx, $(CORE_SRCS)))
 OTHER_CORE_SRCS= bsppx_main bspack_main jsoo_main  bspp_main js_cmi_datasets \
 		 js_main
 OTHER_CORE_CMXS= $(addprefix core/, $(addsuffix .cmx, $(OTHER_CORE_SRCS)))
-BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util bsb_dep_infos bsb_dir bsb_ninja bsb_build_ui bsb_default bsb_gen
+BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util \
+	bsb_dep_infos bsb_dir bsb_ninja \
+	bsb_build_ui bsb_default bsb_gen\
+	bsb_unix
 
 BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))
 MAIN_SRCS= jsgen_main jscmj_main bsb/bsb_main bsb/bsb_helper_main

jscomp/all.depend

@@ -617,8 +617,8 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit_tests/ounit_array_tests.cmx ounit/oUnit.cmx \
     ounit_tests/ounit_tests_main.cmi
 bsb/bsb_build_schemas.cmx :
-bsb/bsb_build_ui.cmx : ext/string_set.cmx ext/string_map.cmx \
-    ext/resize_array.cmx ext/ext_string.cmx ext/ext_json.cmx \
+bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
+    ext/string_map.cmx ext/ext_string.cmx ext/ext_json.cmx \
     ext/ext_filename.cmx ext/ext_file_pp.cmx bsb/bsb_dir.cmx \
     bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
     bsb/bsb_build_ui.cmi
@@ -628,8 +628,8 @@ bsb/bsb_build_util.cmx : ext/ext_string.cmx ext/ext_list.cmx \
 bsb/bsb_config.cmx : common/js_config.cmx ext/ext_filename.cmx \
     bsb/bsb_config.cmi
 bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_filename.cmx bsb/bsb_build_util.cmx common/bs_pkg.cmx \
-    bsb/bsb_default.cmi
+    ext/ext_json.cmx ext/ext_filename.cmx bsb/bsb_build_util.cmx \
+    bsb/bsb_build_schemas.cmx common/bs_pkg.cmx bsb/bsb_default.cmi
 bsb/bsb_dep_infos.cmx : bsb/bsb_dep_infos.cmi
 bsb/bsb_dir.cmx : bsb/bsb_dir.cmi
 bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_filename.cmx \
@@ -639,12 +639,13 @@ bsb/bsb_helper_main.cmx : depends/depends_post_process.cmx \
     bsb/bsb_helper_main.cmi
 bsb/bsb_main.cmx : ext/string_vec.cmx ext/literals.cmx ext/ext_string.cmx \
     ext/ext_json.cmx ext/ext_filename.cmx ext/ext_file_pp.cmx \
-    ext/ext_array.cmx bsb/bsb_gen.cmx bsb/bsb_dep_infos.cmx \
+    ext/ext_array.cmx bsb/bsb_unix.cmx bsb/bsb_gen.cmx bsb/bsb_dep_infos.cmx \
     bsb/bsb_default.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx bsb/bsb_main.cmi
 bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx ext/literals.cmx \
     ext/ext_filename.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_ui.cmx common/binary_cache.cmx bsb/bsb_ninja.cmi
+bsb/bsb_unix.cmx : bsb/bsb_unix.cmi
 bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/string_map.cmi \
     ext/ext_json.cmi ext/ext_file_pp.cmi common/binary_cache.cmi
 bsb/bsb_build_util.cmi : ext/ext_json.cmi
@@ -656,6 +657,7 @@ bsb/bsb_gen.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
 bsb/bsb_helper_main.cmi :
 bsb/bsb_main.cmi :
 bsb/bsb_ninja.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
+bsb/bsb_unix.cmi :
 jscmj_main.cmx : common/js_config.cmx core/js_cmj_format.cmx \
     ext/ext_string.cmx ext/ext_pp.cmx ext/ext_pervasives.cmx \
     ext/ext_array.cmx jscmj_main.cmi

jscomp/bin/all_ounit_tests.i.ml

@@ -1694,13 +1694,18 @@ val is_valid_source_name : string -> bool
 
 val no_char : string -> char -> int -> int -> bool 
 
+
 val no_slash : string -> bool 
 
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
 (** if no conversion happens, reference equality holds *)
 val replace_backward_slash : string -> string 
+
+val empty : string 
+
+
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2043,6 +2048,7 @@ let no_char x ch i len =
   if i < 0 || i >= str_len || len >= str_len then (* 0 *) invalid_arg "Ext_string.no_char"   
   else (* 0 *) unsafe_no_char x ch i len 
 
+
 let no_slash x = 
   (* 5 *) unsafe_no_char x '/' 0 (String.length x - 1)
 
@@ -2062,6 +2068,9 @@ let replace_backward_slash (x : string)=
         |'\\'-> (* 5 *) '/'
         | x -> (* 8 *) x) x
 
+let empty = ""
+
+
 end
 module Ounit_array_tests
 = struct
@@ -7878,6 +7887,7 @@ get_extension "a" = ""
 *)
 val get_extension : string -> string
 
+val simple_convert_node_path_to_os_path : string -> string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -8092,7 +8102,6 @@ let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
 
-
 let module_name_of_file file =
   (* 0 *) String.capitalize 
     (Filename.chop_extension @@ Filename.basename file)  
@@ -8200,14 +8209,13 @@ let get_extension x =
   (* 0 *) let pos = Ext_string.rindex_neg x '.' in 
   if pos < 0 then (* 0 *) ""
   else (* 0 *) Ext_string.tail_from x pos 
-(*  
-  try
-    let pos = String.rindex x '.' in
-    Ext_string.tail_from x pos
-  with Not_found -> ""
-*)
 
 
+let simple_convert_node_path_to_os_path =
+  if Sys.unix then (* 1 *) fun x -> (* 0 *) x 
+  else (* 0 *) if Sys.win32 || Sys.cygwin then 
+    (* 0 *) Ext_string.replace_slash_backward 
+  else (* 0 *) failwith ("Unknown OS : " ^ Sys.os_type)
 end
 module Ounit_path_tests
 = struct

jscomp/bin/all_ounit_tests.ml

@@ -1694,13 +1694,18 @@ val is_valid_source_name : string -> bool
 
 val no_char : string -> char -> int -> int -> bool 
 
+
 val no_slash : string -> bool 
 
 (** if no conversion happens, reference equality holds *)
 val replace_slash_backward : string -> string 
 
 (** if no conversion happens, reference equality holds *)
 val replace_backward_slash : string -> string 
+
+val empty : string 
+
+
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2043,6 +2048,7 @@ let no_char x ch i len =
   if i < 0 || i >= str_len || len >= str_len then invalid_arg "Ext_string.no_char"   
   else unsafe_no_char x ch i len 
 
+
 let no_slash x = 
   unsafe_no_char x '/' 0 (String.length x - 1)
 
@@ -2062,6 +2068,9 @@ let replace_backward_slash (x : string)=
         |'\\'-> '/'
         | x -> x) x
 
+let empty = ""
+
+
 end
 module Ounit_array_tests
 = struct
@@ -7878,6 +7887,7 @@ get_extension "a" = ""
 *)
 val get_extension : string -> string
 
+val simple_convert_node_path_to_os_path : string -> string
 end = struct
 #1 "ext_filename.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -8092,7 +8102,6 @@ let package_dir = lazy (find_package_json_dir (Lazy.force cwd))
 
 
 
-
 let module_name_of_file file =
   String.capitalize 
     (Filename.chop_extension @@ Filename.basename file)  
@@ -8200,14 +8209,13 @@ let get_extension x =
   let pos = Ext_string.rindex_neg x '.' in 
   if pos < 0 then ""
   else Ext_string.tail_from x pos 
-(*  
-  try
-    let pos = String.rindex x '.' in
-    Ext_string.tail_from x pos
-  with Not_found -> ""
-*)
 
 
+let simple_convert_node_path_to_os_path =
+  if Sys.unix then fun x -> x 
+  else if Sys.win32 || Sys.cygwin then 
+    Ext_string.replace_slash_backward 
+  else failwith ("Unknown OS : " ^ Sys.os_type)
 end
 module Ounit_path_tests
 = struct

jscomp/bin/bsb.d

@@ -30,12 +30,14 @@ bin/bsb.ml : bsb/bsb_dir.ml
 bin/bsb.ml : bsb/bsb_dir.mli
 bin/bsb.ml : ext/ext_file_pp.ml
 bin/bsb.ml : ext/ext_file_pp.mli
-bin/bsb.ml : ext/vec_gen.ml
-bin/bsb.ml : ext/resize_array.ml
-bin/bsb.ml : ext/resize_array.mli
 bin/bsb.ml : ext/set_gen.ml
 bin/bsb.ml : ext/string_set.ml
 bin/bsb.ml : ext/string_set.mli
+bin/bsb.ml : ext/vec_gen.ml
+bin/bsb.ml : ext/resize_array.ml
+bin/bsb.ml : ext/resize_array.mli
+bin/bsb.ml : ext/string_vec.ml
+bin/bsb.ml : ext/string_vec.mli
 bin/bsb.ml : bsb/bsb_build_ui.ml
 bin/bsb.ml : bsb/bsb_build_ui.mli
 bin/bsb.ml : ext/ext_sys.ml
@@ -50,7 +52,7 @@ bin/bsb.ml : bsb/bsb_ninja.ml
 bin/bsb.ml : bsb/bsb_ninja.mli
 bin/bsb.ml : bsb/bsb_gen.ml
 bin/bsb.ml : bsb/bsb_gen.mli
-bin/bsb.ml : ext/string_vec.ml
-bin/bsb.ml : ext/string_vec.mli
+bin/bsb.ml : bsb/bsb_unix.ml
+bin/bsb.ml : bsb/bsb_unix.mli
 bin/bsb.ml : bsb/bsb_main.ml
 bin/bsb.ml : bsb/bsb_main.mli