match ls_dir (pool ()) with
| None -> logger `Error ("Unable to list directory " ^ pool ())
| Some l ->
- List.iter
- (fun name ->
- let root =
- try
- Some (HExtlib.input_file (pool () ^ name ^ rootfile))
- with Unix.Unix_error _ ->
- logger `Warning ("Malformed development " ^ name);
- None
- in
- match root with
- | None -> ()
- | Some root ->
- developments := {root = root ; name = name} :: !developments;
- let inc = Helm_registry.get_list
- Helm_registry.string "matita.includes" in
- Helm_registry.set_list Helm_registry.of_string
- ~key:"matita.includes" ~value:(inc @ [root])
- )
- l
+ let paths =
+ List.fold_left
+ (fun acc name ->
+ let root =
+ try
+ Some (HExtlib.input_file (pool () ^ name ^ rootfile))
+ with Unix.Unix_error _ ->
+ logger `Warning ("Malformed development " ^ name);
+ None
+ in
+ match root with
+ | None -> acc
+ | Some root ->
+ developments := {root = root ; name = name} :: !developments;
+ root::acc)
+ [] l
+ in
+ let inc = Helm_registry.get_list Helm_registry.string "matita.includes" in
+ Helm_registry.set_list Helm_registry.of_string
+ ~key:"matita.includes" ~value:(inc @ paths)
(* finds the makefile path for development devel *)
let makefile_for_development devel =
| None -> (try Sys.getenv "MATITA_FLAGS" with Not_found -> "")
| Some s -> s
in
- already_defined ^
- if Helm_registry.get_bool "matita.bench" then "-bench" else ""
+ let bench =
+ if Helm_registry.get_bool "matita.bench" then " -bench" else ""
+ in
+ let system =
+ if Helm_registry.get_bool "matita.system" then " -system" else ""
+ in
+ let noinnertypes =
+ if Helm_registry.get_bool "matita.noinnertypes" then " -noinnertypes" else ""
+ in
+ already_defined ^ bench ^ system ^ noinnertypes
in
let csc = try ["SRC=" ^ Sys.getenv "SRC"] with Not_found -> [] in
rebuild_makefile development;
let flags = [] in
let flags =
try
- flags @ [ sprintf "MATITA_FLAGS=\"%s\"" matita_flags ]
+ flags @ [ sprintf "MATITA_FLAGS=%s" matita_flags ]
with Not_found -> flags in
let flags = flags @ csc in
let args =
let orig_matita_flags =
try Sys.getenv "MATITA_FLAGS" with Not_found -> ""
in
- "\"" ^ orig_matita_flags ^ "\"", "\"" ^ orig_matita_flags ^ " -system\""
+ orig_matita_flags, orig_matita_flags ^ " -system"
in
HLog.message "cleaning the development before publishing";
if clean ~matita_flags devel then