Merge pull request #1206 from bloomberg/rename_use_stdlib

better error message when package not found

Author: bobzhang

docs/docson/build-schema.json

@@ -280,7 +280,7 @@
         },
         "use-stdlib" : {
             "type" : "boolean",
-            "description": "default true(Set use OCaml stdlib or not)"
+            "description": "(experimental currently)default true(Set use OCaml stdlib or not)"
         }
     },
     "additionalProperties": false,

jscomp/Makefile

@@ -251,8 +251,12 @@ 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_dir bsb_ninja \
+BSB_SRCS= bsb_config \
+	bsb_exception\
+	bsb_build_schemas \
+	bsb_build_util \
+	bsb_dir \
+	bsb_ninja \
 	bsb_build_ui \
 	bsb_default\
 	bsb_dep_infos\

jscomp/all.depend

@@ -652,8 +652,8 @@ bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
     bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_build_ui.cmi
 bsb/bsb_build_util.cmx : ext/literals.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_schemas.cmx common/bs_pkg.cmx \
-    bsb/bsb_build_util.cmi
+    bsb/bsb_exception.cmx bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx \
+    common/bs_pkg.cmx bsb/bsb_build_util.cmi
 bsb/bsb_config.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
     ext/ext_filename.cmx bsb/bsb_config.cmi
 bsb/bsb_config_parse.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
@@ -664,12 +664,14 @@ bsb/bsb_config_parse.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
 bsb/bsb_config_types.cmx : ext/string_hash_set.cmx bsb/bsb_config.cmx \
     bsb/bsb_build_ui.cmx
 bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx \
-    ext/ext_pervasives.cmx ext/ext_filename.cmx bsb/bsb_config_types.cmx \
+    ext/ext_filename.cmx bsb/bsb_exception.cmx bsb/bsb_config_types.cmx \
     bsb/bsb_config.cmx bsb/bsb_build_util.cmx common/bs_version.cmx \
     common/bs_pkg.cmx bsb/bsb_default.cmi
 bsb/bsb_dep_infos.cmx : ext/ext_string.cmx common/bs_version.cmx \
     bsb/bsb_dep_infos.cmi
 bsb/bsb_dir.cmx : bsb/bsb_dir.cmi
+bsb/bsb_exception.cmx : ext/ext_string.cmx common/bs_version.cmx \
+    bsb/bsb_exception.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_types.cmx \
@@ -699,6 +701,7 @@ bsb/bsb_default.cmi : ext/ext_json.cmi bsb/bsb_config_types.cmx \
     bsb/bsb_config.cmi
 bsb/bsb_dep_infos.cmi :
 bsb/bsb_dir.cmi :
+bsb/bsb_exception.cmi :
 bsb/bsb_file.cmi :
 bsb/bsb_gen.cmi : bsb/bsb_config_types.cmx
 bsb/bsb_helper_main.cmi :

jscomp/bin/bsb.d

@@ -49,11 +49,13 @@ bin/bsb.ml : ext/hash_set_gen.ml
 bin/bsb.ml : ext/resize_array.ml
 bin/bsb.ml : bsb/bsb_build_ui.mli
 bin/bsb.ml : bsb/bsb_dep_infos.ml
+bin/bsb.ml : bsb/bsb_exception.ml
 bin/bsb.ml : common/bs_version.ml
 bin/bsb.ml : ext/ext_filename.mli
 bin/bsb.ml : ext/resize_array.mli
 bin/bsb.ml : bsb/bsb_build_util.ml
 bin/bsb.ml : bsb/bsb_dep_infos.mli
+bin/bsb.ml : bsb/bsb_exception.mli
 bin/bsb.ml : common/bs_version.mli
 bin/bsb.ml : ext/ext_pervasives.ml
 bin/bsb.ml : bsb/bsb_build_util.mli

jscomp/bin/bsb.ml

@@ -2721,6 +2721,163 @@ let package_output ~format:s output=
 
 
 
