Skip to content
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.

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

Dune based build #83

Merged
merged 45 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
9da90a5
Dune: deps, isabelle.
kape1395 May 27, 2023
a2cccbc
Dune: deps, zenon.
kape1395 May 27, 2023
113b1bf
Trying to make dune install work for deps.
kape1395 May 30, 2023
9eb565a
deps: z3 and ls4.
kape1395 May 30, 2023
0d5fa15
deps: translate utility.
kape1395 May 30, 2023
451b04e
install emacs mode.
kape1395 May 30, 2023
040a5c3
install: library.
kape1395 May 30, 2023
fc7a310
Try ocaml 4.08.2 instead of 4.08.1.
kape1395 May 31, 2023
7826dec
Revert "Try ocaml 4.08.2 instead of 4.08.1."
kape1395 May 31, 2023
9fe5a8d
Use dune-site to locate backends (partial).
kape1395 Jun 1, 2023
5638f17
Run tests with dune (except the mlt files).
kape1395 Jun 5, 2023
8bc06c3
Able to run the testcases selectively.
kape1395 Jun 5, 2023
2422f4e
Fix the existing build.
kape1395 Jun 6, 2023
1892e10
Fix a warning.
kape1395 Jun 6, 2023
3c21d96
Use stdlib site for the library TLA files.
kape1395 Jun 6, 2023
ca5e8fd
github actions are now passing when rinning them locally.
kape1395 Jun 7, 2023
6f80041
Restore execution permissions after dune install.
kape1395 Jun 8, 2023
e14db51
Attempt to make 'opam install .' work.
kape1395 Jun 8, 2023
4cd3140
Make target to install opam deps.
kape1395 Jun 8, 2023
e3128d6
Cleanup.
kape1395 Jun 8, 2023
0eb54fb
Update src/params.ml
kape1395 Jun 14, 2023
94e1392
The old build system removed.
kape1395 Jun 14, 2023
f69774a
Split tlapm to a lib and exec, only execs support inline tests.
kape1395 Jun 14, 2023
f8b47eb
All the kaputt tests ported to ppx_inline_tests.
kape1395 Jun 15, 2023
5153bf3
Empty mlt (kaputt) files are not used anymore.
kape1395 Jun 15, 2023
60142c7
deps/z3: support different OS types.
kape1395 Jun 17, 2023
40c83f1
deps/z3: support different OS types.
kape1395 Jun 17, 2023
dff2a92
deps/ls4: support different OS types.
kape1395 Jun 17, 2023
1703499
deps/zenon: support different OS types.
kape1395 Jun 17, 2023
f0d05f9
deps/zenon: support different OS types.
kape1395 Jun 17, 2023
7823ec6
deps/zenon: support different OS types.
kape1395 Jun 17, 2023
76457b3
deps/isabelle: support different OS types.
kape1395 Jun 18, 2023
31b16ac
deps/isabelle: support different OS types.
kape1395 Jun 18, 2023
153684e
Remove a link to TLAPS in isabelle, it was broken before.
kape1395 Jun 18, 2023
b2ae611
Avoid using realpath.
kape1395 Jun 18, 2023
1351c23
Update package deps.
kape1395 Jun 18, 2023
b1c72f3
Github actions, partially updated.
kape1395 Jun 18, 2023
629bccd
Isabelle: set 64 bit arh explicitly.
kape1395 Jun 22, 2023
4536bfe
Take version from the dune's build-info.
kape1395 Jun 22, 2023
d00ee1d
Use `tlapm --version` for the GH release workflow.
kape1395 Jun 22, 2023
4a0e42b
Make build more portable.
kape1395 Jun 22, 2023
620b9dc
Run a short test during the release.
kape1395 Jun 24, 2023
41c36d1
Use an opam.template to customize the build step for opam.
kape1395 Jun 25, 2023
2bd1f82
Build/install procedures updated.
kape1395 Oct 13, 2023
8f5c5c8
Merge remote-tracking branch 'origin/main' into support-dune-build-deps
kape1395 Oct 13, 2023
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
Prev Previous commit
Next Next commit
Make target to install opam deps.
Signed-off-by: Karolis Petrauskas <k.petrauskas@gmail.com>
  • Loading branch information
kape1395 committed Jun 8, 2023
commit 4cd3140ea3c1efe226687675e19e781c67ef91ae
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
/_build/
/_build_cache/
/.vscode/
/tlapm.opam
/tlaps-*.tar.gz

/Makefile
Expand Down
3 changes: 1 addition & 2 deletions Makefile.dune
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ PREFIX?=$(OPAM_SWITCH_PREFIX)
all: build

opam-deps:
# TODO: opam install ./ --deps-only
opam install --yes dune dune-site
opam install ./ --deps-only

build:
dune build
Expand Down
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
(sites
(lib backends) ; will contain all the provers, approx lib/tlapm/backends/.
(lib stdlib)) ; TLA files composing the StdLib.
(depends ocaml dune dune-site))
(depends ocaml dune-site))

; TODO: https://github.com/ocaml/dune/tree/main/example/with-configure-step.t
; to derive the current os to name the release?
50 changes: 50 additions & 0 deletions tlapm.opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
synopsis: "TLA+ Proof Manager"
description: "TLA+ Proof Manager"
maintainer: [
"Kaustuv Chaudhuri"
"Denis Cousineau"
"Damien Doligez"
"Leslie Lamport"
"Tomer Libal"
"Stephan Merz"
"Jean-Baptiste Tristan"
"Hernan Vanzetto"
]
authors: [
"Kaustuv Chaudhuri"
"Denis Cousineau"
"Damien Doligez"
"Leslie Lamport"
"Tomer Libal"
"Stephan Merz"
"Jean-Baptiste Tristan"
"Hernan Vanzetto"
kape1395 marked this conversation as resolved.
Show resolved Hide resolved
]
homepage: "https://github.com/tlaplus/tlapm"
bug-reports: "https://github.com/tlaplus/tlapm/issues"
depends: [
"dune" {>= "3.7"}
"ocaml"
"dune-site"
"odoc" {with-doc}
]
build: [
["dune" "subst"] {dev}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
["%{make}%" "-C" "%{lib}%/tlapm" "-f" "Makefile.post-install"]
]
dev-repo: "git+https://github.com/tlaplus/tlapm.git"