bump version

Author: bobzhang

jscomp/bin/all_ounit_tests.d

@@ -63,6 +63,7 @@ bin/all_ounit_tests.ml : ounit/oUnitTypes.ml
 bin/all_ounit_tests.ml : ounit/oUnitUtils.ml
 bin/all_ounit_tests.ml : ext/ext_filename.mli
 bin/all_ounit_tests.ml : ext/ext_js_regex.mli
+bin/all_ounit_tests.ml : ext/ext_namespace.ml
 bin/all_ounit_tests.ml : ext/ext_position.mli
 bin/all_ounit_tests.ml : ext/hash_set_poly.ml
 bin/all_ounit_tests.ml : ext/int_hash_set.mli
@@ -72,6 +73,7 @@ bin/all_ounit_tests.ml : ounit/oUnitLogger.ml
 bin/all_ounit_tests.ml : ext/ext_json_noloc.ml
 bin/all_ounit_tests.ml : ext/ext_json_parse.ml
 bin/all_ounit_tests.ml : ext/ext_json_types.ml
+bin/all_ounit_tests.ml : ext/ext_namespace.mli
 bin/all_ounit_tests.ml : ext/ext_pervasives.ml
 bin/all_ounit_tests.ml : ext/hash_set_poly.mli
 bin/all_ounit_tests.ml : ext/string_hashtbl.ml
@@ -82,9 +84,7 @@ bin/all_ounit_tests.ml : ext/ext_pervasives.mli
 bin/all_ounit_tests.ml : ext/string_hash_set.ml
 bin/all_ounit_tests.ml : ext/string_hashtbl.mli
 bin/all_ounit_tests.ml : stubs/bs_hash_stubs.ml
-bin/all_ounit_tests.ml : ext/ext_package_name.ml
 bin/all_ounit_tests.ml : ext/string_hash_set.mli
-bin/all_ounit_tests.ml : ext/ext_package_name.mli
 bin/all_ounit_tests.ml : syntax/ast_utf8_string.ml
 bin/all_ounit_tests.ml : ext/hash_set_ident_mask.ml
 bin/all_ounit_tests.ml : syntax/ast_utf8_string.mli

jscomp/bin/all_ounit_tests.ml

@@ -13593,8 +13593,8 @@ let suites =
         end;
     ]
 end
