Merge remote-tracking branch 'upstream/trunk' into trunk

4 files changed, 10 insertions, 15 deletions

diff --git a/lib/coqProject_file.ml4 b/lib/coqProject_file.ml4
index 7a16605695..97aa90e07d 100644
--- a/lib/coqProject_file.ml4
+++ b/lib/coqProject_file.ml4
@@ -11,6 +11,7 @@ type project = {
   makefile : string option;
   install_kind  : install option;
   use_ocamlopt : bool;
+  bypass_API : bool;
 
   v_files : string list;
   mli_files : string list;
@@ -42,11 +43,12 @@ and install =
   | UserInstall
 
 (* TODO generate with PPX *)
-let mk_project project_file makefile install_kind use_ocamlopt = {
+let mk_project project_file makefile install_kind use_ocamlopt bypass_API = {
   project_file;
   makefile;
   install_kind;
   use_ocamlopt;
+  bypass_API;
 
   v_files = [];
   mli_files = [];
@@ -166,6 +168,8 @@ let process_cmd_line orig_dir proj args =
     aux { proj with defs = proj.defs @ [v,def] } r
   | "-arg" :: a :: r ->
     aux { proj with extra_args = proj.extra_args @ [a] } r
+  | "-bypass-API" :: r ->
+    aux { proj with bypass_API = true } r
   | f :: r ->
       let f = CUnix.correct_path f orig_dir in
       let proj =
@@ -185,11 +189,11 @@ let process_cmd_line orig_dir proj args =
  (******************************* API ************************************)
 
 let cmdline_args_to_project ~curdir args =
-  process_cmd_line curdir (mk_project None None None true) args
+  process_cmd_line curdir (mk_project None None None true false) args
 
 let read_project_file f =
   process_cmd_line (Filename.dirname f)
-    (mk_project (Some f) None (Some NoInstall) true) (parse f)
+    (mk_project (Some f) None (Some NoInstall) true false) (parse f)
 
 let rec find_project_file ~from ~projfile_name =
   let fname = Filename.concat from projfile_name in
diff --git a/lib/coqProject_file.mli b/lib/coqProject_file.mli
index 8c8fc068a3..19fc9227ae 100644
--- a/lib/coqProject_file.mli
+++ b/lib/coqProject_file.mli
@@ -13,6 +13,7 @@ type project = {
   makefile : string option;
   install_kind  : install option;
   use_ocamlopt : bool;
+  bypass_API : bool;
 
   v_files : string list;
   mli_files : string list;
diff --git a/lib/envars.ml b/lib/envars.ml
index 2f76183eb3..47baf66a69 100644
--- a/lib/envars.ml
+++ b/lib/envars.ml
@@ -202,14 +202,7 @@ let xdg_dirs ~warn =
 
 (* Print the configuration information *)
 
-let coq_src_subdirs = [ 
-   "config" ; "dev" ; "lib" ; "kernel" ; "library" ;
-   "engine" ; "pretyping" ; "interp" ; "parsing" ; "proofs" ;
-   "tactics" ; "toplevel" ; "printing" ; "intf" ;
-   "grammar" ; "ide" ; "stm"; "vernac" ; "API" ] @
-   Coq_config.plugins_dirs
-  
-let print_config ?(prefix_var_name="") f =
+let print_config ?(prefix_var_name="") f coq_src_subdirs =
   let open Printf in 
   fprintf f "%sLOCAL=%s\n" prefix_var_name (if Coq_config.local then "1" else "0");
   fprintf f "%sCOQLIB=%s/\n" prefix_var_name (coqlib ());
diff --git a/lib/envars.mli b/lib/envars.mli
index c8bbf17d96..edd13447fc 100644
--- a/lib/envars.mli
+++ b/lib/envars.mli
@@ -76,7 +76,4 @@ val xdg_data_dirs   : (string -> unit) -> string list
 val xdg_dirs : warn : (string -> unit) -> string list
 
 (** {6 Prints the configuration information } *)
-val print_config : ?prefix_var_name:string -> out_channel -> unit
-
-(** Directories in which coq sources are found *)
-val coq_src_subdirs : string list
+val print_config : ?prefix_var_name:string -> out_channel -> string list -> unit