Skip to content

Commit 9335476

Browse files
committed
Split into 3 opam packages
1 parent ce417fc commit 9335476

File tree

8 files changed

+107
-15
lines changed

8 files changed

+107
-15
lines changed

ArchSem/dune

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
CandidateExecutions
88
GenPromising
99
)
10-
(theories SailStdpp ASCommon)
10+
(theories stdpp Hammer RecordUpdate Equations Ltac2 SailStdpp ASCommon)
1111
(coqdoc_flags :standard --utf8
1212
--external https://plv.mpi-sws.org/coqdoc/stdpp/ stdpp
1313
--external ../../Common/ASCommon.html ASCommon

ArchSemArm/dune

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(coq.theory
22
(name ArchSemArm)
3-
(package coq-archsem)
3+
(package coq-archsem-arm)
44
(modules
55
SailArmInstTypes
66
ArmInst
@@ -13,7 +13,7 @@
1313
VMSA22Arm
1414
VMUMEquivThm
1515
)
16-
(theories ASCommon ArchSem)
16+
(theories stdpp Hammer RecordUpdate Equations Ltac2 SailStdpp ASCommon ArchSem)
1717
(coqdoc_flags :standard --utf8
1818
--external https://plv.mpi-sws.org/coqdoc/stdpp stdpp
1919
--external ../../Common/ASCommon.html ASCommon

Common/dune

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(coq.theory
22
(name ASCommon)
3-
(package coq-archsem)
3+
(package coq-archsem-common)
44
(modules
55
Common
66
CBase

Extraction/dune

-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@
1616

1717
(library
1818
(name Archsem_ocaml) ; TODO might change
19-
(public_name coq-archsem)
2019
(libraries zarith))

coq-archsem-arm.opam

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This file is generated by dune, edit dune-project instead
2+
opam-version: "2.0"
3+
synopsis:
4+
"Coq infrastructure to reason about hardware CPU architecture semantics, Arm instantiation"
5+
maintainer: ["Thibaut Pérami <[email protected]>"]
6+
authors: [
7+
"Thibaut Pérami"
8+
"Zonguyan Liu"
9+
"Nils Lauermann"
10+
"Jean Pichon-Pharabod"
11+
"Brian Campbell"
12+
"Alasdair Armstrong"
13+
"Ben Simner"
14+
"Peter Sewell"
15+
]
16+
license: "BSD-2-Clause"
17+
homepage: "https://github.com/rems-project/archsem"
18+
bug-reports: "https://github.com/rems-project/archsem/issues"
19+
depends: [
20+
"dune" {>= "3.8"}
21+
"coq-archsem"
22+
"odoc" {with-doc}
23+
]
24+
build: [
25+
["dune" "subst"] {dev}
26+
[
27+
"dune"
28+
"build"
29+
"-p"
30+
name
31+
"-j"
32+
jobs
33+
"@install"
34+
"@runtest" {with-test}
35+
"@doc" {with-doc}
36+
]
37+
]
38+
dev-repo: "git+https://github.com/rems-project/archsem.git"

coq-archsem-common.opam

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# This file is generated by dune, edit dune-project instead
2+
opam-version: "2.0"
3+
synopsis:
4+
"Common infrastructure and definition for the ArchSem project, includes CDestruct and a free monad library"
5+
maintainer: ["Thibaut Pérami <[email protected]>"]
6+
authors: [
7+
"Thibaut Pérami"
8+
"Zonguyan Liu"
9+
"Nils Lauermann"
10+
"Jean Pichon-Pharabod"
11+
"Brian Campbell"
12+
"Alasdair Armstrong"
13+
"Ben Simner"
14+
"Peter Sewell"
15+
]
16+
license: "BSD-2-Clause"
17+
homepage: "https://github.com/rems-project/archsem"
18+
bug-reports: "https://github.com/rems-project/archsem/issues"
19+
depends: [
20+
"dune" {>= "3.8"}
21+
"coq" {>= "8.19.2"}
22+
"coq-stdlib"
23+
"coq-equations" {>= "1.3"}
24+
"coq-record-update" {>= "0.3.4"}
25+
"coq-hammer-tactics" {>= "1.3.2"}
26+
"coq-stdpp" {= "1.10.0"}
27+
"coq-stdpp-bitvector" {= "1.10.0"}
28+
"odoc" {with-doc}
29+
]
30+
build: [
31+
["dune" "subst"] {dev}
32+
[
33+
"dune"
34+
"build"
35+
"-p"
36+
name
37+
"-j"
38+
jobs
39+
"@install"
40+
"@runtest" {with-test}
41+
"@doc" {with-doc}
42+
]
43+
]
44+
dev-repo: "git+https://github.com/rems-project/archsem.git"

coq-archsem.opam

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is generated by dune, edit dune-project instead
22
opam-version: "2.0"
33
synopsis:
4-
"Coq infrastructure to reason about hardware CPU architecture semantics"
4+
"Coq infrastructure to reason about hardware CPU architecture semantics, architecture generic part"
55
maintainer: ["Thibaut Pérami <[email protected]>"]
66
authors: [
77
"Thibaut Pérami"
@@ -18,13 +18,7 @@ homepage: "https://github.com/rems-project/archsem"
1818
bug-reports: "https://github.com/rems-project/archsem/issues"
1919
depends: [
2020
"dune" {>= "3.8"}
21-
"coq" {>= "8.19.2"}
22-
"coq-stdlib"
23-
"coq-equations" {>= "1.3"}
24-
"coq-record-update" {>= "0.3.4"}
25-
"coq-hammer-tactics" {>= "1.3.2"}
26-
"coq-stdpp" {= "1.10.0"}
27-
"coq-stdpp-bitvector" {= "1.10.0"}
21+
"coq-archsem-common"
2822
"coq-sail-stdpp" {dev}
2923
"odoc" {with-doc}
3024
]

dune-project

+19-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
(maintainers "Thibaut Pérami <[email protected]>")
1818

1919
(package
20-
(name coq-archsem)
21-
(synopsis "Coq infrastructure to reason about hardware CPU architecture semantics")
20+
(name coq-archsem-common)
21+
(synopsis "Common infrastructure and definition for the ArchSem project, includes CDestruct and a free monad library")
2222
(depends
2323
(coq (>= 8.19.2))
2424
coq-stdlib
@@ -27,8 +27,25 @@
2727
(coq-hammer-tactics (>= 1.3.2))
2828
(coq-stdpp (= 1.10.0))
2929
(coq-stdpp-bitvector (= 1.10.0))
30+
)
31+
)
32+
33+
(package
34+
(name coq-archsem)
35+
(synopsis "Coq infrastructure to reason about hardware CPU architecture semantics, architecture generic part")
36+
(depends
37+
coq-archsem-common ; need same commit
3038
(coq-sail-stdpp :dev) ; See INSTALL.md for the commit number
3139
)
3240
)
3341

42+
(package
43+
(name coq-archsem-arm)
44+
(synopsis "Coq infrastructure to reason about hardware CPU architecture semantics, Arm instantiation")
45+
(depends
46+
coq-archsem
47+
)
48+
)
49+
50+
3451
(generate_opam_files)

0 commit comments

Comments
 (0)