Fix .cabal file (test didn't build)

haskell-distributed · Oct 22, 2012 · d6a40f5 · d6a40f5
1 parent 98b996e
commit d6a40f5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/distributed-process-simplelocalnet/ChangeLog b/distributed-process-simplelocalnet/ChangeLog
@@ -1,3 +1,7 @@
+<<date>>  Edsko de Vries  <edsko@well-typed.com>  0.2.0.7
+
+* Fix cabal script so that the example program compiles
+
 2012-10-03  Edsko de Vries  <edsko@well-typed.com>  0.2.0.6
 
 * Use new version of network-transport

diff --git a/distributed-process-simplelocalnet/distributed-process-simplelocalnet.cabal b/distributed-process-simplelocalnet/distributed-process-simplelocalnet.cabal
@@ -1,5 +1,5 @@
 Name:          distributed-process-simplelocalnet
-Version:       0.2.0.6
+Version:       0.2.0.7
 Cabal-Version: >=1.8
 Build-Type:    Simple
 License:       BSD3 
@@ -23,6 +23,10 @@ Source-Repository head
   Location: https://github.com/haskell-distributed/distributed-process
   SubDir:   distributed-process-simplelocalnet
 
+Flag build-example
+  Default: False
+  Description: Build a simple example application
+
 Library
   Build-Depends:     base >= 4.4 && < 5,
                      bytestring >= 0.9 && < 0.11,
@@ -43,22 +47,24 @@ Library
   ghc-options:       -Wall
   HS-Source-Dirs:    src
 
--- Not a proper test, but we want to use cabal to compile it
-Test-Suite TestSimpleLocalnet
-  Type:              exitcode-stdio-1.0
+Executable TestSimpleLocalnet
   Main-Is:           TestSimpleLocalnet.hs
-  Build-Depends:     base >= 4.4 && < 5,
-                     bytestring >= 0.9 && < 0.11,
-                     network >= 2.3 && < 2.5,
-                     network-multicast >= 0.0 && < 0.1,
-                     data-accessor >= 0.2 && < 0.3,
-                     binary >= 0.5 && < 0.6,
-                     containers >= 0.4 && < 0.6,
-                     transformers >= 0.2 && < 0.4,
-                     network-transport >= 0.3 && < 0.4,
-                     network-transport-tcp >= 0.3 && < 0.4,
-                     distributed-process >= 0.2 && < 0.5
+  If flag(build-example)
+    Build-Depends:     base >= 4.4 && < 5,
+                       bytestring >= 0.9 && < 0.11,
+                       network >= 2.3 && < 2.5,
+                       network-multicast >= 0.0 && < 0.1,
+                       data-accessor >= 0.2 && < 0.3,
+                       binary >= 0.5 && < 0.6,
+                       containers >= 0.4 && < 0.6,
+                       transformers >= 0.2 && < 0.4,
+                       network-transport >= 0.3 && < 0.4,
+                       network-transport-tcp >= 0.3 && < 0.4,
+                       distributed-process >= 0.2 && < 0.5
+  Else
+    Buildable: False
   Extensions:        RankNTypes,
-                     DeriveDataTypeable
+                     DeriveDataTypeable,
+                     CPP
   ghc-options:       -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind 
   HS-Source-Dirs:    tests src