diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 13:36:11 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 13:36:11 +0100 |
| commit | 397f18a298bd3fc9c69f77cf00a9a56a693f748e (patch) | |
| tree | 8f9618055037ff9a8d788a2b82aa757d5f6797e5 | |
| parent | abf3911b70d6850a6daf6507f6da209b8e95da6a (diff) | |
remove custom-binary flag; update Cabal version restriction; bump version to 3.10
| -rw-r--r-- | gf.cabal | 28 | ||||
| -rw-r--r-- | src/runtime/haskell/pgf.cabal | 26 |
2 files changed, 19 insertions, 35 deletions
@@ -1,5 +1,5 @@ name: gf -version: 3.9-git +version: 3.10 cabal-version: >= 1.22 build-type: Custom @@ -42,7 +42,7 @@ data-files: custom-setup setup-depends: base, - Cabal >=1.4.0.0, + Cabal >=1.22.0.0, directory, filepath, process >=1.0.1.1 @@ -67,11 +67,6 @@ flag network-uri -- Description: Make -new-comp the default -- Default: True -flag custom-binary - Description: Use a customised version of the binary package - Default: True - Manual: True - flag c-runtime Description: Include functionality from the C run-time library (which must be installed already) Default: False @@ -89,17 +84,14 @@ Library exceptions hs-source-dirs: src/runtime/haskell - if flag(custom-binary) - other-modules: - -- not really part of GF but I have changed the original binary library - -- and we have to keep the copy for now. - Data.Binary - Data.Binary.Put - Data.Binary.Get - Data.Binary.Builder - Data.Binary.IEEE754 - else - build-depends: binary, data-binary-ieee754 + other-modules: + -- not really part of GF but I have changed the original binary library + -- and we have to keep the copy for now. + Data.Binary + Data.Binary.Put + Data.Binary.Get + Data.Binary.Builder + Data.Binary.IEEE754 --ghc-options: -fwarn-unused-imports --if impl(ghc>=7.8) diff --git a/src/runtime/haskell/pgf.cabal b/src/runtime/haskell/pgf.cabal index 8a84dc278..76e12bd2c 100644 --- a/src/runtime/haskell/pgf.cabal +++ b/src/runtime/haskell/pgf.cabal @@ -1,5 +1,5 @@ name: pgf -version: 3.9.1-git +version: 3.10 cabal-version: >= 1.20 build-type: Simple @@ -12,11 +12,6 @@ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues maintainer: Thomas Hallgren tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2 -flag custom-binary - Description: Use a customised version of the binary package - Default: True - Manual: True - Library default-language: Haskell2010 build-depends: base >= 4.6 && <5, @@ -29,17 +24,14 @@ Library mtl, exceptions - if flag(custom-binary) - other-modules: - -- not really part of GF but I have changed the original binary library - -- and we have to keep the copy for now. - Data.Binary - Data.Binary.Put - Data.Binary.Get - Data.Binary.Builder - Data.Binary.IEEE754 - else - build-depends: binary, data-binary-ieee754 + other-modules: + -- not really part of GF but I have changed the original binary library + -- and we have to keep the copy for now. + Data.Binary + Data.Binary.Put + Data.Binary.Get + Data.Binary.Builder + Data.Binary.IEEE754 --ghc-options: -fwarn-unused-imports --if impl(ghc>=7.8) |