diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Backend/SHA.hs | 2 | ||||
| -rw-r--r-- | Build/TestConfig.hs (renamed from TestConfig.hs) | 8 | ||||
| -rw-r--r-- | Command/Add.hs | 2 | ||||
| -rw-r--r-- | Command/AddUrl.hs | 4 | ||||
| -rw-r--r-- | Command/Map.hs | 2 | ||||
| -rw-r--r-- | Command/Version.hs | 2 | ||||
| -rw-r--r-- | Content.hs | 2 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | Remote/Bup.hs | 2 | ||||
| -rw-r--r-- | Remote/Git.hs | 4 | ||||
| -rw-r--r-- | Remote/Web.hs | 2 | ||||
| -rw-r--r-- | UUID.hs | 2 | ||||
| -rw-r--r-- | Utility/CopyFile.hs | 2 | ||||
| -rw-r--r-- | Utility/Ssh.hs (renamed from Remote/Helper/Ssh.hs) | 2 | ||||
| -rw-r--r-- | Utility/StatFS.hsc (renamed from StatFS.hsc) | 2 | ||||
| -rw-r--r-- | Utility/Touch.hsc (renamed from Touch.hsc) | 2 | ||||
| -rw-r--r-- | Utility/Url.hs (renamed from Remote/Helper/Url.hs) | 4 | ||||
| -rw-r--r-- | configure.hs | 2 |
19 files changed, 28 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore index d5bf54c81..1fdad216d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.o test configure -SysConfig.hs +Build/SysConfig.hs git-annex git-annex-shell git-union-merge diff --git a/Backend/SHA.hs b/Backend/SHA.hs index bae19be00..b8a0d254b 100644 --- a/Backend/SHA.hs +++ b/Backend/SHA.hs @@ -24,7 +24,7 @@ import Types import Types.Backend import Types.Key import Utility -import qualified SysConfig +import qualified Build.SysConfig as SysConfig type SHASize = Int diff --git a/TestConfig.hs b/Build/TestConfig.hs index 8cfae7f0c..e8a0d1336 100644 --- a/TestConfig.hs +++ b/Build/TestConfig.hs @@ -1,6 +1,6 @@ -{- Tests the system and generates SysConfig.hs. -} +{- Tests the system and generates Build.SysConfig.hs. -} -module TestConfig where +module Build.TestConfig where import System.IO import System.Cmd @@ -33,12 +33,12 @@ instance Show Config where valuetype (MaybeStringConfig _) = "Maybe String" writeSysConfig :: [Config] -> IO () -writeSysConfig config = writeFile "SysConfig.hs" body +writeSysConfig config = writeFile "Build/SysConfig.hs" body where body = unlines $ header ++ map show config ++ footer header = [ "{- Automatically generated. -}" - , "module SysConfig where" + , "module Build.SysConfig where" , "" ] footer = [] diff --git a/Command/Add.hs b/Command/Add.hs index d8947fb07..407a36093 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -24,7 +24,7 @@ import Types import Content import Messages import Utility -import Touch +import Utility.Touch import Locations command :: [Command] diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index add71c820..72a6b671d 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -14,7 +14,7 @@ import System.Directory import Command import qualified Backend -import qualified Remote.Helper.Url +import qualified Utility.Url as Url import qualified Remote.Web import qualified Command.Add import qualified Annex @@ -53,7 +53,7 @@ download url file = do let dummykey = Backend.URL.fromUrl url let tmp = gitAnnexTmpLocation g dummykey liftIO $ createDirectoryIfMissing True (parentDir tmp) - ok <- Remote.Helper.Url.download url tmp + ok <- Url.download url tmp if ok then do [(_, backend)] <- Backend.chooseBackends [file] diff --git a/Command/Map.hs b/Command/Map.hs index 75c5b0b55..3fd6e42a1 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -22,7 +22,7 @@ import Types import Utility import UUID import Trust -import Remote.Helper.Ssh +import Utility.Ssh import qualified Utility.Dot as Dot -- a link from the first repository to the second (its remote) diff --git a/Command/Version.hs b/Command/Version.hs index 2392c9bf6..1ff829a22 100644 --- a/Command/Version.hs +++ b/Command/Version.hs @@ -12,7 +12,7 @@ import Data.String.Utils import Data.Maybe import Command -import qualified SysConfig +import qualified Build.SysConfig as SysConfig import Version command :: [Command] diff --git a/Content.hs b/Content.hs index c63042dfb..e89f4c45a 100644 --- a/Content.hs +++ b/Content.hs @@ -41,7 +41,7 @@ import qualified Annex import qualified AnnexQueue import qualified Branch import Utility -import StatFS +import Utility.StatFS import Types.Key import Utility.DataUnits import Config @@ -8,12 +8,11 @@ GHCMAKE=ghc $(GHCFLAGS) --make bins=git-annex git-annex-shell git-union-merge mans=git-annex.1 git-annex-shell.1 git-union-merge.1 +sources=Build/SysConfig.hs Utility/StatFS.hs Utility/Touch.hs Remote/S3.hs all: $(bins) $(mans) docs -sources: SysConfig.hs StatFS.hs Touch.hs Remote/S3.hs - -SysConfig.hs: configure.hs TestConfig.hs +Build/SysConfig.hs: configure.hs Build/TestConfig.hs $(GHCMAKE) configure ./configure @@ -30,7 +29,7 @@ Remote/S3.o: Remote/S3.hs echo "** building without S3 support"; \ fi -$(bins): SysConfig.hs Touch.hs StatFS.hs Remote/S3.o +$(bins): $(sources) $(GHCMAKE) $@ git-annex.1: doc/git-annex.mdwn @@ -82,8 +81,7 @@ docs: $(mans) --exclude='news/.*' clean: - rm -rf build $(bins) $(mans) test configure *.tix .hpc \ - StatFS.hs Touch.hs SysConfig.hs Remote/S3.hs + rm -rf build $(bins) $(mans) test configure *.tix .hpc $(sources) rm -rf doc/.ikiwiki html dist find . \( -name \*.o -or -name \*.hi \) -exec rm {} \; diff --git a/Remote/Bup.hs b/Remote/Bup.hs index c82f84745..069209792 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -30,7 +30,7 @@ import Locations import Config import Utility import Messages -import Remote.Helper.Ssh +import Utility.Ssh import Remote.Helper.Special import Remote.Helper.Encryptable import Crypto diff --git a/Remote/Git.hs b/Remote/Git.hs index d8ecd33c4..80ba8a153 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -25,8 +25,8 @@ import qualified Content import Messages import Utility.CopyFile import Utility.RsyncFile -import Remote.Helper.Ssh -import qualified Remote.Helper.Url as Url +import Utility.Ssh +import qualified Utility.Url as Url import Config import Init diff --git a/Remote/Web.hs b/Remote/Web.hs index cc96d5306..5bc6a204b 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -24,7 +24,7 @@ import Config import PresenceLog import LocationLog import Locations -import qualified Remote.Helper.Url as Url +import qualified Utility.Url as Url type URLString = String @@ -33,7 +33,7 @@ import qualified Branch import Types import Types.UUID import qualified Annex -import qualified SysConfig +import qualified Build.SysConfig as SysConfig import Config configkey :: String diff --git a/Utility/CopyFile.hs b/Utility/CopyFile.hs index 2e06dd92b..befb00f8f 100644 --- a/Utility/CopyFile.hs +++ b/Utility/CopyFile.hs @@ -10,7 +10,7 @@ module Utility.CopyFile (copyFile) where import System.Directory (doesFileExist, removeFile) import Utility -import qualified SysConfig +import qualified Build.SysConfig as SysConfig {- The cp command is used, because I hate reinventing the wheel, - and because this allows easy access to features like cp --reflink. -} diff --git a/Remote/Helper/Ssh.hs b/Utility/Ssh.hs index 478b01881..6cbc362a0 100644 --- a/Remote/Helper/Ssh.hs +++ b/Utility/Ssh.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Remote.Helper.Ssh where +module Utility.Ssh where import Control.Monad.State (liftIO) diff --git a/StatFS.hsc b/Utility/StatFS.hsc index feb82aa9a..d3e4a507e 100644 --- a/StatFS.hsc +++ b/Utility/StatFS.hsc @@ -45,7 +45,7 @@ {-# LANGUAGE CPP, ForeignFunctionInterface, EmptyDataDecls #-} -module StatFS ( FileSystemStats(..), getFileSystemStats ) where +module Utility.StatFS ( FileSystemStats(..), getFileSystemStats ) where import Foreign import Foreign.C.Types diff --git a/Touch.hsc b/Utility/Touch.hsc index dd0c38984..f27ac3136 100644 --- a/Touch.hsc +++ b/Utility/Touch.hsc @@ -7,7 +7,7 @@ {-# LANGUAGE ForeignFunctionInterface #-} -module Touch ( +module Utility.Touch ( TimeSpec(..), touchBoth, touch diff --git a/Remote/Helper/Url.hs b/Utility/Url.hs index af1fee8f0..5954e0ff7 100644 --- a/Remote/Helper/Url.hs +++ b/Utility/Url.hs @@ -1,11 +1,11 @@ -{- Url downloading for remotes. +{- Url downloading. - - Copyright 2011 Joey Hess <joey@kitenet.net> - - Licensed under the GNU GPL version 3 or higher. -} -module Remote.Helper.Url ( +module Utility.Url ( exists, download, get diff --git a/configure.hs b/configure.hs index bfdfa32dd..9f7179c53 100644 --- a/configure.hs +++ b/configure.hs @@ -3,7 +3,7 @@ import System.Directory import Data.List -import TestConfig +import Build.TestConfig tests :: [TestCase] tests = |