mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make configure -Wall clean

Browse source
This commit is contained in:
Joey Hess 2014-03-10 16:59:38 -04:00
parent 1f1ac8b838
commit b04f62a962
4 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Build/Configure.hs
View file

@ -3,20 +3,14 @@
module Build.Configure where module Build.Configure where
import System.Directory import System.Directory
import Data.List
import System.Process
import Control.Applicative import Control.Applicative
import System.FilePath
import System.Environment (getArgs) import System.Environment (getArgs)
import Data.Maybe
import Control.Monad.IfElse import Control.Monad.IfElse
import Control.Monad import Control.Monad
import Data.Char
import Build.TestConfig import Build.TestConfig
import Build.Version import Build.Version
import Utility.SafeCommand import Utility.SafeCommand
import Utility.Monad
import Utility.ExternalSHA import Utility.ExternalSHA
import Utility.Env import Utility.Env
import qualified Git.Version import qualified Git.Version

2
Build/DesktopFile.hs
View file

@ -24,9 +24,7 @@ import System.Directory
import System.Environment import System.Environment
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import System.Posix.User import System.Posix.User
import System.Posix.Files
#endif #endif
import System.FilePath
import Data.Maybe import Data.Maybe
systemwideInstall :: IO Bool systemwideInstall :: IO Bool

2
Build/TestConfig.hs
View file

@ -7,8 +7,6 @@ import Utility.Monad
import Utility.SafeCommand import Utility.SafeCommand
import System.IO import System.IO
import System.Cmd
import System.Exit
import System.FilePath import System.FilePath
import System.Directory import System.Directory

11
Setup.hs
View file

@ -16,15 +16,14 @@ import System.Directory
import qualified Build.DesktopFile as DesktopFile import qualified Build.DesktopFile as DesktopFile
import qualified Build.Configure as Configure import qualified Build.Configure as Configure
main :: IO ()
main = defaultMainWithHooks simpleUserHooks main = defaultMainWithHooks simpleUserHooks
{ preConf = configure { preConf = \_ _ -> do
Configure.run Configure.tests
return (Nothing, [])
, postInst = myPostInst , postInst = myPostInst
} }
configure _ _ = do
Configure.run Configure.tests
return (Nothing, [])
myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO () myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
myPostInst _ (InstallFlags { installVerbosity }) pkg lbi = do myPostInst _ (InstallFlags { installVerbosity }) pkg lbi = do
installGitAnnexShell dest verbosity pkg lbi installGitAnnexShell dest verbosity pkg lbi
@ -57,7 +56,7 @@ installManpages copyDest verbosity pkg lbi =
manpages = ["git-annex.1", "git-annex-shell.1"] manpages = ["git-annex.1", "git-annex-shell.1"]
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
installDesktopFile copyDest verbosity pkg lbi = installDesktopFile copyDest _verbosity pkg lbi =
DesktopFile.install $ dstBinDir </> "git-annex" DesktopFile.install $ dstBinDir </> "git-annex"
where where
dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest