Skip to content

refactor(opam): share modern build command generation #15550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rgrinberg wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −33
Open

refactor(opam): share modern build command generation #15550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 4 additions & 33 deletions src/dune_rules/opam_create.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,36 +62,7 @@ let default_build_command =
[ "dune" "install" "-p" name "--create-install-files" name ]
]
|}))
and from_3_0 ~with_subst ~with_sites =
let subst = if with_subst then {| [ "dune" "subst" ] {dev} |} else "" in
let promote_install_files =
if with_sites then {| "--promote-install-files=false" |} else ""
in
let install =
if with_sites
then {| [ "dune" "install" "-p" name "--create-install-files" name ] |}
else ""
in
lazy
(Opam_file.parse_value
(Lexbuf.from_string
~fname:"<internal>"
(Printf.sprintf
{|
[
%s
[ "dune" "build" "-p" name "-j" jobs %s
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
%s
]
|}
subst
promote_install_files
install)))
and from_3_23 ~with_subst ~with_sites ~runtest =
and from_3_0 ~with_subst ~with_sites ~runtest =
let subst = if with_subst then {| [ "dune" "subst" ] {dev} |} else "" in
let promote_install_files =
if with_sites then {| "--promote-install-files=false" |} else ""
Comment on lines +65 to 68
Expand Down Expand Up @@ -135,12 +106,12 @@ let default_build_command =
else if version < (3, 0)
then from_2_9
else if version < (3, 23)
then from_3_0 ~with_subst ~with_sites
then from_3_0 ~with_subst ~with_sites ~runtest:"@runtest"
else (
match Package.exclusive_dir package with
| None -> from_3_0 ~with_subst ~with_sites
| None -> from_3_0 ~with_subst ~with_sites ~runtest:"@runtest"
| Some (_loc, dir) ->
from_3_23
from_3_0
~with_subst
~with_sites
~runtest:("@runtest/" ^ Path.Source.to_string dir)))
Expand Down
Loading