Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
opam pin add --no-action .
opam install --deps-only .
- name: Rocq build
run: make -j4
run: dune build
- name: opam install
run: opam install --assume-built .
- name: opam uninstall
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
*.glob
.*.aux
.*.cache
_build/
# generated by rocq dep
.rocqdeps.d
48 changes: 0 additions & 48 deletions Makefile

This file was deleted.

2 changes: 2 additions & 0 deletions _RocqProject
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
-Q src Perennial
-Q external/Goose Goose
-Q _build/default/src Perennial
-Q _build/default/external/Goose Goose
-arg -w -arg +deprecated-instance-without-locality
# don't allow ambiguous coercions
-arg -w -arg +ambiguous-paths
Expand Down
17 changes: 17 additions & 0 deletions dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
(env
(_ ; Applies to all profiles (dev, release, ...).
(coq
; Configure coqc flags.
(flags (:standard %{read-lines:flags.dune})))))

(rule
(action
(with-stdout-to flags.dune
(pipe-stdout
(cat _RocqProject)
; delete comments
(bash "sed -E -e '/^#/d'")
; get only args (not logical paths)
(bash "grep -o -- '-arg [^ ]*'")
(bash "sed -E -e 's/-arg //'")))))

10 changes: 10 additions & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(lang dune 3.17)
(using coq 0.10)

(package
(name tulip-code)
(synopsis "tulip translated code"))
(package
(name tulip-proof)
(synopsis "tulip program proof"))

8 changes: 8 additions & 0 deletions external/Goose/github_com/mit_pdos/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
(include_subdirs qualified)
(coq.theory
(name Goose.github_com.mit_pdos)
(package tulip-code)
(theories Stdlib Ltac2 stdpp iris
coqutil RecordUpdate iris_named_props
Perennial Goose))

8 changes: 8 additions & 0 deletions src/program_proof/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
(include_subdirs qualified)
(coq.theory
(name Perennial.program_proof)
(package tulip-proof)
(theories Stdlib Ltac2 stdpp iris
coqutil RecordUpdate iris_named_props
Goose Goose.github_com.mit_pdos Perennial))

9 changes: 3 additions & 6 deletions tulip-proof.opam
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ homepage: "https://github.com/mit-pdos/tulip-proof"
bug-reports: "https://github.com/mit-pdos/tulip-proof/issues"
dev-repo: "git+https://github.com/mit-pdos/tulip-proof.git"
version: "dev"
synopsis: "Verification of tulip"
synopsis: "Program proofs for tulip"

depends: [
"perennial-old"
Expand All @@ -23,8 +23,5 @@ pin-depends: [
## end
]

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