X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=spline3.cabal;h=2fc7b13f9162800d404466360838a8db3dd237c9;hb=25e5b7ede93ded8e1ed0fc81f4c3979ff500309d;hp=e09f80472e8eaf05044a0f6f0ae836eb01441a78;hpb=b494ff845304fe1f255130539e271e6bfc2a5d3e;p=spline3.git

diff --git a/spline3.cabal b/spline3.cabal
index e09f804..2fc7b13 100644
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -1,47 +1,52 @@
 name:           spline3
-version:        0.0
+version:        0.0.2
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:	Michael Orlitzky <michael@orlitzky.com>
-license:        GPL-3
+homepage:       http://michael.orlitzky.com/code/spline3.xhtml
+category:       Math
+license:        AGPL-3
 license-file:   doc/LICENSE
-homepage:       http://michael.orlitzky.com/code/spline3.php
 bug-reports:    mailto:michael@orlitzky.com
-category:       Math
 synopsis:
   A parallel implementation of the Sorokina/Zeilfelder spline scheme.
 description:
   Interpolate volumetric data according to "Local quasi-interpolation
   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/.
-build-type:     Simple
+  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>.
 
-flag HPC
-  description: Build with Haskell Program Coverage (HPC) support
-  default:     False
-
-flag LLVM
-  description: Build with LLVM
-  default:     False
+build-type:     Simple
+extra-source-files:
+  data/mri.bin
+  data/mri.info
+  data/announcement.txt
+  doc/README
+  -- Don't ship the references for copyright reasons.
+  --doc/references/*.pdf
+  doc/results/2d/*.png
+  doc/results/3d/*.png
+  util/view-mri-data.py
 
 
 executable spline3
+
   build-depends:
-    base                        == 4.5.*,
-    cmdargs                     == 0.10.*,
-    filepath                    == 1.*,
-    MissingH                    == 1.1.*,
-    repa                        == 3.2.*,
-    repa-algorithms             == 3.2.*,
-    repa-io                     == 3.2.*,
-    vector                      == 0.9.*,
+    base                        < 5,
+    cmdargs                     >= 0.10,
+    filepath                    >= 1,
+    MissingH                    >= 1,
+    repa                        >= 3,
+    repa-algorithms             >= 3,
+    repa-io                     >= 3,
+    vector                      >= 0.10,
     -- Additional test dependencies.
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.*,
-    test-framework              == 0.6.*,
-    test-framework-hunit        == 0.2.*,
-    test-framework-quickcheck2  == 0.2.*
+    tasty                       >= 0.8,
+    tasty-hunit                 >= 0.8,
+    tasty-quickcheck            >= 0.8.1
 
   main-is:
     Main.hs
@@ -49,6 +54,27 @@ executable spline3
   hs-source-dirs:
     src/
 
+  other-modules:
+    Assertions
+    Cardinal
+    CommandLine
+    Comparisons
+    Cube
+    Everything
+    Examples
+    ExitCodes
+    Face
+    FunctionValues
+    Grid
+    Misc
+    Paths_spline3
+    Point
+    RealFunction
+    ScaleFactor
+    Tetrahedron
+    Values
+    Volumetric
+
   ghc-options:
     -Wall
     -fwarn-hi-shadowing
@@ -66,23 +92,12 @@ executable spline3
     -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
+  ghc-options:
+    -O2
+    -optc-O3
+    -optc-march=native
 
   ghc-prof-options:
-    -prof
     -auto-all
     -caf-all
 
@@ -92,9 +107,9 @@ test-suite doctests
   hs-source-dirs: test
   main-is: Doctests.hs
   build-depends:
-    base                        == 4.5.*,
+    base                        < 5,
     -- Additional test dependencies.
-    doctest                     == 0.7.*
+    doctest                     >= 0.9
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
@@ -104,37 +119,46 @@ test-suite doctests
     -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
 
 
 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                        == 4.5.*,
-    cmdargs                     == 0.10.*,
-    filepath                    == 1.*,
-    MissingH                    == 1.1.*,
-    repa                        == 3.2.*,
-    repa-algorithms             == 3.2.*,
-    repa-io                     == 3.2.*,
-    vector                      == 0.9.*,
+    base                        < 5,
+    cmdargs                     >= 0.10,
+    filepath                    >= 1,
+    MissingH                    >= 1,
+    repa                        >= 3,
+    repa-algorithms             >= 3,
+    repa-io                     >= 3,
+    vector                      >= 0.10,
     -- Additional test dependencies.
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.*,
-    test-framework              == 0.6.*,
-    test-framework-hunit        == 0.2.*,
-    test-framework-quickcheck2  == 0.2.*
+    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:
@@ -144,19 +168,13 @@ test-suite testsuite
     -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