diff --git a/Makefile b/Makefile index f90ff7d99..d12061406 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,11 @@ all: build Version.ml: sh ./version-gen.sh $(PREFIX) -build: Version.ml | check-deps +just-build: Version.ml dune build -j $(J) --profile $(DUNE_PROFILE) +build: check-deps | just-build + $(BENTO): Version.ml | check-deps dune build -j $(J) --profile $(DUNE_PROFILE) $@ diff --git a/VERSION.txt b/VERSION.txt index d3aed47a8..627cc0c08 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1,2 @@ -7.56+03 +7.57+1 + diff --git a/doc/Makefile b/doc/Makefile index 6827b9c6e..a11c72bc8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -241,7 +241,7 @@ clean:: #version version.tex: ../herdtools7.opam - /bin/echo '\def\version{'`grep "^version:" ../herdtools7.opam | cut -d ":" -f 2 | cut -d '"' -f 2`'}' > $@ + /bin/echo '\def\version{'$$(cat ../VERSION.txt)'}' > $@ clean:: /bin/rm -f version.tex @@ -327,7 +327,7 @@ clean:: LATEX ?= $(if $(shell which rubber),\ rubber -f,\ $(if $(shell which latexmk),\ - latexmk -dvi,\ + latexmk -dvi -ps- -pdf-,\ $(error "Could not find either rubber or latexmk in PATH"))) DVIPS=dvips PS2PDF=ps2pdf diff --git a/herd/AArch64Sem.ml b/herd/AArch64Sem.ml index b76474c34..b516db6b2 100644 --- a/herd/AArch64Sem.ml +++ b/herd/AArch64Sem.ml @@ -2412,7 +2412,6 @@ module Make let get_link_addr test ii = let lbl = - let open BranchTarget in let a = ii.A.addr + 4 in let lbls = test.Test_herd.entry_points a in Label.norm lbls in diff --git a/herdtools7.opam b/herdtools7.opam index 22251a73a..fdec680c7 100644 --- a/herdtools7.opam +++ b/herdtools7.opam @@ -1,6 +1,4 @@ opam-version: "2.0" -name: "herdtools7" -version: "7.56+04~dev" synopsis: "The herdtools suite for simulating and studying weak memory models" maintainer: "Luc Maranget " authors: [ @@ -12,7 +10,7 @@ bug-reports: "http://github.com/herd/herdtools7/issues/" doc: "http://diy.inria.fr/doc/index.html" dev-repo: "git+https://github.com/herd/herdtools7.git" license: "CECILL-B" -build: [make "build" "PREFIX=%{prefix}%"] +build: [make "just-build" "PREFIX=%{prefix}%"] install: [make "install" "PREFIX=%{prefix}%"] # @todo Add "build-doc" field # @todo Add "build-test" field @@ -20,12 +18,14 @@ depends: [ "ocaml" {>= "4.08.0"} "dune" {>= "2.7" } "menhir" {>= "20200123"} - "zarith" -] -depopts: [ - "js_of_ocaml-ppx" + "zarith" {>= "1.10"} + "conf-which" ] conflicts: ["ocaml-option-bytecode-only"] url { - src: "https://github.com/herd/herdtools7/" + src: "https://github.com/herd/herdtools7/archive/refs/tags/7.57.tar.gz" + checksum: [ + "md5=94f321f138662ba84f519376b6a9ec44" + "sha512=08c6d99e8bcd1774f40daed2965f286401404dbf42c4871246edd5b64ce4fd89ead1f36d2c6d7bfc534d769888cf61b0c8cd6decca9434272c32cbef1bcd29ba" + ] }