diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-12-14 13:32:45 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-12-17 13:58:30 -0500 |
| commit | 659fcb14937e60510e3eea4c1211ea117419905b (patch) | |
| tree | bdd0500b6c72f7fb5d03c97e8f955ac6e4d778eb | |
| parent | df7c7faa9998f2b618eab586bb4420d6743aad18 (diff) | |
| download | haskell-659fcb14937e60510e3eea4c1211ea117419905b.tar.gz | |
Fix project version for ProjectVersionMunged (fix #19058)
| -rwxr-xr-x | .gitlab/linters/check-version-number.sh | 5 | ||||
| -rw-r--r-- | 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} |