GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-29 14:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove custom-binary flag; update Cabal version restriction; bump version to 3.10

Browse Source
This commit is contained in:
John J. Camilleri
2018-11-28 13:36:11 +01:00
parent abf3911b70
commit 397f18a298
2 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gf.cabal
View File

@@ -1,5 +1,5 @@
name: gf name: gf
version: 3.9-git version: 3.10
cabal-version: >= 1.22 cabal-version: >= 1.22
build-type: Custom build-type: Custom
@@ -42,7 +42,7 @@ data-files:
custom-setup custom-setup
setup-depends: setup-depends:
base, base,
Cabal >=1.4.0.0, Cabal >=1.22.0.0,
directory, directory,
filepath, filepath,
process >=1.0.1.1 process >=1.0.1.1
@@ -67,11 +67,6 @@ flag network-uri
-- Description: Make -new-comp the default -- Description: Make -new-comp the default
-- Default: True -- Default: True
flag custom-binary
Description: Use a customised version of the binary package
Default: True
Manual: True
flag c-runtime flag c-runtime
Description: Include functionality from the C run-time library (which must be installed already) Description: Include functionality from the C run-time library (which must be installed already)
Default: False Default: False
@@ -89,17 +84,14 @@ Library
exceptions exceptions
hs-source-dirs: src/runtime/haskell hs-source-dirs: src/runtime/haskell
if flag(custom-binary) other-modules:
other-modules: -- not really part of GF but I have changed the original binary library
-- not really part of GF but I have changed the original binary library -- and we have to keep the copy for now.
-- and we have to keep the copy for now. Data.Binary
Data.Binary Data.Binary.Put
Data.Binary.Put Data.Binary.Get
Data.Binary.Get Data.Binary.Builder
Data.Binary.Builder Data.Binary.IEEE754
Data.Binary.IEEE754
else
build-depends: binary, data-binary-ieee754
--ghc-options: -fwarn-unused-imports --ghc-options: -fwarn-unused-imports
--if impl(ghc>=7.8) --if impl(ghc>=7.8)

26
src/runtime/haskell/pgf.cabal
View File

@@ -1,5 +1,5 @@
name: pgf name: pgf
version: 3.9.1-git version: 3.10
cabal-version: >= 1.20 cabal-version: >= 1.20
build-type: Simple build-type: Simple
@@ -12,11 +12,6 @@ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
maintainer: Thomas Hallgren maintainer: Thomas Hallgren
tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2 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 Library
default-language: Haskell2010 default-language: Haskell2010
build-depends: base >= 4.6 && <5, build-depends: base >= 4.6 && <5,
@@ -29,17 +24,14 @@ Library
mtl, mtl,
exceptions exceptions
if flag(custom-binary) other-modules:
other-modules: -- not really part of GF but I have changed the original binary library
-- not really part of GF but I have changed the original binary library -- and we have to keep the copy for now.
-- and we have to keep the copy for now. Data.Binary
Data.Binary Data.Binary.Put
Data.Binary.Put Data.Binary.Get
Data.Binary.Get Data.Binary.Builder
Data.Binary.Builder Data.Binary.IEEE754
Data.Binary.IEEE754
else
build-depends: binary, data-binary-ieee754
--ghc-options: -fwarn-unused-imports --ghc-options: -fwarn-unused-imports
--if impl(ghc>=7.8) --if impl(ghc>=7.8)