Merge pull request #1140 from bloomberg/various_windows_fix

fix various windows issues

Author: bobzhang

jscomp/Makefile

@@ -255,6 +255,7 @@ BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util \
 	bsb_build_ui bsb_default\
 	bsb_dep_infos\
 	 bsb_gen\
+	 bsb_file\
 	bsb_unix
 
 BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))

jscomp/all.depend

@@ -134,7 +134,7 @@ ext/ext_filename.cmi :
 common/bs_version.cmx : common/bs_version.cmi
 common/js_config.cmx : ext/ext_string.cmx ext/ext_pervasives.cmx \
     ext/ext_filename.cmx common/js_config.cmi
-common/bs_pkg.cmx : ext/literals.cmx ext/ext_sys.cmx common/bs_pkg.cmi
+common/bs_pkg.cmx : ext/literals.cmx common/bs_pkg.cmi
 common/ext_log.cmx : common/js_config.cmx common/ext_log.cmi
 common/bs_loc.cmx : common/bs_loc.cmi
 common/bs_warnings.cmx : ext/literals.cmx common/js_config.cmx \
@@ -646,7 +646,7 @@ bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
     bsb/bsb_dir.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_build_ui.cmi
-bsb/bsb_build_util.cmx : ext/ext_string.cmx ext/ext_list.cmx \
+bsb/bsb_build_util.cmx : ext/ext_sys.cmx ext/ext_string.cmx ext/ext_list.cmx \
     ext/ext_json.cmx ext/ext_filename.cmx ext/ext_array.cmx \
     bsb/bsb_config.cmx bsb/bsb_build_util.cmi
 bsb/bsb_config.cmx : common/js_config.cmx ext/ext_filename.cmx \
@@ -656,34 +656,40 @@ bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.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 \
-    bsb/bsb_ninja.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
-    bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
-    bsb/bsb_gen.cmi
+bsb/bsb_file.cmx : bsb/bsb_file.cmi
+bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_string.cmx \
+    ext/ext_filename.cmx bsb/bsb_ninja.cmx bsb/bsb_config.cmx \
+    bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx \
+    common/binary_cache.cmx bsb/bsb_gen.cmi
 bsb/bsb_helper_main.cmx : depends/depends_post_process.cmx \
     bsb/bsb_helper_main.cmi
-bsb/bsb_main.cmx : ext/string_vec.cmx ext/string_set.cmx ext/literals.cmx \
+bsb/bsb_main.cmx : ext/string_vec.cmx ext/string_set.cmx \
+    ext/string_hash_set.cmx ext/literals.cmx ext/ext_sys.cmx \
     ext/ext_string.cmx ext/ext_json.cmx ext/ext_filename.cmx \
-    ext/ext_file_pp.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 \
+    ext/ext_file_pp.cmx ext/ext_array.cmx bsb/bsb_unix.cmx bsb/bsb_ninja.cmx \
+    bsb/bsb_gen.cmx bsb/bsb_file.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/string_hash_set.cmx ext/literals.cmx ext/ext_sys.cmx \
+    ext/ext_string.cmx ext/ext_filename.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 bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
-    bsb/bsb_ninja.cmi
-bsb/bsb_unix.cmx : bsb/bsb_unix.cmi
+    common/binary_cache.cmx bsb/bsb_ninja.cmi
+bsb/bsb_os_dependent.cmx :
+bsb/bsb_unix.cmx : ext/ext_sys.cmx ext/ext_string.cmx bsb/bsb_unix.cmi
 bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/ext_json.cmi \
     ext/ext_file_pp.cmi common/binary_cache.cmi
 bsb/bsb_build_util.cmi : ext/ext_json.cmi
 bsb/bsb_config.cmi :
 bsb/bsb_default.cmi : ext/string_set.cmi ext/ext_json.cmi
 bsb/bsb_dep_infos.cmi :
 bsb/bsb_dir.cmi :
+bsb/bsb_file.cmi :
 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_ninja.cmi : ext/string_hash_set.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 \

jscomp/bin/all_ounit_tests.ml

@@ -1733,6 +1733,15 @@ val empty : string
 
 external compare : string -> string -> int = "caml_string_length_based_compare" "noalloc";;
 
+val single_space : string
+
+val concat3 : string -> string -> string -> string 
+val concat4 : string -> string -> string -> string -> string 
+
+val inter2 : string -> string -> string
+val inter3 : string -> string -> string -> string 
+
+val concat_array : string -> string array -> string 
 end = struct
 #1 "ext_string.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2114,6 +2123,20 @@ let replace_backward_slash (x : string)=
 let empty = ""
 
 external compare : string -> string -> int = "caml_string_length_based_compare" "noalloc";;
+
+let single_space = " "
+
+let concat3 a b c = a ^ b ^ c 
+let concat4 a b c d = a ^ b ^ c ^ d 
+
+let inter2 a b = a ^ single_space ^ b 
+
+let inter3 a b c = 
+  a ^ single_space ^ b ^ single_space ^ c 
+
+(** TODO: improve perf *)
+let concat_array sep (s : string array) = 
+  String.concat sep (Array.to_list s)
 end
 module Ounit_array_tests
 = struct
@@ -3423,7 +3446,9 @@ val suffix_d : string
 val suffix_mlastd : string
 val suffix_mliastd : string
 val suffix_js : string
-
+val suffix_mli : string 
+val suffix_cmt : string 
+val suffix_cmti : string 
 
 val commonjs : string 
 val amdjs : string 
@@ -3515,6 +3540,9 @@ let suffix_cmj = ".cmj"
 let suffix_cmi = ".cmi"
 let suffix_mll = ".mll"
 let suffix_ml = ".ml"
+let suffix_mli = ".mli"
+let suffix_cmt = ".cmt" 
+let suffix_cmti = ".cmti" 
 let suffix_mlast = ".mlast"
 let suffix_mliast = ".mliast"
 let suffix_d = ".d"

jscomp/bin/bsb.d

@@ -24,6 +24,8 @@ bin/bsb.ml : ext/ext_json.ml
 bin/bsb.ml : ext/ext_json.mli
 bin/bsb.ml : ext/ext_list.ml
 bin/bsb.ml : ext/ext_list.mli
+bin/bsb.ml : ext/ext_sys.ml
+bin/bsb.ml : ext/ext_sys.mli
 bin/bsb.ml : bsb/bsb_build_util.ml
 bin/bsb.ml : bsb/bsb_build_util.mli
 bin/bsb.ml : bsb/bsb_dir.ml
@@ -40,14 +42,20 @@ 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
-bin/bsb.ml : ext/ext_sys.mli
 bin/bsb.ml : common/bs_pkg.ml
 bin/bsb.ml : common/bs_pkg.mli
 bin/bsb.ml : bsb/bsb_default.ml
 bin/bsb.ml : bsb/bsb_default.mli
 bin/bsb.ml : bsb/bsb_dep_infos.ml
 bin/bsb.ml : bsb/bsb_dep_infos.mli
+bin/bsb.ml : bsb/bsb_file.ml
+bin/bsb.ml : bsb/bsb_file.mli
+bin/bsb.ml : stubs/bs_hash_stubs.ml
+bin/bsb.ml : ext/ext_util.ml
+bin/bsb.ml : ext/ext_util.mli
+bin/bsb.ml : ext/hash_set_gen.ml
+bin/bsb.ml : ext/string_hash_set.ml
+bin/bsb.ml : ext/string_hash_set.mli
 bin/bsb.ml : bsb/bsb_ninja.ml
 bin/bsb.ml : bsb/bsb_ninja.mli
 bin/bsb.ml : bsb/bsb_gen.ml