Add a way to customize obj dir for executables
Use this function to simplify the obj dir for the utop runner
This commit is contained in:
parent
b4e0c04368
commit
1cb005bb50
15
src/exe.ml
15
src/exe.ml
|
@ -112,6 +112,7 @@ let link_exe
|
||||||
SC.add_rules sctx (List.map rules ~f:(fun r -> libs_and_cm_and_flags >>> r))
|
SC.add_rules sctx (List.map rules ~f:(fun r -> libs_and_cm_and_flags >>> r))
|
||||||
|
|
||||||
let build_and_link_many
|
let build_and_link_many
|
||||||
|
?obj_dir
|
||||||
~loc ~dir ~programs ~modules
|
~loc ~dir ~programs ~modules
|
||||||
~scope
|
~scope
|
||||||
~linkages
|
~linkages
|
||||||
|
@ -127,9 +128,13 @@ let build_and_link_many
|
||||||
sctx
|
sctx
|
||||||
=
|
=
|
||||||
let item = (List.hd programs).Program.name in
|
let item = (List.hd programs).Program.name in
|
||||||
(* Use "eobjs" rather than "objs" to avoid a potential conflict with a library of the
|
let obj_dir =
|
||||||
same name *)
|
match obj_dir with
|
||||||
let obj_dir = Path.relative dir ("." ^ item ^ ".eobjs") in
|
(* Use "eobjs" rather than "objs" to avoid a potential conflict with a
|
||||||
|
library of the same name *)
|
||||||
|
| None -> Path.relative dir ("." ^ item ^ ".eobjs")
|
||||||
|
| Some d -> d
|
||||||
|
in
|
||||||
let dep_kind = Build.Required in
|
let dep_kind = Build.Required in
|
||||||
let modules =
|
let modules =
|
||||||
String_map.map modules ~f:(Module.set_obj_name ~wrapper:None)
|
String_map.map modules ~f:(Module.set_obj_name ~wrapper:None)
|
||||||
|
@ -193,5 +198,5 @@ let build_and_link_many
|
||||||
|
|
||||||
(obj_dir, real_requires)
|
(obj_dir, real_requires)
|
||||||
|
|
||||||
let build_and_link ~loc ~dir ~program =
|
let build_and_link ?obj_dir ~loc ~dir ~program =
|
||||||
build_and_link_many ~loc ~dir ~programs:[program]
|
build_and_link_many ?obj_dir ~loc ~dir ~programs:[program]
|
||||||
|
|
|
@ -38,7 +38,8 @@ end
|
||||||
directory and the resolved list of library dependencies. *)
|
directory and the resolved list of library dependencies. *)
|
||||||
|
|
||||||
val build_and_link
|
val build_and_link
|
||||||
: loc:Loc.t
|
: ?obj_dir:Path.t
|
||||||
|
-> loc:Loc.t
|
||||||
-> dir:Path.t
|
-> dir:Path.t
|
||||||
-> program:Program.t
|
-> program:Program.t
|
||||||
-> modules:Module.t String_map.t
|
-> modules:Module.t String_map.t
|
||||||
|
@ -57,7 +58,8 @@ val build_and_link
|
||||||
-> Path.t * (unit, Lib.t list) Build.t
|
-> Path.t * (unit, Lib.t list) Build.t
|
||||||
|
|
||||||
val build_and_link_many
|
val build_and_link_many
|
||||||
: loc:Loc.t
|
: ?obj_dir:Path.t
|
||||||
|
-> loc:Loc.t
|
||||||
-> dir:Path.t
|
-> dir:Path.t
|
||||||
-> programs:Program.t list
|
-> programs:Program.t list
|
||||||
-> modules:Module.t String_map.t
|
-> modules:Module.t String_map.t
|
||||||
|
|
|
@ -66,6 +66,7 @@ let setup sctx ~dir ~(libs : Library.t list) ~scope =
|
||||||
let _obj_dir, libs =
|
let _obj_dir, libs =
|
||||||
Exe.build_and_link sctx
|
Exe.build_and_link sctx
|
||||||
~loc
|
~loc
|
||||||
|
~obj_dir:utop_exe_dir
|
||||||
~dir:utop_exe_dir
|
~dir:utop_exe_dir
|
||||||
~program:{ name = exe_name ; main_module_name }
|
~program:{ name = exe_name ; main_module_name }
|
||||||
~modules
|
~modules
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
ocamldep forutop/.utop/utop.ml.d
|
ocamldep forutop/.utop/utop.ml.d
|
||||||
ocamldep forutop/forutop.ml.d
|
ocamldep forutop/forutop.ml.d
|
||||||
ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}
|
ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}
|
||||||
ocamlc forutop/.utop/.utop.eobjs/utop.{cmi,cmo,cmt}
|
ocamlc forutop/.utop/utop.{cmi,cmo,cmt}
|
||||||
ocamlc forutop/forutop.cma
|
ocamlc forutop/forutop.cma
|
||||||
ocamlc forutop/.utop/utop.exe
|
ocamlc forutop/.utop/utop.exe
|
||||||
hello in utop
|
hello in utop
|
||||||
|
|
Loading…
Reference in New Issue