2.3.3 minor (#353)

* Replace bash by sh in configure script

* Bump package version to 2.3.3

* Add conflicts instruction with the alt-ergo free package

* Use mandir in installaiton directives (#355)

* Bump version and update changes

Co-authored-by: Guillaume Bury <guillaume.bury@gmail.com>

sources/CHANGES

@@ -1,6 +1,14 @@
 dev version
 ===========
 
+version 2.3.3, August 19, 2020
+================================
+
+* Minor release:
+
+  - Fix configure use of bash
+  - Add conflict instructions with the Alt-ergo-free package
+
 version 2.3.2, March 23, 2020
 ================================
 

sources/Makefile

@@ -159,26 +159,30 @@ non-regression: all
 install: all
 	$(DUNE) install $(DUNE_FLAGS)		\
 		--prefix $(prefix)						\
-		--libdir $(libdir)
+		--libdir $(libdir)						\
+		--mandir $(mandir)
 
 # Use dune to uninstall the lib, bin, and gui
 uninstall:
 	$(DUNE) uninstall $(DUNE_FLAGS)	\
 		--prefix $(prefix)						\
-		--libdir $(libdir)
+		--libdir $(libdir)						\
+		--mandir $(mandir)
 
 # Install only the lib
 install-lib:
 	$(DUNE) install $(DUNE_FLAGS)		\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p alt-ergo-lib alt-ergo-lib
 
 # Uninstall the lib
 uninstall-lib:
 	$(DUNE) uninstall $(DUNE_FLAGS)	\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p alt-ergo-lib alt-ergo-lib
 
 
@@ -187,41 +191,47 @@ install-parsers:
 	$(DUNE) install $(DUNE_FLAGS)		\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p alt-ergo-parsers alt-ergo-parsers
 
 # Uninstall the parsers
 uninstall-parsers:
 	$(DUNE) uninstall $(DUNE_FLAGS)	\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p alt-ergo-parsers alt-ergo-parsers
 
 # Install only the binary
 install-bin:
 	$(DUNE) install $(DUNE_FLAGS)		\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p alt-ergo alt-ergo
 
 # Uninstall the binary
 uninstall-bin:
 	$(DUNE) uninstall $(DUNE_FLAGS)	\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p alt-ergo alt-ergo
 
 # Install only the binary
 install-gui:
 	$(DUNE) install $(DUNE_FLAGS)		\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p altgr-ergo altgr-ergo
 
 # Uninstall the lib
 uninstall-gui:
 	$(DUNE) uninstall $(DUNE_FLAGS)	\
 		--prefix $(prefix)						\
 		--libdir $(libdir)						\
+		--mandir $(mandir)						\
 		-p altgr-ergo altgr-ergo
 
 .PHONY: install uninstall

sources/alt-ergo-lib.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "alt-ergo-lib"
-version: "2.3.2"
+version: "2.3.3"
 authors: "Alt-Ergo developers"
 maintainer: "OCamlPro <alt-ergo@ocamlpro.com>"
 license: "OCamlPro Non-Commercial Purpose License, version 1"
@@ -18,6 +18,10 @@ depends: [
   "seq"
   "stdlib-shims"
 ]
+conflicts: [
+  "alt-ergo-free"
+  "alt-ergo-lib-free"
+]
 homepage: "http://alt-ergo.ocamlpro.com/"
 dev-repo: "git+https://github.com/OCamlPro/alt-ergo.git"
 bug-reports: "https://github.com/OCamlPro/alt-ergo/issues"

sources/alt-ergo-parsers.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "alt-ergo-parsers"
-version: "2.3.2"
+version: "2.3.3"
 authors: "Alt-Ergo developers"
 maintainer: "OCamlPro <alt-ergo@ocamlpro.com>"
 license: "OCamlPro Non-Commercial Purpose License, version 1"

sources/alt-ergo.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "alt-ergo"
-version: "2.3.2"
+version: "2.3.3"
 authors: "Alt-Ergo developers"
 maintainer: "OCamlPro <alt-ergo@ocamlpro.com>"
 license: "OCamlPro Non-Commercial Purpose License, version 1"

sources/altgr-ergo.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "altgr-ergo"
-version: "2.3.2"
+version: "2.3.3"
 authors: "Alt-Ergo developers"
 maintainer: "OCamlPro <alt-ergo@ocamlpro.com>"
 license: "OCamlPro Non-Commercial Purpose License, version 1"

sources/configure

@@ -1,3 +1,3 @@
-#!/bin/bash -e
+#!/bin/sh -ue
 
 ocaml unix.cma configure.ml "$@"

sources/configure.ml

@@ -110,6 +110,7 @@ let () =
   let () = Format.fprintf fmt "prefix=%s@." !prefix in
   let () = Format.fprintf fmt "libdir=%s@." !libdir in
   let () = Format.fprintf fmt "sharedir=%s@." !sharedir in
+  let () = Format.fprintf fmt "mandir=%s@." !mandir in
   let () = close_out ch in
   let () = Format.printf "done.@." in
   ()

sources/lib/util/version.ml

@@ -29,7 +29,7 @@
 (* WARNING: a "cut" is performed on the following file in the Makefile.
    DO NOT CHANGE its format *)
 
-let _version="2.3.2"
+let _version="2.3.3"
 
 let _release_commit = "(not released)"