X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Fhtsn.git;a=blobdiff_plain;f=htsn.cabal;h=504b90a5e3ceaf153d474e1681332ce5783afbc4;hp=5f2129d1a1871e6355ad4a5eff335798629fd445;hb=2fdfbb47d343a47f8f552a9a2cd9ca7b49824d30;hpb=37fb7c37076e7ab532354f06a9e8f4a098e6eaf6

diff --git a/htsn.cabal b/htsn.cabal
index 5f2129d..504b90a 100644
--- a/htsn.cabal
+++ b/htsn.cabal
@@ -1,5 +1,5 @@
 name:           htsn
-version:        0.0.4
+version:        0.0.9
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:	Michael Orlitzky <michael@orlitzky.com>
@@ -11,6 +11,7 @@ extra-source-files:
   doc/htsnrc.example
   doc/man1/htsn.1
   doc/init.openrc
+  test/shell/*.test
   test/xml/*.xml
 synopsis:
   Parse XML files from The Sports Network feed.
@@ -89,7 +90,7 @@ description:
   .
   If you specify a file here, logs will be written to it (possibly in
   addition to syslog). Can be either a relative or absolute path. It
-  will not be auto-rotated; use something log logrotate for that.
+  will not be auto-rotated; use something like logrotate for that.
   .
   Default: none
   .
@@ -97,10 +98,11 @@ description:
   \--log-level
   @
   .
-  How verbose should the logs be? We log notifications at three levels:
-  INFO, WARN, and ERROR. Specify the \"most boring\" level of
+  How verbose should the logs be? We log notifications at four levels:
+  DEBUG, INFO, WARN, and ERROR. Specify the \"most boring\" level of
   notifications you would like to receive (in all-caps); more
-  interesting notifications will be logged as well.
+  interesting notifications will be logged as well. The debug output is
+  extremely verbose and will not be written to syslog even if you try.
   .
   Default: INFO
   .
@@ -128,8 +130,10 @@ description:
   .
   (Daemon mode only) Create a PID file in the given location. This is
   used by the init system on Unix to keep track of the running daemon.
-  Its parent directory must be writable by the user/group that we will
-  run as!
+  .
+  If necessary, its parent directory will be created with owner/group
+  set to the appropriate user/group, but at most one directory will
+  be created (that is, we won't create an entire directory tree).
   .
   Default: \/run\/htsn\/htsn.pid
   .
@@ -189,7 +193,7 @@ description:
   \".htsnrc\" in the user's home directory. The latter will override
   the former.
   .
-  The user's home directory is simply $HOME on Unix; on Windows its
+  The user's home directory is simply $HOME on Unix; on Windows it's
   wherever %APPDATA% points. The system configuration directory
   is determined by Cabal; the /sysconfdir/ parameter during
   the \"configure\" step is used.
@@ -213,9 +217,9 @@ executable htsn
     htsn-common                 == 0.0.1,
     hxt                         == 9.3.*,
     MissingH                    == 1.2.*,
-    network                     == 2.4.*,
-    tasty                       == 0.7.*,
-    tasty-hunit                 == 0.4.*,
+    network                     >= 2.4 && < 2.6,
+    tasty                       == 0.8.*,
+    tasty-hunit                 == 0.8.*,
     unix                        == 2.6.*
 
   main-is:
@@ -244,16 +248,12 @@ executable htsn
     -fwarn-incomplete-record-updates
     -fwarn-monomorphism-restriction
     -fwarn-unused-do-bind
-    -rtsopts
-    -threaded
-    -optc-O3
-    -optc-march=native
     -O2
 
   ghc-prof-options:
     -prof
-    -auto-all
-    -caf-all
+    -fprof-auto
+    -fprof-cafs
 
 
 
@@ -273,8 +273,46 @@ test-suite testsuite
     hxt                         == 9.3.*,
     MissingH                    == 1.2.*,
     network                     == 2.4.*,
-    tasty                       == 0.7.*,
-    tasty-hunit                 == 0.4.*,
+    tasty                       == 0.8.*,
+    tasty-hunit                 == 0.8.*,
+    unix                        == 2.6.*
+
+  -- It's not entirely clear to me why I have to reproduce all of this.
+  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
+    -O2
+
+
+-- These won't work without shelltestrunner installed in your
+-- $PATH. Maybe there is some way to tell Cabal that.
+test-suite shelltests
+  type: exitcode-stdio-1.0
+  hs-source-dirs: src test
+  main-is: ShellTests.hs
+  build-depends:
+    base                        == 4.*,
+    cmdargs                     >= 0.10.6,
+    configurator                == 0.2.*,
+    directory                   == 1.2.*,
+    filepath                    == 1.3.*,
+    hdaemonize                  == 0.4.*,
+    hslogger                    == 1.2.*,
+    htsn-common                 == 0.0.1,
+    hxt                         == 9.3.*,
+    MissingH                    == 1.2.*,
+    network                     == 2.4.*,
+    process                     == 1.1.*,
+    tasty                       == 0.8.*,
+    tasty-hunit                 == 0.8.*,
     unix                        == 2.6.*
 
   -- It's not entirely clear to me why I have to reproduce all of this.
@@ -289,10 +327,6 @@ test-suite testsuite
     -fwarn-incomplete-record-updates
     -fwarn-monomorphism-restriction
     -fwarn-unused-do-bind
-    -rtsopts
-    -threaded
-    -optc-O3
-    -optc-march=native
     -O2