[commit: ghc] ghc-8.6: libiserv: Generate cabal file with autoconf (cbde272)

git at git.haskell.org git at git.haskell.org
Thu Nov 22 21:54:13 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.6
Link       : http://ghc.haskell.org/trac/ghc/changeset/cbde2726f10b8f4c19483bbb755ad42356098c51/ghc

>---------------------------------------------------------------

commit cbde2726f10b8f4c19483bbb755ad42356098c51
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Nov 6 10:33:01 2018 -0500

    libiserv: Generate cabal file with autoconf
    
    Previously the version number was set by hand. This seems like
    unnecessary busywork for what is mostly an internal library.


>---------------------------------------------------------------

cbde2726f10b8f4c19483bbb755ad42356098c51
 configure.ac                                             | 2 +-
 libraries/libiserv/{libiserv.cabal => libiserv.cabal.in} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2556561..f305ca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1334,7 +1334,7 @@ checkMake380() {
 checkMake380 make
 checkMake380 gmake
 
-AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
 AC_OUTPUT
 [
 if test "$print_make_warning" = "true"; then
diff --git a/libraries/libiserv/libiserv.cabal b/libraries/libiserv/libiserv.cabal.in
similarity index 97%
rename from libraries/libiserv/libiserv.cabal
rename to libraries/libiserv/libiserv.cabal.in
index fc0a022..84471a2 100644
--- a/libraries/libiserv/libiserv.cabal
+++ b/libraries/libiserv/libiserv.cabal.in
@@ -1,5 +1,5 @@
 Name: libiserv
-Version: 8.6.1
+Version: @ProjectVersionMunged@
 Copyright: XXX
 License: BSD3
 License-File: LICENSE



More information about the ghc-commits mailing list