merge from git-annex

and simplify configure

Build/Configure.hs

@@ -1,31 +1,33 @@
-{- Checks system configuration and generates SysConfig. -}
+{- Checks system configuration and generates Build/SysConfig. -}
 
 {-# OPTIONS_GHC -fno-warn-tabs #-}
 
 module Build.Configure where
 
-import Control.Monad.IfElse
-import Control.Applicative
-import Prelude
-
 import Build.TestConfig
-import Build.Version
-import Git.Version
+import Utility.Env.Basic
+import qualified Git.Version
+
+import Control.Monad
 
 tests :: [TestCase]
 tests =
- [ TestCase "version" (Config "packageversion" . StringConfig <$> getVersion)
- , TestCase "git" $ testCmd "git" "git --version >/dev/null"
+ [ TestCase "git" $ testCmd "git" "git --version >/dev/null"
  , TestCase "git version" getGitVersion
  ]
 
 getGitVersion :: Test
-getGitVersion = Config "gitversion" . StringConfig . show
- <$> Git.Version.installed
+getGitVersion = go =<< getEnv "FORCE_GIT_VERSION"
+ where
+ go (Just s) = return $ Config "gitversion" $ StringConfig s
+ go Nothing = do
+ v <- Git.Version.installed
+ let oldestallowed = Git.Version.normalize "2.1"
+ when (v < oldestallowed) $
+ error $ "installed git version " ++ show v ++ " is too old! (Need " ++ show oldestallowed ++ " or newer)"
+ return $ Config "gitversion" $ StringConfig $ show v
 
 run :: [TestCase] -> IO ()
 run ts = do
  config <- runTests ts
  writeSysConfig config
- whenM (isReleaseBuild) $
- cabalSetup "git-repair.cabal"

Build/TestConfig.hs

@@ -7,7 +7,7 @@ module Build.TestConfig where
 import Utility.Path
 import Utility.Monad
 import Utility.SafeCommand
-import Utility.Directory
+import Utility.SystemDirectory
 
 import System.IO
 import System.FilePath

git-repair.cabal

@@ -59,7 +59,6 @@ Executable git-repair
  BuildInfo
  Build.Configure
  Build.TestConfig
- Build.Version
  Common
  Git
  Git.Branch