X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=spline3.cabal;h=6b725613379bc3678734f507135b6640f1ea21e8;hb=a74e394637d73a1fce837458a699713d8edef821;hp=4912de022666de94566cd12c76c83c338bb5037c;hpb=96f3636050e8ebbb94c325ca80ad517eaf6a29ec;p=spline3.git

diff --git a/spline3.cabal b/spline3.cabal
index 4912de0..6b72561 100644
--- a/spline3.cabal
+++ b/spline3.cabal
@@ -16,19 +16,23 @@ flag LLVM
   description: Build with LLVM
   default:     False
 
+
 executable spline3
   build-depends:
-    base                        == 4.4.*,
+    base                        == 4.5.*,
+    cmdargs                     == 0.9.*,
     filepath                    == 1.*,
+    MissingH                    == 1.1.*,
+    repa                        == 3.2.*,
+    repa-algorithms             == 3.2.*,
+    repa-io                     == 3.2.*,
+    vector                      == 0.9.*,
+    -- Additional test dependencies.
     HUnit                       == 1.2.*,
-    QuickCheck                  == 2.4.*,
-    repa                        == 3.*,
-    repa-algorithms             == 3.*,
-    repa-io                     == 3.*,    
-    test-framework              == 0.4.*,
+    QuickCheck                  == 2.*,
+    test-framework              == 0.6.*,
     test-framework-hunit        == 0.2.*,
-    test-framework-quickcheck2  == 0.2.*,
-    vector                      == 0.9.*
+    test-framework-quickcheck2  == 0.2.*
 
   main-is:
     Main.hs
@@ -60,19 +64,90 @@ executable spline3
       -optlc-O3
   else
     ghc-options:
+      -O2
       -optc-O3
       -optc-march=native
 
-  -- GHC's -O2 and -fhpc don't get along too well at the moment.
-  -- Note: this relies on the LLVM/HPC flags being mutually-exclusive.
   if flag(hpc)
     ghc-options:
       -fhpc
-  else
-    ghc-options:
-      -O2
 
   ghc-prof-options:
     -prof
     -auto-all
     -caf-all
+
+
+test-suite doctests
+  type: exitcode-stdio-1.0
+  hs-source-dirs: test
+  main-is: Doctests.hs
+  build-depends:
+    base                        == 4.5.*,
+    -- Additional test dependencies.
+    doctest                     == 0.7.*
+
+  -- 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
+  main-is: TestSuite.hs
+  build-depends:
+    base                        == 4.5.*,
+    cmdargs                     == 0.9.*,
+    filepath                    == 1.*,
+    MissingH                    == 1.1.*,
+    repa                        == 3.2.*,
+    repa-algorithms             == 3.2.*,
+    repa-io                     == 3.2.*,
+    vector                      == 0.9.*,
+    -- Additional test dependencies.
+    HUnit                       == 1.2.*,
+    QuickCheck                  == 2.*,
+    test-framework              == 0.6.*,
+    test-framework-hunit        == 0.2.*,
+    test-framework-quickcheck2  == 0.2.*
+
+  -- 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
+  location: http://michael.orlitzky.com/git/spline3.git
+  branch: master