matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

114.20+69

This commit is contained in:
Jeremie Dimino 2016-12-16 10:58:59 +00:00
parent 405971694c
commit 09503447b9
4 changed files with 118 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/gen_rules.ml
View File

@ -14,10 +14,33 @@ let g () =
else else
[] []
let ocaml_compile_flags () = module Ocaml_flags = struct
Arg_spec.As ("-w" :: !Clflags.warnings :: g ()) let default_ocamlc_flags = g ()
let default_ocamlopt_flags = g ()
let g () = Arg_spec.As (g ()) let default_flags = [ "-w"; !Clflags.warnings ]
type t =
{ common : string list
; specific : string list Mode.Dict.t
}
let make ~flags ~ocamlc_flags ~ocamlopt_flags =
let eval = Ordered_set_lang.eval_with_standard in
{ common = eval flags ~standard:default_flags
; specific =
{ byte = eval ocamlc_flags ~standard:default_ocamlc_flags
; native = eval ocamlopt_flags ~standard:default_ocamlopt_flags
}
}
let get t mode = Arg_spec.As (t.common @ Mode.Dict.get t.specific mode)
let get_for_cm t ~cm_kind = get t (Mode.of_cm_kind cm_kind)
end
let default_c_flags = g ()
let default_cxx_flags = g ()
let cm_files modules ~dir ~cm_kind = let cm_files modules ~dir ~cm_kind =
List.map modules ~f:(fun (m : Module.t) -> Module.cm_file m ~dir cm_kind) List.map modules ~f:(fun (m : Module.t) -> Module.cm_file m ~dir cm_kind)
@ -617,7 +640,7 @@ module Gen(P : Params) = struct
| Cmx -> | Cmx ->
[lib_cm_all ~dir lib Cmx]) [lib_cm_all ~dir lib Cmx])
let build_cm ?(flags=Arg_spec.S[]) ~cm_kind ~dep_graph ~requires let build_cm ~flags ~cm_kind ~dep_graph ~requires
~(modules : Module.t String_map.t) ~dir ~alias_module (m : Module.t) = ~(modules : Module.t String_map.t) ~dir ~alias_module (m : Module.t) =
Option.iter (Cm_kind.compiler cm_kind ctx) ~f:(fun compiler -> Option.iter (Cm_kind.compiler cm_kind ctx) ~f:(fun compiler ->
Option.iter (Module.cm_source ~dir m cm_kind) ~f:(fun src -> Option.iter (Module.cm_source ~dir m cm_kind) ~f:(fun src ->
@ -678,10 +701,9 @@ module Gen(P : Params) = struct
Build.dyn_paths (Build.arr (lib_dependencies ~cm_kind)) >>> Build.dyn_paths (Build.arr (lib_dependencies ~cm_kind)) >>>
Build.run (Dep compiler) Build.run (Dep compiler)
~extra_targets ~extra_targets
[ ocaml_compile_flags () [ Ocaml_flags.get_for_cm flags ~cm_kind
; cmt_args ; cmt_args
; Dyn Lib.include_flags ; Dyn Lib.include_flags
; flags
; As extra_args ; As extra_args
; A "-no-alias-deps" ; A "-no-alias-deps"
; A "-I"; Path dir ; A "-I"; Path dir
@ -692,17 +714,17 @@ module Gen(P : Params) = struct
; A "-c"; Ml_kind.flag ml_kind; Dep src ; A "-c"; Ml_kind.flag ml_kind; Dep src
]))) ])))
let build_module ?flags m ~dir ~dep_graph ~modules ~requires ~alias_module = let build_module ~flags m ~dir ~dep_graph ~modules ~requires ~alias_module =
List.iter Cm_kind.all ~f:(fun cm_kind -> List.iter Cm_kind.all ~f:(fun cm_kind ->
build_cm ?flags ~dir ~dep_graph ~modules m ~cm_kind ~requires ~alias_module) build_cm ~flags ~dir ~dep_graph ~modules m ~cm_kind ~requires ~alias_module)
let build_modules ~dir ~dep_graph ~modules ~requires ~alias_module = let build_modules ~flags ~dir ~dep_graph ~modules ~requires ~alias_module =
String_map.iter String_map.iter
(match alias_module with (match alias_module with
| None -> modules | None -> modules
| Some (m : Module.t) -> String_map.remove m.name modules) | Some (m : Module.t) -> String_map.remove m.name modules)
~f:(fun ~key:_ ~data:m -> ~f:(fun ~key:_ ~data:m ->
build_module m ~dir ~dep_graph ~modules ~requires ~alias_module) build_module m ~flags ~dir ~dep_graph ~modules ~requires ~alias_module)
(* +-----------------------------------------------------------------+ (* +-----------------------------------------------------------------+
| Interpretation of [modules] fields | | Interpretation of [modules] fields |
@ -737,7 +759,7 @@ module Gen(P : Params) = struct
let dll (lib : Library.t) ~dir = let dll (lib : Library.t) ~dir =
Path.relative dir (sprintf "dll%s_stubs%s" lib.name ctx.ext_dll) Path.relative dir (sprintf "dll%s_stubs%s" lib.name ctx.ext_dll)
let build_lib (lib : Library.t) ~dir ~mode ~modules ~dep_graph = let build_lib (lib : Library.t) ~flags ~dir ~mode ~modules ~dep_graph =
Option.iter (Mode.compiler mode ctx) ~f:(fun compiler -> Option.iter (Mode.compiler mode ctx) ~f:(fun compiler ->
let target = lib_archive lib ~dir ~ext:(Mode.compiled_lib_ext mode) in let target = lib_archive lib ~dir ~ext:(Mode.compiled_lib_ext mode) in
let dep_graph = Ml_kind.Dict.get dep_graph Impl in let dep_graph = Ml_kind.Dict.get dep_graph Impl in
@ -767,7 +789,7 @@ module Gen(P : Params) = struct
match mode with match mode with
| Byte -> [] | Byte -> []
| Native -> [lib_archive lib ~dir ~ext:ctx.ext_lib]) | Native -> [lib_archive lib ~dir ~ext:ctx.ext_lib])
[ g () [ Ocaml_flags.get flags mode
; A "-a"; A "-o"; Target target ; A "-a"; A "-o"; Target target
; As stubs_flags ; As stubs_flags
; Dyn (fun (_, cclibs) -> ; Dyn (fun (_, cclibs) ->
@ -797,7 +819,7 @@ module Gen(P : Params) = struct
(Build.paths h_files (Build.paths h_files
>>> >>>
Build.fanout Build.fanout
(expand_and_eval_set ~dir lib.c_flags ~standard:[]) (expand_and_eval_set ~dir lib.c_flags ~standard:default_c_flags)
requires requires
>>> >>>
Build.run Build.run
@ -805,7 +827,7 @@ module Gen(P : Params) = struct
the current directory *) the current directory *)
~dir ~dir
(Dep ctx.ocamlc) (Dep ctx.ocamlc)
[ g () [ As (g ())
; expand_includes ~dir lib.includes ; expand_includes ~dir lib.includes
; Dyn (fun (c_flags, libs) -> ; Dyn (fun (c_flags, libs) ->
S [ Lib.c_include_flags libs S [ Lib.c_include_flags libs
@ -823,7 +845,7 @@ module Gen(P : Params) = struct
(Build.paths h_files (Build.paths h_files
>>> >>>
Build.fanout Build.fanout
(expand_and_eval_set ~dir lib.cxx_flags ~standard:cxx_flags) (expand_and_eval_set ~dir lib.cxx_flags ~standard:default_cxx_flags)
requires requires
>>> >>>
Build.run Build.run
@ -831,12 +853,12 @@ module Gen(P : Params) = struct
the current directory *) the current directory *)
~dir ~dir
(Dep cxx_compiler) (Dep cxx_compiler)
[ g () [ S [A "-I"; Path ctx.stdlib_dir]
; S [A "-I"; Path ctx.stdlib_dir]
; expand_includes ~dir lib.includes ; expand_includes ~dir lib.includes
; Dyn (fun (c_flags, libs) -> ; As cxx_flags
; Dyn (fun (cxx_flags, libs) ->
S [ Lib.c_include_flags libs S [ Lib.c_include_flags libs
; As c_flags ; As cxx_flags
]) ])
; A "-o"; Target dst ; A "-o"; Target dst
; A "-c"; Dep src ; A "-c"; Dep src
@ -848,6 +870,12 @@ module Gen(P : Params) = struct
let library_rules (lib : Library.t) ~dir ~all_modules ~files = let library_rules (lib : Library.t) ~dir ~all_modules ~files =
let dep_kind = if lib.optional then Build.Optional else Required in let dep_kind = if lib.optional then Build.Optional else Required in
let flags =
Ocaml_flags.make
~flags:lib.flags
~ocamlc_flags:lib.ocamlc_flags
~ocamlopt_flags:lib.ocamlopt_flags
in
let modules = parse_modules ~dir ~all_modules ~modules_written_by_user:lib.modules in let modules = parse_modules ~dir ~all_modules ~modules_written_by_user:lib.modules in
let main_module_name = String.capitalize_ascii lib.name in let main_module_name = String.capitalize_ascii lib.name in
let modules = let modules =
@ -913,10 +941,10 @@ module Gen(P : Params) = struct
~libraries:lib.libraries ~libraries:lib.libraries
~ppx_runtime_libraries:lib.ppx_runtime_libraries; ~ppx_runtime_libraries:lib.ppx_runtime_libraries;
build_modules ~dir ~dep_graph ~modules ~requires ~alias_module; build_modules ~flags ~dir ~dep_graph ~modules ~requires ~alias_module;
Option.iter alias_module ~f:(fun m -> Option.iter alias_module ~f:(fun m ->
build_module m build_module m
~flags:(As ["-w"; "-49"]) ~flags:{ flags with common = "-w" :: "-49" :: flags.common }
~dir ~dir
~modules:(String_map.singleton m.name m) ~modules:(String_map.singleton m.name m)
~dep_graph:(Ml_kind.Dict.make_both (Build.return (String_map.singleton m.name []))) ~dep_graph:(Ml_kind.Dict.make_both (Build.return (String_map.singleton m.name [])))
@ -951,7 +979,7 @@ module Gen(P : Params) = struct
Build.run Build.run
~extra_targets:targets ~extra_targets:targets
(Dep ctx.ocamlmklib) (Dep ctx.ocamlmklib)
[ g () [ As (g ())
; A "-o" ; A "-o"
; Path (Path.relative dir (sprintf "%s_stubs" lib.name)) ; Path (Path.relative dir (sprintf "%s_stubs" lib.name))
; Deps o_files ; Deps o_files
@ -963,7 +991,7 @@ module Gen(P : Params) = struct
List.iter Cm_kind.all ~f:(mk_lib_cm_all lib ~dir ~modules); List.iter Cm_kind.all ~f:(mk_lib_cm_all lib ~dir ~modules);
List.iter Mode.all ~f:(fun mode -> List.iter Mode.all ~f:(fun mode ->
build_lib lib ~dir ~mode ~modules ~dep_graph); build_lib lib ~flags ~dir ~mode ~modules ~dep_graph);
Option.iter ctx.ocamlopt ~f:(fun ocamlopt -> Option.iter ctx.ocamlopt ~f:(fun ocamlopt ->
let src = lib_archive lib ~dir ~ext:(Mode.compiled_lib_ext Native) in let src = lib_archive lib ~dir ~ext:(Mode.compiled_lib_ext Native) in
@ -971,7 +999,7 @@ module Gen(P : Params) = struct
add_rule add_rule
(Build.run (Build.run
(Dep ocamlopt) (Dep ocamlopt)
[ g () [ Ocaml_flags.get flags Native
; A "-shared"; A "-linkall" ; A "-shared"; A "-linkall"
; A "-I"; Path dir ; A "-I"; Path dir
; A "-o"; Target dst ; A "-o"; Target dst
@ -994,7 +1022,7 @@ module Gen(P : Params) = struct
| Executables stuff | | Executables stuff |
+-----------------------------------------------------------------+ *) +-----------------------------------------------------------------+ *)
let build_exe ~dir ~requires ~name ~mode ~modules ~dep_graph ~link_flags = let build_exe ~flags ~dir ~requires ~name ~mode ~modules ~dep_graph ~link_flags =
Option.iter (Mode.compiler mode ctx) ~f:(fun compiler -> Option.iter (Mode.compiler mode ctx) ~f:(fun compiler ->
let dep_graph = Ml_kind.Dict.get dep_graph Impl in let dep_graph = Ml_kind.Dict.get dep_graph Impl in
let exe = Path.relative dir (name ^ Mode.exe_ext mode) in let exe = Path.relative dir (name ^ Mode.exe_ext mode) in
@ -1013,7 +1041,7 @@ module Gen(P : Params) = struct
>>> >>>
Build.run Build.run
(Dep compiler) (Dep compiler)
[ g () [ Ocaml_flags.get flags mode
; A "-o"; Target exe ; A "-o"; Target exe
; As link_flags ; As link_flags
; Dyn (fun (libs, _) -> Lib.link_flags libs ~mode) ; Dyn (fun (libs, _) -> Lib.link_flags libs ~mode)
@ -1022,6 +1050,12 @@ module Gen(P : Params) = struct
let executables_rules (exes : Executables.t) ~dir ~all_modules = let executables_rules (exes : Executables.t) ~dir ~all_modules =
let dep_kind = Build.Required in let dep_kind = Build.Required in
let flags =
Ocaml_flags.make
~flags:exes.flags
~ocamlc_flags:exes.ocamlc_flags
~ocamlopt_flags:exes.ocamlopt_flags
in
let modules = parse_modules ~dir ~all_modules ~modules_written_by_user:exes.modules in let modules = parse_modules ~dir ~all_modules ~modules_written_by_user:exes.modules in
let modules = let modules =
String_map.map modules ~f:(fun (m : Module.t) -> String_map.map modules ~f:(fun (m : Module.t) ->
@ -1046,12 +1080,12 @@ module Gen(P : Params) = struct
~virtual_deps:[] ~virtual_deps:[]
in in
build_modules ~dir ~dep_graph ~modules ~requires ~alias_module:None; build_modules ~flags ~dir ~dep_graph ~modules ~requires ~alias_module:None;
if exes.link_executables then if exes.link_executables then
List.iter exes.names ~f:(fun name -> List.iter exes.names ~f:(fun name ->
List.iter Mode.all ~f:(fun mode -> List.iter Mode.all ~f:(fun mode ->
build_exe ~dir ~requires ~name ~mode ~modules ~dep_graph build_exe ~flags ~dir ~requires ~name ~mode ~modules ~dep_graph
~link_flags:exes.link_flags)) ~link_flags:exes.link_flags))

84
src/jbuild_types.ml
View File

@ -314,35 +314,38 @@ module Library = struct
end end
type t = type t =
{ name : string { name : string
; public_name : string option ; public_name : string option
; synopsis : string option ; synopsis : string option
; public_headers : string list ; public_headers : string list
; libraries : string list ; libraries : string list
; ppx_runtime_libraries : string list ; ppx_runtime_libraries : string list
; modes : Mode.t list ; modes : Mode.t list
; kind : Kind.t ; kind : Kind.t
; modules : Ordered_set_lang.t ; modules : Ordered_set_lang.t
; c_flags : Ordered_set_lang.Unexpanded.t ; c_flags : Ordered_set_lang.Unexpanded.t
; c_names : string list ; c_names : string list
; cxx_flags : Ordered_set_lang.Unexpanded.t ; cxx_flags : Ordered_set_lang.Unexpanded.t
; cxx_names : string list ; cxx_names : string list
; includes : String_with_vars.t list ; includes : String_with_vars.t list
; library_flags : String_with_vars.t list ; library_flags : String_with_vars.t list
; cclibs : Ordered_set_lang.Unexpanded.t ; cclibs : Ordered_set_lang.Unexpanded.t
; preprocess : Preprocess_map.t ; preprocess : Preprocess_map.t
; preprocessor_deps : Dep_conf.t list ; preprocessor_deps : Dep_conf.t list
; self_build_stubs_archive : string option ; self_build_stubs_archive : string option
; js_of_ocaml : Js_of_ocaml.t option ; js_of_ocaml : Js_of_ocaml.t option
; virtual_deps : string list ; virtual_deps : string list
; wrapped : bool ; wrapped : bool
; optional : bool ; optional : bool
; flags : Ordered_set_lang.t
; ocamlc_flags : Ordered_set_lang.t
; ocamlopt_flags : Ordered_set_lang.t
} }
let t = let t =
record record
~ignore:["js_of_ocaml"; "inline_tests"; "public_release"; "skip_from_default"; ~ignore:["inline_tests"; "skip_from_default";
"extra_disabled_warnings"; "lint"; "flags"] "extra_disabled_warnings"; "lint"]
[ field "name" library_name [ field "name" library_name
; field_o "public_name" string ; field_o "public_name" string
; field_o "synopsis" string ; field_o "synopsis" string
@ -366,11 +369,14 @@ module Library = struct
; field "kind" Kind.t ~default:Kind.Normal ; field "kind" Kind.t ~default:Kind.Normal
; field "wrapped" bool ~default:true ; field "wrapped" bool ~default:true
; field_b "optional" ; field_b "optional"
; field_osl "flags"
; field_osl "ocamlc_flags"
; field_osl "ocamlopt_flags"
] ]
(fun name public_name synopsis public_headers libraries ppx_runtime_libraries (fun name public_name synopsis public_headers libraries ppx_runtime_libraries
modules c_flags cxx_flags c_names cxx_names library_flags cclibs preprocess modules c_flags cxx_flags c_names cxx_names library_flags cclibs preprocess
preprocessor_deps self_build_stubs_archive js_of_ocaml virtual_deps modes preprocessor_deps self_build_stubs_archive js_of_ocaml virtual_deps modes
includes kind wrapped optional -> includes kind wrapped optional flags ocamlc_flags ocamlopt_flags ->
{ name { name
; public_name ; public_name
; synopsis ; synopsis
@ -394,6 +400,9 @@ module Library = struct
; virtual_deps ; virtual_deps
; wrapped ; wrapped
; optional ; optional
; flags
; ocamlc_flags
; ocamlopt_flags
}) })
let has_stubs t = let has_stubs t =
@ -404,14 +413,17 @@ end
module Executables = struct module Executables = struct
type t = type t =
{ names : string list { names : string list
; object_public_name : string option ; object_public_name : string option
; synopsis : string option ; synopsis : string option
; link_executables : bool ; link_executables : bool
; libraries : string list ; libraries : string list
; link_flags : string list ; link_flags : string list
; modules : Ordered_set_lang.t ; modules : Ordered_set_lang.t
; preprocess : Preprocess_map.t ; preprocess : Preprocess_map.t
; flags : Ordered_set_lang.t
; ocamlc_flags : Ordered_set_lang.t
; ocamlopt_flags : Ordered_set_lang.t
} }
let t = let t =
@ -425,9 +437,12 @@ module Executables = struct
; field "link_flags" (list string) ~default:[] ; field "link_flags" (list string) ~default:[]
; field_modules ; field_modules
; field_pp "preprocess" ; field_pp "preprocess"
; field_osl "flags"
; field_osl "ocamlc_flags"
; field_osl "ocamlopt_flags"
] ]
(fun names object_public_name synopsis link_executables libraries link_flags modules (fun names object_public_name synopsis link_executables libraries link_flags modules
preprocess -> preprocess flags ocamlc_flags ocamlopt_flags ->
{ names { names
; object_public_name ; object_public_name
; synopsis ; synopsis
@ -436,6 +451,9 @@ module Executables = struct
; link_flags ; link_flags
; modules ; modules
; preprocess ; preprocess
; flags
; ocamlc_flags
; ocamlopt_flags
}) })
end end

4
src/mode.ml
View File

@ -31,6 +31,10 @@ let best (ctx : Context.t) =
| Some _ -> Native | Some _ -> Native
| None -> Byte | None -> Byte
let of_cm_kind : Cm_kind.t -> t = function
| Cmi | Cmo -> Byte
| Cmx -> Native
module Dict = struct module Dict = struct
type 'a t = type 'a t =
{ byte : 'a { byte : 'a

1
src/mode.mli
View File

@ -12,6 +12,7 @@ val exe_ext : t -> string
val compiler : t -> Context.t -> Path.t option val compiler : t -> Context.t -> Path.t option
val cm_kind : t -> Cm_kind.t val cm_kind : t -> Cm_kind.t
val of_cm_kind : Cm_kind.t -> t
val findlib_predicate : t -> string val findlib_predicate : t -> string