X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=spline3.cabal;h=41de9859e48a3158e9cb3ca4351fb2945cec891b;hb=790f9a89997d42554cf094e5dc9e9a132bd60f8c;hp=1cf11b826c4d356d529c31aa079bc163c56d465c;hpb=65b90bdda737719a06445ea5ff2af1bd3c52931a;p=spline3.git

diff --git a/spline3.cabal b/spline3.cabal
index 1cf11b8..41de985 100644
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -1,11 +1,11 @@
+cabal-version:  3.0
 name:           spline3
-version:        0.0.2
-cabal-version:  >= 1.8
+version:        1.0.0
 author:         Michael Orlitzky
 maintainer:	Michael Orlitzky <michael@orlitzky.com>
 homepage:       http://michael.orlitzky.com/code/spline3.xhtml
 category:       Math
-license:        AGPL-3
+license:        AGPL-3.0-only
 license-file:   doc/LICENSE
 bug-reports:    mailto:michael@orlitzky.com
 synopsis:
@@ -15,9 +15,9 @@ description:
   by cubic C^1 splines on type-6 tetrahedral partitions." The defaults
   are tailored to the MRI data contained in data/mri.bin from the
   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,27 +31,25 @@ extra-source-files:
   doc/results/3d/*.png
   util/view-mri-data.py
 
-flag LLVM
-  description: Build with LLVM
-  default:     False
-
 
 executable spline3
 
   build-depends:
-    base                        < 5,
+    base                        >= 4.15 && < 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,
     tasty-hunit                 >= 0.8,
     tasty-quickcheck            >= 0.8.1
 
+  default-language:
+    Haskell2010
+
   main-is:
     Main.hs
 
@@ -71,6 +69,7 @@ executable spline3
     FunctionValues
     Grid
     Misc
+    Paths_spline3
     Point
     RealFunction
     ScaleFactor
@@ -78,106 +77,51 @@ executable spline3
     Values
     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
-    -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
-
-  ghc-prof-options:
-    -prof
-    -auto-all
-    -caf-all
-
+  autogen-modules:
+    Paths_spline3
 
 test-suite doctests
   type: exitcode-stdio-1.0
   hs-source-dirs: test
+  default-language: Haskell2010
   main-is: Doctests.hs
   build-depends:
-    base                        < 5,
+    base                        >= 4.15 && < 5,
     -- Additional test dependencies.
     doctest                     >= 0.9
 
-  -- It's not entirely clear to me why I have to reproduce all of this.
-  ghc-options:
-    -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
-
 
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
+  default-language: Haskell2010
   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,
+    base                        >= 4.15 && < 5,
+    repa                        >= 3,
     vector                      >= 0.10,
     -- Additional test dependencies.
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8,
     tasty-quickcheck            >= 0.8.1
 
-  -- It's not entirely clear to me why I have to reproduce all of this.
-  ghc-options:
-    -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
-
 
 source-repository head
   type: git