+end
+module Bs_version : sig 
+#1 "bs_version.mli"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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. *)
+
+val version : string
+
+val header : string 
+
+val package_name : string
+end = struct
+#1 "bs_version.ml"
+
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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.4.3"
+let header = 
+   "// Generated by BUCKLESCRIPT VERSION 1.4.3, PLEASE EDIT WITH CARE"  
+let package_name = "bs-platform"   
+    
+end
+module Bsb_exception : sig 
+#1 "bsb_exception.mli"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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. *)
+
+
+
+type error = 
+    | Package_not_found of string * string option (* json file *)
+
+
+val error : error -> 'a
+end = struct
+#1 "bsb_exception.ml"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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. *)
+
+
+
+type error = 
+    | Package_not_found of string * string option (* json file *)
+
+
+exception Error of error 
+
+let error err = raise (Error err)
+
+let to_string (x : error) = 
+    match x with     
+    | Package_not_found (name,json_opt) -> 
+        let in_json = match json_opt with None -> Ext_string.empty | Some x -> " in " ^ x in 
+        if Ext_string.equal name Bs_version.package_name then 
+            Printf.sprintf "Package bs-platform is not found %s , it is the basic package required, if you have it installed globally\n\
+            Please run 'npm link bs-platform' to make it available " in_json
+        else 
+        Printf.sprintf 
+            "BuckleScript package %s not found or built %s, if it is not built\n\
+            Please run 'bsb -make-world', otherwise please install it " name in_json
+
+let () = 
+    Printexc.register_printer (fun x ->
+        match x with 
+        | Error x -> 
+            Some (to_string x )
+        | _ -> None
+     )
+
+
+
+
+
 end
 module Ext_array : sig 
 #1 "ext_array.mli"
@@ -5173,7 +5330,8 @@ let rec walk_all_deps top dir cb =
           begin match js with
           | `Str {Ext_json.str = new_package} ->
             begin match Bs_pkg.resolve_bs_package ~cwd:dir new_package with
-            | None -> failwith (new_package ^ " not found as dependency of " ^ bsconfig_json )
+            | None -> 
+              Bsb_exception.error (Bsb_exception.Package_not_found (new_package, Some bsconfig_json))
             | Some package_dir  ->
               walk_all_deps  false package_dir cb  ;
             end;
@@ -7134,69 +7292,6 @@ type t =
     files_to_install : String_hash_set.t ;
     generate_merlin : bool ; 
   }
-end
-module Bs_version : sig 
-#1 "bs_version.mli"
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * 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. *)
-
-val version : string
-
-val header : string 
-
-val package_name : string
-end = struct
-#1 "bs_version.ml"
-
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * 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.4.3"
-let header = 
-   "// Generated by BUCKLESCRIPT VERSION 1.4.3, PLEASE EDIT WITH CARE"  
-let package_name = "bs-platform"   
-    
 end
 module Bsb_default : sig 
 #1 "bsb_default.mli"
@@ -7348,7 +7443,7 @@ let resolve_package cwd  package_name =
 
   match Bs_pkg.resolve_bs_package ~cwd package_name  with 
   | None -> 
-    Ext_pervasives.failwithf ~loc:__LOC__"package: %s not found when resolve bs-dependencies" package_name
+    Bsb_exception.error (Package_not_found (package_name,None))
   | Some x -> 
     {
       Bsb_config_types.package_name ;

jscomp/bsb/bsb_build_util.ml

@@ -156,7 +156,8 @@ let rec walk_all_deps top dir cb =
           begin match js with
           | `Str {Ext_json.str = new_package} ->
             begin match Bs_pkg.resolve_bs_package ~cwd:dir new_package with
-            | None -> failwith (new_package ^ " not found as dependency of " ^ bsconfig_json )
+            | None -> 
+              Bsb_exception.error (Bsb_exception.Package_not_found (new_package, Some bsconfig_json))
             | Some package_dir  ->
               walk_all_deps  false package_dir cb  ;
             end;

jscomp/bsb/bsb_default.ml

@@ -72,7 +72,7 @@ let resolve_package cwd  package_name =
 
   match Bs_pkg.resolve_bs_package ~cwd package_name  with 
   | None -> 
-    Ext_pervasives.failwithf ~loc:__LOC__"package: %s not found when resolve bs-dependencies" package_name
+    Bsb_exception.error (Package_not_found (package_name,None))
   | Some x -> 
     {
       Bsb_config_types.package_name ;