From 33c27c9a4e30f6b3532aeeed0d72b0331c943d8b Mon Sep 17 00:00:00 2001 From: Robert Norton Date: Wed, 13 Feb 2019 16:57:00 +0000 Subject: Attempt to parse sail version from opam file for manifest.ml. Update version in opam file in anticipation of release and add yojson dependency. --- opam | 3 ++- src/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opam b/opam index 9fb32ee4..9508e5e6 100644 --- a/opam +++ b/opam @@ -1,6 +1,6 @@ opam-version: "1.2" name: "sail" -version: "0.7.1" +version: "0.8" maintainer: "Sail Devs " authors: [ "Alasdair Armstrong" @@ -35,5 +35,6 @@ depends: [ "omd" "conf-gmp" "conf-zlib" + "yojson" ] available: [ocaml-version >= "4.06.0"] diff --git a/src/Makefile b/src/Makefile index b0b22f77..beba66df 100644 --- a/src/Makefile +++ b/src/Makefile @@ -96,7 +96,7 @@ else echo let dir=\"$(SHARE_DIR)\" >> manifest.ml echo let commit=\"opam\" >> manifest.ml echo let branch=\"sail2\" >> manifest.ml - echo let version=\"0.8\" >> manifest.ml + echo let version=\"$(shell grep '^version:' ../opam | grep -o -E '"[^"]+"')\" >> manifest.ml endif sail: ast.ml bytecode.ml manifest.ml -- cgit v1.2.3