-module Ext_package_name : sig 
-#1 "ext_package_name.mli"
+module Ext_namespace : sig 
+#1 "ext_namespace.mli"
 (* Copyright (C) 2017- Authors of BuckleScript
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -13620,9 +13620,9 @@ module Ext_package_name : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-val make : pkg:string -> string -> string 
+val make : ns:string -> string -> string 
 
-val remove_package_suffix: string -> string 
+val remove_ns_suffix: string -> string 
 
 (* Note  we have to output uncapitalized file Name, 
   or at least be consistent, since by reading cmi file on Case insensitive OS, we don't really know it is `list.cmi` or `List.cmi`, so that `require (./list.js)` or `require(./List.js)`
@@ -13633,7 +13633,7 @@ val js_name_of_basename :  string -> string
 val namespace_of_package_name : string -> string
 
 end = struct
-#1 "ext_package_name.ml"
+#1 "ext_namespace.ml"
 
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  * 
@@ -13663,25 +13663,25 @@ end = struct
  (* Note the build system should check the validity of filenames
     espeically, it should not contain '-'
  *)
- let package_sep_char = '-'
- let package_sep = "-"
+ let ns_sep_char = '-'
+ let ns_sep = "-"
 
- let make ~pkg cunit  = 
-    cunit ^ package_sep ^ pkg 
+ let make ~ns cunit  = 
+    cunit ^ ns_sep ^ ns
 
 
 let rec rindex_rec s i c =
   if i < 0 then i else
   if String.unsafe_get s i = c then i else rindex_rec s (i - 1) c;;
 
-let remove_package_suffix name =
-    let i = rindex_rec name (String.length name - 1) package_sep_char in 
+let remove_ns_suffix name =
+    let i = rindex_rec name (String.length name - 1) ns_sep_char in 
     if i < 0 then name 
     else String.sub name 0 i 
 
 
 let js_name_of_basename s = 
-  remove_package_suffix (String.uncapitalize s) ^ Literals.suffix_js
+  remove_ns_suffix (String.uncapitalize s) ^ Literals.suffix_js
 
 
 let namespace_of_package_name (s : string) : string = 
@@ -14026,25 +14026,25 @@ let suites =
     end;
 
     __LOC__ >:: begin fun _ ->
-      Ext_package_name.namespace_of_package_name "bs-json"
+      Ext_namespace.namespace_of_package_name "bs-json"
       =~ "BsJson"
     end;
     __LOC__ >:: begin fun _ ->
-      Ext_package_name.namespace_of_package_name
+      Ext_namespace.namespace_of_package_name
         "reason-react"
       =~ "ReasonReact";
-      Ext_package_name.namespace_of_package_name
+      Ext_namespace.namespace_of_package_name
         "reason"
       =~ "Reason"
     end;
     __LOC__ >:: begin fun _ -> 
-      Ext_package_name.js_name_of_basename "a-b"
+      Ext_namespace.js_name_of_basename "a-b"
       =~ "a.js";
-      Ext_package_name.js_name_of_basename "a-"
+      Ext_namespace.js_name_of_basename "a-"
       =~ "a.js";
-      Ext_package_name.js_name_of_basename "a--"
+      Ext_namespace.js_name_of_basename "a--"
       =~ "a-.js";
-      Ext_package_name.js_name_of_basename "AA-b"
+      Ext_namespace.js_name_of_basename "AA-b"
       =~ "aA.js";
     end
   ]

jscomp/bin/bsb.d

@@ -69,6 +69,7 @@ bin/bsb.ml : bsb/bsb_ninja_gen.ml
 bin/bsb.ml : bsb/bsb_templates.ml
 bin/bsb.ml : common/bs_version.ml
 bin/bsb.ml : ext/ext_filename.mli
+bin/bsb.ml : ext/ext_namespace.ml
 bin/bsb.ml : ext/ext_position.mli
 bin/bsb.ml : ext/resize_array.mli
 bin/bsb.ml : bsb/bsb_build_util.ml
@@ -82,6 +83,7 @@ bin/bsb.ml : common/bs_version.mli
 bin/bsb.ml : ext/ext_json_noloc.ml
 bin/bsb.ml : ext/ext_json_parse.ml
 bin/bsb.ml : ext/ext_json_types.ml
+bin/bsb.ml : ext/ext_namespace.mli
 bin/bsb.ml : ext/ext_pervasives.ml
 bin/bsb.ml : ext/string_hashtbl.ml
 bin/bsb.ml : bsb/bsb_build_cache.ml
@@ -103,13 +105,11 @@ bin/bsb.ml : bsb/bsb_config_types.ml
 bin/bsb.ml : bsb/bsb_ninja_regen.mli
 bin/bsb.ml : bsb/bsb_pkg_map_gen.mli
 bin/bsb.ml : bsb/bsb_watcher_gen.mli
-bin/bsb.ml : ext/ext_package_name.ml
 bin/bsb.ml : ext/string_hash_set.mli
 bin/bsb.ml : bsb/bsb_build_schemas.ml
 bin/bsb.ml : bsb/bsb_config_parse.mli
 bin/bsb.ml : bsb/bsb_package_specs.ml
 bin/bsb.ml : bsb/bsb_parse_sources.ml
-bin/bsb.ml : ext/ext_package_name.mli
 bin/bsb.ml : bsb/bsb_package_specs.mli
 bin/bsb.ml : bsb/bsb_parse_sources.mli
 bin/bsb.ml : bsb/bsb_ninja_file_groups.ml

jscomp/bin/bsb.ml

@@ -136,9 +136,9 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "1.8.3"
+let version = "1.9.0"
 let header = 
-   "// Generated by BUCKLESCRIPT VERSION 1.8.3, PLEASE EDIT WITH CARE"  
+   "// Generated by BUCKLESCRIPT VERSION 1.9.0, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
 
 end
@@ -7394,8 +7394,8 @@ let store ~cwd ~file:name file_stamps =
       bsc_version = Bs_version.version }
 
 end
