Permalink
Browse files

use Cabal 1.15.0 exactly.

  • Loading branch information...
1 parent 2663601 commit e94f3e2801590acce3e01741d4a09c1b52a42cd2 @coreyoconnor coreyoconnor committed Aug 4, 2012
Showing with 17 additions and 10 deletions.
  1. +8 −2 src/executable/Main.hs
  2. +5 −5 test/VerifyManagementProcess.hs
  3. +4 −3 yi.cabal
View
@@ -6,8 +6,7 @@
-- The management process is modeled as a state machine. The initial state is process start and the
-- final states are process termination.
--
-
-module Main (main, main_) where
+module Main where
import Prelude hiding ( catch )
@@ -19,10 +18,12 @@ import Control.Applicative
import Control.Exception
import Data.Monoid
+import Data.Version
import Distribution.Text ( display )
import System.Console.GetOpt
+
import System.Directory
import System.Environment
import System.Exit
@@ -36,9 +37,14 @@ appDir = getAppUserDataDirectory "yi"
info :: HPrintfType r => String -> r
info format = hPrintf stderr format
+data PackageSource
+ = Installed Version
+ | SourceDir FilePath
+
data YiSystem where
-- Initial state. Parameterized by command line arguments.
Init :: [String] -> YiSystem
+ Boot :: SystemInfo -> YiSystem
Die :: Int -> String -> YiSystem
Exit :: YiSystem
@@ -9,19 +9,19 @@ import Yi.Test.BatchInteract
import Yi.Test.Prelude
tests :: IO [Test]
-tests = return $ concat [ verify_v_opts, verify_info_opts ]
+tests = return $ concat [ version_opts_tests, info_opts_tests ]
-verify_v_opts :: [Test]
-verify_v_opts = foldMap tests_for_version_opt ["-v", "--version"]
+version_opts_tests :: [Test]
+version_opts_tests = foldMap tests_for_version_opt ["-v", "--version"]
where
tests_for_version_opt v_opt =
[ verify_stdout v_opt [v_opt] $ \out -> do
let expected = "^version: .*$"
assert (out =~ expected) "output did not include version"
]
-verify_info_opts :: [Test]
-verify_info_opts =
+info_opts_tests :: [Test]
+info_opts_tests =
[ verify_stdout "raw info is parsable" ["--raw-info"] $ \out -> do
let parsed_info :: SystemInfo = read out
assert (show parsed_info == out) "raw info read/show isomorphism"
View
@@ -11,7 +11,7 @@ author: AUTHORS
maintainer: yi-devel@googlegroups.com
homepage: http://haskell.org/haskellwiki/Yi
bug-reports: http://code.google.com/p/yi-editor/issues/list
-Cabal-Version: >= 1.14.0
+Cabal-Version: >= 1.15.0
tested-with: GHC==7.4.1
build-type: Custom
@@ -30,7 +30,7 @@ executable yi
filepath == 1.*,
mtl == 2.*,
process == 1.*,
- Cabal >= 1.14.0
+ Cabal == 1.15.*
ghc-options: -threaded
test-suite verify-management-process
@@ -52,6 +52,7 @@ test-suite verify-management-process
filepath == 1.*,
mtl == 2.*,
process == 1.*,
- Cabal >= 1.14.0,
+ Cabal == 1.15.*,
regex-posix >= 0.95.1
ghc-options: -threaded
+

0 comments on commit e94f3e2

Please sign in to comment.