summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2018-11-26 12:59:30 -0500
committerRyan Scott <ryan.gl.scott@gmail.com>2018-11-26 12:59:38 -0500
commit8f9f52d8e421ce544d5437a93117545d52d0eabd (patch)
tree1e826ef6d0e47d0f65a703143e66bf061fc80fa0 /utils
parentf932b1aa42f45625658c8abaf862cc570507c5ca (diff)
downloadhaskell-8f9f52d8e421ce544d5437a93117545d52d0eabd.tar.gz
Use autoconf to generate version numbers for libiserv and friends
Summary: Currently, the version numbers for `libiserv`, `iserv`, and `iserv-proxy` are hard-coded directly into their `.cabal` files. These are easy to forget to update, and in fact, this has already happened once (see #15866). Let's use `autoconf` to do this for us so that it is not forgotten in the future. Test Plan: ./validate Reviewers: bgamari Reviewed By: bgamari Subscribers: rwbarton, erikd, carter GHC Trac Issues: #15866 Differential Revision: https://phabricator.haskell.org/D5302
Diffstat (limited to 'utils')
-rw-r--r--utils/iserv-proxy/iserv-proxy.cabal.in (renamed from utils/iserv-proxy/iserv-proxy.cabal)10
-rw-r--r--utils/iserv/iserv.cabal.in (renamed from utils/iserv/iserv.cabal)10
2 files changed, 14 insertions, 6 deletions
diff --git a/utils/iserv-proxy/iserv-proxy.cabal b/utils/iserv-proxy/iserv-proxy.cabal.in
index 5d276b244d..0819064601 100644
--- a/utils/iserv-proxy/iserv-proxy.cabal
+++ b/utils/iserv-proxy/iserv-proxy.cabal.in
@@ -1,5 +1,9 @@
+-- WARNING: iserv-proxy.cabal is automatically generated from iserv-proxy.cabal.in by
+-- ../../configure. Make sure you are editing iserv-proxy.cabal.in, not
+-- iserv-proxy.cabal.
+
Name: iserv-proxy
-Version: 8.6
+Version: @ProjectVersion@
Copyright: XXX
License: BSD3
-- XXX License-File: LICENSE
@@ -74,5 +78,5 @@ Executable iserv-proxy
directory >= 1.3 && < 1.4,
network >= 2.6,
filepath >= 1.4 && < 1.5,
- ghci == 8.6.*,
- libiserv == 8.6.*
+ ghci == @ProjectVersionMunged@,
+ libiserv == @ProjectVersionMunged@
diff --git a/utils/iserv/iserv.cabal b/utils/iserv/iserv.cabal.in
index 912734f0f0..356c8a444a 100644
--- a/utils/iserv/iserv.cabal
+++ b/utils/iserv/iserv.cabal.in
@@ -1,5 +1,9 @@
+-- WARNING: iserv.cabal is automatically generated from iserv.cabal.in by
+-- ../../configure. Make sure you are editing iserv.cabal.in, not
+-- iserv.cabal.
+
Name: iserv
-Version: 8.7.1
+Version: @ProjectVersion@
Copyright: XXX
License: BSD3
-- XXX License-File: LICENSE
@@ -35,8 +39,8 @@ Executable iserv
bytestring >= 0.10 && < 0.11,
containers >= 0.5 && < 0.7,
deepseq >= 1.4 && < 1.5,
- ghci == 8.7.*,
- libiserv == 8.7.*
+ ghci == @ProjectVersionMunged@,
+ libiserv == @ProjectVersionMunged@
if os(windows)
Cpp-Options: -DWINDOWS