X-Git-Url: https://gitweb.michael.orlitzky.com/?p=spline3.git;a=blobdiff_plain;f=spline3.cabal;h=2e109961e8ded7417f0ba4b0d1f063d22ffdbbd0;hp=0ebc08decc5a95f611db3c19d9944af359ec71c4;hb=4a8105503a3a58eb1b19b74f725a632af2c7d18a;hpb=a1ceb2d031565de4684ad00bbbc72911c37a5f38

diff --git a/spline3.cabal b/spline3.cabal
index 0ebc08d..2e10996 100644
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -1,11 +1,11 @@
 name:           spline3
-version:        0.0.1
+version:        1.0.0
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:	Michael Orlitzky <michael@orlitzky.com>
-homepage:       http://michael.orlitzky.com/code/spline3.php
+homepage:       http://michael.orlitzky.com/code/spline3.xhtml
 category:       Math
-license:        GPL-3
+license:        AGPL-3
 license-file:   doc/LICENSE
 bug-reports:    mailto:michael@orlitzky.com
 synopsis:
@@ -17,7 +17,7 @@ description:
   Stanford volume data archive at <http://graphics.stanford.edu/data/voldata/>.
   .
   For more information and examples, please see the project homepage at
-  <http://michael.orlitzky.com/code/spline3.php>.
+  <http://michael.orlitzky.com/code/spline3.xhtml>.
 
 build-type:     Simple
 extra-source-files:
@@ -31,14 +31,6 @@ extra-source-files:
   doc/results/3d/*.png
   util/view-mri-data.py
 
-flag HPC
-  description: Build with Haskell Program Coverage (HPC) support
-  default:     False
-
-flag LLVM
-  description: Build with LLVM
-  default:     False
-
 
 executable spline3
 
@@ -47,9 +39,9 @@ executable spline3
     cmdargs                     >= 0.10,
     filepath                    >= 1,
     MissingH                    >= 1,
-    repa                        < 3.4,
-    repa-algorithms             < 3.4,
-    repa-io                     < 3.4,
+    repa                        >= 3,
+    repa-algorithms             >= 3,
+    repa-io                     >= 3,
     vector                      >= 0.10,
     -- Additional test dependencies.
     tasty                       >= 0.8,
@@ -75,6 +67,7 @@ executable spline3
     FunctionValues
     Grid
     Misc
+    Paths_spline3
     Point
     RealFunction
     ScaleFactor
@@ -83,39 +76,21 @@ executable spline3
     Volumetric
 
   ghc-options:
-    -Wall
-    -fwarn-hi-shadowing
-    -fwarn-missing-signatures
-    -fwarn-name-shadowing
-    -fwarn-orphans
-    -fwarn-type-defaults
-    -fwarn-tabs
-    -fwarn-incomplete-record-updates
-    -fwarn-monomorphism-restriction
-    -fwarn-unused-do-bind
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
     -funbox-strict-fields
     -fexcess-precision
     -fno-spec-constr-count
     -rtsopts
     -threaded
-
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
-
-  if flag(hpc)
-    ghc-options:
-      -fhpc
+    -O2
+    -optc-O3
+    -optc-march=native
 
   ghc-prof-options:
-    -prof
     -auto-all
     -caf-all
 
@@ -131,36 +106,50 @@ test-suite doctests
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
     -rtsopts
     -threaded
     -funbox-strict-fields
     -fexcess-precision
     -fno-spec-constr-count
-
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
+    -O2
+    -optc-O3
+    -optc-march=native
 
 
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
   main-is: TestSuite.hs
+
+  other-modules:
+    Assertions
+    Cardinal
+    Comparisons
+    Cube
+    Examples
+    Face
+    FunctionValues
+    Grid
+    Misc
+    Point
+    RealFunction
+    ScaleFactor
+    Tetrahedron
+    Values
+
   build-depends:
     base                        < 5,
     cmdargs                     >= 0.10,
     filepath                    >= 1,
     MissingH                    >= 1,
-    repa                        < 3.4,
-    repa-algorithms             < 3.4,
-    repa-io                     < 3.4,
+    repa                        >= 3,
+    repa-algorithms             >= 3,
+    repa-io                     >= 3,
     vector                      >= 0.10,
     -- Additional test dependencies.
     tasty                       >= 0.8,
@@ -169,25 +158,24 @@ test-suite testsuite
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
     -rtsopts
     -threaded
     -funbox-strict-fields
     -fexcess-precision
     -fno-spec-constr-count
 
-  if flag(llvm)
-    ghc-options:
-      -fllvm
-      -optlo-O3
-      -optlc-O3
-  else
-    ghc-options:
-      -O2
-      -optc-O3
-      -optc-march=native
+  ghc-options:
+    -O2
+    -optc-O3
+    -optc-march=native
 
 
 source-repository head
   type: git
-  location: http://michael.orlitzky.com/git/spline3.git
+  location: http://gitweb.michael.orlitzky.com/spline3.git
   branch: master