-module Ext_package_name : sig 
-#1 "ext_package_name.mli"
+module Ext_namespace : sig 
+#1 "ext_namespace.mli"
 (* Copyright (C) 2017- Authors of BuckleScript
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -7421,9 +7421,9 @@ module Ext_package_name : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-val make : pkg:string -> string -> string 
+val make : ns:string -> string -> string 
 
-val remove_package_suffix: string -> string 
+val remove_ns_suffix: string -> string 
 
 (* Note  we have to output uncapitalized file Name, 
   or at least be consistent, since by reading cmi file on Case insensitive OS, we don't really know it is `list.cmi` or `List.cmi`, so that `require (./list.js)` or `require(./List.js)`
@@ -7434,7 +7434,7 @@ val js_name_of_basename :  string -> string
 val namespace_of_package_name : string -> string
 
 end = struct
-#1 "ext_package_name.ml"
+#1 "ext_namespace.ml"
 
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  * 
@@ -7464,25 +7464,25 @@ end = struct
  (* Note the build system should check the validity of filenames
     espeically, it should not contain '-'
  *)
- let package_sep_char = '-'
- let package_sep = "-"
+ let ns_sep_char = '-'
+ let ns_sep = "-"
 
- let make ~pkg cunit  = 
-    cunit ^ package_sep ^ pkg 
+ let make ~ns cunit  = 
+    cunit ^ ns_sep ^ ns
 
 
 let rec rindex_rec s i c =
   if i < 0 then i else
   if String.unsafe_get s i = c then i else rindex_rec s (i - 1) c;;
 
-let remove_package_suffix name =
-    let i = rindex_rec name (String.length name - 1) package_sep_char in 
+let remove_ns_suffix name =
+    let i = rindex_rec name (String.length name - 1) ns_sep_char in 
     if i < 0 then name 
     else String.sub name 0 i 
 
 
 let js_name_of_basename s = 
-  remove_package_suffix (String.uncapitalize s) ^ Literals.suffix_js
+  remove_ns_suffix (String.uncapitalize s) ^ Literals.suffix_js
 
 
 let namespace_of_package_name (s : string) : string = 
@@ -7746,7 +7746,7 @@ let get_list_of_output_js
     package_specs output_file_sans_extension = 
   Spec_set.fold (fun format acc ->
       package_output format 
-        ( Ext_package_name.js_name_of_basename output_file_sans_extension)
+        ( Ext_namespace.js_name_of_basename output_file_sans_extension)
       :: acc
     ) package_specs []
 
@@ -11235,7 +11235,7 @@ let interpret_json
         in 
         let namespace =     
           if !namespace then 
-            Some (Ext_package_name.namespace_of_package_name package_name)
+            Some (Ext_namespace.namespace_of_package_name package_name)
           else   None  in  
         {
           package_name ;
@@ -12133,31 +12133,31 @@ let handle_generators oc
 
 
 let make_common_shadows 
-      is_re
-      package_specs 
-      dirname 
-      dir_index 
+    is_re
+    package_specs 
+    dirname 
+    dir_index 
   : Bsb_ninja_util.shadow list 
   =
   let shadows : Bsb_ninja_util.shadow list = 
-  { key = Bsb_ninja_global_vars.bs_package_flags;
-    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.bs_package_includes; 
-       op = AppendVar Bsb_ninja_global_vars.bs_package_dev_includes 
-     }
-      ;
-      { key = "bsc_extra_includes";
-        op = OverwriteVar (Bsb_dir_index.string_of_bsb_dev_include dir_index)
-      }
-  ]
-  )   
+    { key = Bsb_ninja_global_vars.bs_package_flags;
+      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.bs_package_includes; 
+         op = AppendVar Bsb_ninja_global_vars.bs_package_dev_includes 
+       }
+        ;
+        { key = "bsc_extra_includes";
+          op = OverwriteVar (Bsb_dir_index.string_of_bsb_dev_include dir_index)
+        }
+       ]
+    )   
   in 
   if is_re then 
     { key = Bsb_ninja_global_vars.bsc_flags; 
@@ -12186,8 +12186,8 @@ let emit_impl_build
     match namespace with 
     | None -> 
       filename_sans_extension 
-    | Some pkg -> 
-      Ext_package_name.make ~pkg filename_sans_extension
+    | Some ns -> 
+      Ext_namespace.make ~ns filename_sans_extension
   in 
   let file_cmi =  output_filename_sans_extension ^ Literals.suffix_cmi in
   let output_cmj =  output_filename_sans_extension ^ Literals.suffix_cmj in
@@ -12247,28 +12247,28 @@ let emit_intf_build
     namespace
     filename_sans_extension
   : info =
-
-  let input = 
-    Bsb_config.proj_rel 
-      (if is_re then filename_sans_extension ^ Literals.suffix_rei 
-       else filename_sans_extension ^ Literals.suffix_mli) in
   let output_mliast = filename_sans_extension ^ Literals.suffix_mliast in
   let output_mliastd = filename_sans_extension ^ Literals.suffix_mliastd in
   let output_filename_sans_extension = 
     match namespace with 
     | None -> 
       filename_sans_extension 
-    | Some pkg -> 
-      Ext_package_name.make ~pkg filename_sans_extension
+    | Some ns -> 
+      Ext_namespace.make ~ns filename_sans_extension
   in 
-  let output_cmi = output_filename_sans_extension ^ Literals.suffix_cmi in
+  let output_cmi = output_filename_sans_extension ^ Literals.suffix_cmi in  
   let common_shadows = 
     make_common_shadows is_re package_specs
       (Filename.dirname output_cmi)
       group_dir_index in
   Bsb_ninja_util.output_build oc
     ~output:output_mliast
-    ~input
+      (* TODO: we can get rid of absloute path if we fixed the location to be 
+          [lib/bs], better for testing?
+      *)
+    ~input:(Bsb_config.proj_rel 
+              (if is_re then filename_sans_extension ^ Literals.suffix_rei 
+               else filename_sans_extension ^ Literals.suffix_mli))
     ~rule:(if is_re then Bsb_rule.build_ast_and_module_sets_from_rei
            else Bsb_rule.build_ast_and_module_sets);
   Bsb_ninja_util.output_build oc
@@ -13102,7 +13102,7 @@ let install_targets cwd (config : Bsb_config_types.t option) =
     let x = 
       match namespace with 
       | None -> x 
-      | Some pkg -> Ext_package_name.make ~pkg x in 
+      | Some ns -> Ext_namespace.make ~ns x in 
     install ~destdir (cwd // x ^  Literals.suffix_ml) ;
     install ~destdir (cwd // x ^  Literals.suffix_re) ;
     install ~destdir (cwd // x ^ Literals.suffix_mli) ;

jscomp/bin/bsb_helper.d

@@ -16,7 +16,9 @@ bin/bsb_helper.ml : ext/string_set.mli
 bin/bsb_helper.ml : ext/ext_filename.ml
 bin/bsb_helper.ml : bsb/bsb_dir_index.ml
 bin/bsb_helper.ml : ext/ext_filename.mli
+bin/bsb_helper.ml : ext/ext_namespace.ml
 bin/bsb_helper.ml : bsb/bsb_dir_index.mli
+bin/bsb_helper.ml : ext/ext_namespace.mli
 bin/bsb_helper.ml : ext/ext_pervasives.ml
 bin/bsb_helper.ml : ext/string_hashtbl.ml
 bin/bsb_helper.ml : bsb/bsb_build_cache.ml
@@ -28,10 +30,8 @@ bin/bsb_helper.ml : stubs/bs_hash_stubs.ml
 bin/bsb_helper.ml : bsb/bsb_build_cache.mli
 bin/bsb_helper.ml : bsb/bsb_depfile_gen.mli
 bin/bsb_helper.ml : bsb/bsb_helper_main.mli
-bin/bsb_helper.ml : ext/ext_package_name.ml
 bin/bsb_helper.ml : bsb/bsb_helper_linker.ml
 bin/bsb_helper.ml : bsb/bsb_helper_packer.ml
-bin/bsb_helper.ml : ext/ext_package_name.mli
 bin/bsb_helper.ml : bsb/bsb_helper_extract.ml
 bin/bsb_helper.ml : bsb/bsb_helper_linker.mli
 bin/bsb_helper.ml : bsb/bsb_helper_packer.mli