Skip to content

Commit 97cf656

Browse files
flambda-backend: Simplify the install stanza of extension universe otherlibs (ocaml-flambda#2563)
* Use Dune 3.15.2 in CI * Update docs * Fix typo * Bump Dune language version to 3.11 * `glob_files` in beta * `glob_files` in alpha * `glob_files` in stable * `glob_files` in upstream_compatible --------- Co-authored-by: Diana Kalinichenko <dkalinichenko@janestreet.com>
1 parent 84bcdfe commit 97cf656

File tree

5 files changed

+27
-55
lines changed

5 files changed

+27
-55
lines changed

dune-project.jst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(lang dune 2.8)
1+
(lang dune 3.11)
22
(wrapped_executables false)
33
(using experimental_building_ocaml_compiler_with_dune 0.1)
44
(using menhir 2.1)

otherlibs/alpha/dune

+6-9
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,11 @@
3636

3737
(install
3838
(files
39-
(alpha.cmxa as alpha/alpha.cmxa)
40-
(alpha.a as alpha/alpha.a)
41-
(alpha.cmxs as alpha/alpha.cmxs)
42-
(alpha.cma as alpha/alpha.cma)
43-
(alpha.mli as alpha/alpha.mli)
44-
(.alpha.objs/byte/alpha.cmi as alpha/alpha.cmi)
45-
(.alpha.objs/byte/alpha.cmt as alpha/alpha.cmt)
46-
(.alpha.objs/byte/alpha.cmti as alpha/alpha.cmti)
47-
(.alpha.objs/native/alpha.cmx as alpha/alpha.cmx))
39+
(glob_files
40+
(*.{cmxa,a,cmxs,cma,mli} with_prefix alpha))
41+
(glob_files
42+
(.alpha.objs/byte/*.{cmi,cmt,cmti} with_prefix alpha))
43+
(glob_files
44+
(.alpha.objs/native/*.cmx with_prefix alpha)))
4845
(section lib)
4946
(package ocaml))

otherlibs/beta/dune

+6-19
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,11 @@
3636

3737
(install
3838
(files
39-
(beta.cmxa as beta/beta.cmxa)
40-
(beta.a as beta/beta.a)
41-
(beta.cmxs as beta/beta.cmxs)
42-
(beta.cma as beta/beta.cma)
43-
(beta.mli as beta/beta.mli)
44-
(float32.mli as beta/float32.mli)
45-
(float32_u.mli as beta/float32_u.mli)
46-
(.beta.objs/byte/beta.cmi as beta/beta.cmi)
47-
(.beta.objs/byte/beta.cmt as beta/beta.cmt)
48-
(.beta.objs/byte/beta.cmti as beta/beta.cmti)
49-
(.beta.objs/native/beta.cmx as beta/beta.cmx)
50-
(.beta.objs/byte/float32.cmi as beta/float32.cmi)
51-
(.beta.objs/byte/float32.cmt as beta/float32.cmt)
52-
(.beta.objs/byte/float32.cmti as beta/float32.cmti)
53-
(.beta.objs/native/float32.cmx as beta/float32.cmx)
54-
(.beta.objs/byte/float32_u.cmi as beta/float32_u.cmi)
55-
(.beta.objs/byte/float32_u.cmt as beta/float32_u.cmt)
56-
(.beta.objs/byte/float32_u.cmti as beta/float32_u.cmti)
57-
(.beta.objs/native/float32_u.cmx as beta/float32_u.cmx))
39+
(glob_files
40+
(*.{cmxa,a,cmxs,cma,mli} with_prefix beta))
41+
(glob_files
42+
(.beta.objs/byte/*.{cmi,cmt,cmti} with_prefix beta))
43+
(glob_files
44+
(.beta.objs/native/*.cmx with_prefix beta)))
5845
(section lib)
5946
(package ocaml))

otherlibs/stable/dune

+6-9
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,11 @@
3636

3737
(install
3838
(files
39-
(stable.cmxa as stable/stable.cmxa)
40-
(stable.a as stable/stable.a)
41-
(stable.cmxs as stable/stable.cmxs)
42-
(stable.cma as stable/stable.cma)
43-
(stable.mli as stable/stable.mli)
44-
(.stable.objs/byte/stable.cmi as stable/stable.cmi)
45-
(.stable.objs/byte/stable.cmt as stable/stable.cmt)
46-
(.stable.objs/byte/stable.cmti as stable/stable.cmti)
47-
(.stable.objs/native/stable.cmx as stable/stable.cmx))
39+
(glob_files
40+
(*.{cmxa,a,cmxs,cma,mli} with_prefix stable))
41+
(glob_files
42+
(.stable.objs/byte/*.{cmi,cmt,cmti} with_prefix stable))
43+
(glob_files
44+
(.stable.objs/native/*.cmx with_prefix stable)))
4845
(section lib)
4946
(package ocaml))

otherlibs/upstream_compatible/dune

+8-17
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,13 @@
3636

3737
(install
3838
(files
39-
(upstream_compatible.cmxa as upstream_compatible/upstream_compatible.cmxa)
40-
(upstream_compatible.a as upstream_compatible/upstream_compatible.a)
41-
(upstream_compatible.cmxs as upstream_compatible/upstream_compatible.cmxs)
42-
(upstream_compatible.cma as upstream_compatible/upstream_compatible.cma)
43-
(upstream_compatible.mli as upstream_compatible/upstream_compatible.mli)
44-
(.upstream_compatible.objs/byte/upstream_compatible.cmi
45-
as
46-
upstream_compatible/upstream_compatible.cmi)
47-
(.upstream_compatible.objs/byte/upstream_compatible.cmt
48-
as
49-
upstream_compatible/upstream_compatible.cmt)
50-
(.upstream_compatible.objs/byte/upstream_compatible.cmti
51-
as
52-
upstream_compatible/upstream_compatible.cmti)
53-
(.upstream_compatible.objs/native/upstream_compatible.cmx
54-
as
55-
upstream_compatible/upstream_compatible.cmx))
39+
(glob_files
40+
(*.{cmxa,a,cmxs,cma,mli} with_prefix upstream_compatible))
41+
(glob_files
42+
(.upstream_compatible.objs/byte/*.{cmi,cmt,cmti}
43+
with_prefix
44+
upstream_compatible))
45+
(glob_files
46+
(.upstream_compatible.objs/native/*.cmx with_prefix upstream_compatible)))
5647
(section lib)
5748
(package ocaml))

0 commit comments

Comments
 (0)