diff --git a/swish.cabal b/swish.cabal --- a/swish.cabal +++ b/swish.cabal @@ -1,5 +1,5 @@ Name: swish -Version: 0.6.5.1 +Version: 0.6.5.2 Stability: experimental License: LGPL License-file: LICENSE @@ -46,6 +46,11 @@ . Changes: . + [Version 0.6.5.2] Update cabal to allow @polyparse@ version @1.8@ + and hopefully to build with ghc 7.4. The tests and application now + build against the library rather than re-compiling (internal + change only, thanks to a hint seen on haskell-cafe a while back). + . [Version 0.6.5.1] Haddock fixes for @0.6.5.0@. . [Version 0.6.5.0] Export "Swish.RDF.TurtleFormatter.parseText". @@ -206,14 +211,19 @@ directory >= 1.0 && < 1.2, filepath >= 1.1 && < 1.4, hashable == 1.1.*, - intern == 0.8.*, + -- intern == 0.8, mtl >= 2 && < 3, network >= 2.2 && < 2.4, old-locale == 1.0.*, - polyparse >= 1.6 && < 1.8, + polyparse >= 1.6 && < 1.9, text == 0.11.*, time >= 1.1 && < 1.5 + if impl(ghc < 7.4.0) + Build-Depends: intern == 0.8 + if impl(ghc >= 7.4.0) + Build-Depends: intern == 0.8.* + Hs-Source-Dirs: src/ Exposed-Modules: @@ -274,9 +284,6 @@ Swish.Utils.ShowM Data.Interned.URI - other-modules: - -- Paths_swish - ghc-options: -Wall -fno-warn-orphans @@ -286,406 +293,234 @@ Test-Suite test-builtinmap type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: BuiltInMapTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - text == 0.11.*, - old-locale == 1.0.*, - network >= 2.2 && < 2.4, - hashable == 1.1.*, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - mtl >= 2 && < 3, - polyparse >= 1.6 && < 1.8, - time >= 1.1 && < 1.5 + HUnit == 1.2.*, + swish Test-Suite test-graphpartition type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: GraphPartitionTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3 + HUnit == 1.2.*, + swish Test-Suite test-graph type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: GraphTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3 + HUnit == 1.2.*, + swish Test-Suite test-nt type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: NTTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, - network >= 2.2 && < 2.4, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - time >= 1.1 && < 1.5, - polyparse >= 1.6 && < 1.8 + HUnit == 1.2.*, + swish, + text == 0.11.* Test-Suite test-n3parser type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: N3ParserTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - time >= 1.1 && < 1.5, - polyparse >= 1.6 && < 1.8 + swish, + text == 0.11.* Test-Suite test-n3formatter type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: N3FormatterTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - time >= 1.1 && < 1.5, - polyparse >= 1.6 && < 1.8 + swish, + text == 0.11.* Test-Suite test-rdfdatatypexsdinteger type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: RDFDatatypeXsdIntegerTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - time >= 1.1 && < 1.5, - polyparse >= 1.6 && < 1.8 + swish, + text == 0.11.* Test-Suite test-rdfgraph type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: RDFGraphTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - time >= 1.1 && < 1.5, old-locale == 1.0.*, - intern == 0.8.*, - directory >= 1.0 && < 1.2 + swish, + text == 0.11.*, + time >= 1.1 && < 1.5 Test-Suite test-rdfproofcontext type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: RDFProofContextTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - time >= 1.1 && < 1.5, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - polyparse >= 1.6 && < 1.8 + swish, + text == 0.11.* Test-Suite test-rdfproof type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: RDFProofTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - time >= 1.1 && < 1.5, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - polyparse >= 1.6 && < 1.8 + swish, + text == 0.11.* Test-Suite test-rdfquery type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: RDFQueryTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - time >= 1.1 && < 1.5, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - polyparse >= 1.6 && < 1.8 + swish, + text == 0.11.* Test-Suite test-rdfruleset type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: RDFRulesetTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - hashable == 1.1.*, - mtl >= 2 && < 3, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - time >= 1.1 && < 1.5, - intern == 0.8.*, - directory >= 1.0 && < 1.2, - old-locale == 1.0.*, - polyparse >= 1.6 && < 1.8 + swish, + text == 0.11.* Test-Suite test-varbinding type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: VarBindingTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - text == 0.11.*, - network >= 2.2 && < 2.4, - intern == 0.8.*, - hashable == 1.1.*, - directory >= 1.0 && < 1.2 + HUnit == 1.2.*, + swish Test-Suite test-lookupmap type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: LookupMapTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: + base >=3 && < 5, HUnit == 1.2.*, - base >=3 && < 5 + swish Test-Suite test-qname type: exitcode-stdio-1.0 - Hs-Source-Dirs: tests/ src/ + Hs-Source-Dirs: tests/ Main-Is: QNameTest.hs Other-Modules: TestHelpers - -- if flag(hpc) - -- ghc-options: -fhpc - -- - -- if flag(developer) - -- ghc-options: -Werror - -- ghc-prof-options: -auto-all - ghc-options: -Wall -fno-warn-orphans Build-Depends: - HUnit == 1.2.*, base >=3 && < 5, - text == 0.11.*, + HUnit == 1.2.*, network >= 2.2 && < 2.4, - intern == 0.8.*, - hashable == 1.1.*, - directory >= 1.0 && < 1.2 + swish, + text == 0.11.* -- we do not have the data files to run this test Executable SwishTest @@ -693,7 +528,7 @@ Executable Swish Main-Is: SwishApp.hs - Hs-Source-Dirs: app/ src/ + Hs-Source-Dirs: app/ Other-Modules: Paths_swish ghc-options: @@ -705,15 +540,4 @@ Build-Depends: base >=3 && < 5, - binary == 0.5.*, - containers >= 0.3 && < 0.5, - directory >= 1.0 && < 1.2, - filepath >= 1.1 && < 1.4, - hashable == 1.1.*, - intern == 0.8.*, - mtl >= 2 && < 3, - network >= 2.2 && < 2.4, - old-locale == 1.0.*, - polyparse >= 1.6 && < 1.8, - text == 0.11.*, - time >= 1.1 && < 1.5 + swish