From 659fcb14937e60510e3eea4c1211ea117419905b Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Mon, 14 Dec 2020 13:32:45 +0100 Subject: Fix project version for ProjectVersionMunged (fix #19058) --- .gitlab/linters/check-version-number.sh | 5 +++-- configure.ac | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab/linters/check-version-number.sh b/.gitlab/linters/check-version-number.sh index fbd10129bc..4f478e487a 100755 --- a/.gitlab/linters/check-version-number.sh +++ b/.gitlab/linters/check-version-number.sh @@ -2,5 +2,6 @@ set -e -grep -E -q '\[[0-9]+\.[0-9]+\.[0-9]+\]' configure.ac || - ( echo "error: configure.ac: GHC version number must have three components."; exit 1 ) +grep -E -q 'RELEASE=NO' configure.ac || + grep -E -q '\[[0-9]+\.[0-9]+\.[0-9]+\]' configure.ac || + ( echo "error: configure.ac: GHC version number must have three components when RELEASE=YES."; exit 1 ) diff --git a/configure.ac b/configure.ac index 0287d6743a..c9cf01e713 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,10 @@ dnl # see what flags are available. (Better yet, read the documentation!) # -AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.1.0], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.1], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) + # Version on HEAD must be X.Y (not X.Y.Z) for ProjectVersionMunged variable + # to be useful (cf #19058) + # Set this to YES for a released version, otherwise NO : ${RELEASE=NO} -- cgit v1.2.1