diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | docs/users_guide/8.8.1-notes.rst | 1 | ||||
| -rw-r--r-- | libraries/libiserv/libiserv.cabal.in (renamed from libraries/libiserv/libiserv.cabal) | 8 | ||||
| -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 |
6 files changed, 26 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 59ca1ccc31..b205b2441e 100644 --- a/.gitignore +++ b/.gitignore @@ -153,6 +153,7 @@ _darcs/ /libraries/hslogo-16.png /libraries/index-frames.html /libraries/index.html +/libraries/libiserv/libiserv.cabal /libraries/minus.gif /libraries/ocean.css /libraries/plus.gif @@ -178,6 +179,8 @@ _darcs/ /testsuite_summary*.txt /testsuite*.xml /testlog* +/utils/iserv/iserv.cabal +/utils/iserv-proxy/iserv-proxy.cabal /utils/mkUserGuidePart/mkUserGuidePart.cabal /utils/runghc/runghc.cabal /utils/gen-dll/gen-dll.cabal @@ -215,4 +218,4 @@ GIT_COMMIT_ID ghc.nix/ -.gdb_history
\ No newline at end of file +.gdb_history diff --git a/configure.ac b/configure.ac index 5ae1c6a0f4..88eddca097 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/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.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/docs/users_guide/8.8.1-notes.rst b/docs/users_guide/8.8.1-notes.rst index 69b9c5d536..6f6404e736 100644 --- a/docs/users_guide/8.8.1-notes.rst +++ b/docs/users_guide/8.8.1-notes.rst @@ -176,6 +176,7 @@ for further change information. libraries/haskeline/haskeline.cabal: Dependency of ``ghci`` executable libraries/hpc/hpc.cabal: Dependency of ``hpc`` executable libraries/integer-gmp/integer-gmp.cabal: Core library + libraries/libiserv/libiserv.cabal: Internal compiler library libraries/mtl/mtl.cabal: Dependency of ``Cabal`` library libraries/parsec/parsec.cabal: Dependency of ``Cabal`` library libraries/process/process.cabal: Dependency of ``ghc`` library diff --git a/libraries/libiserv/libiserv.cabal b/libraries/libiserv/libiserv.cabal.in index 196d36ce68..31eaaeb838 100644 --- a/libraries/libiserv/libiserv.cabal +++ b/libraries/libiserv/libiserv.cabal.in @@ -1,5 +1,9 @@ +-- WARNING: libiserv.cabal is automatically generated from libiserv.cabal.in by +-- ../../configure. Make sure you are editing libiserv.cabal.in, not +-- libiserv.cabal. + Name: libiserv -Version: 8.7.1 +Version: @ProjectVersionMunged@ Copyright: XXX License: BSD3 License-File: LICENSE @@ -25,7 +29,7 @@ Library bytestring >= 0.10 && < 0.11, containers >= 0.5 && < 0.7, deepseq >= 1.4 && < 1.5, - ghci == 8.7.* + ghci == @ProjectVersionMunged@ if flag(network) Exposed-Modules: Remote.Message , Remote.Slave 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 |