git.iko.soy/Idris-dev
on master help sign in
Lint in Setup.hs
afe0a56Echo Nolan
Setup.hs+9−11
compare with master
unifiedsplit
@@ -83,13 +83,11 @@ isFreestanding flags =
83-- -----------------------------------------------------------------------------
83-- -----------------------------------------------------------------------------
84-- Clean
84-- Clean
85
85
86−idrisClean _ flags _ _ = do
86+idrisClean _ flags _ _ = cleanStdLib
87− cleanStdLib
88 where
87 where
89 verbosity = S.fromFlag $ S.cleanVerbosity flags
88 verbosity = S.fromFlag $ S.cleanVerbosity flags
90
89
91− cleanStdLib = do
92− makeClean "libs"
90+ cleanStdLib = makeClean "libs"
93
91
94 makeClean dir = make verbosity [ "-C", dir, "clean", "IDRIS=idris" ]
92 makeClean dir = make verbosity [ "-C", dir, "clean", "IDRIS=idris" ]
95
93
@@ -108,7 +106,7 @@ generateVersionModule verbosity dir release = do
108 hash <- gitHash
106 hash <- gitHash
109 let versionModulePath = dir </> "Version_idris" Px.<.> "hs"
107 let versionModulePath = dir </> "Version_idris" Px.<.> "hs"
110 putStrLn $ "Generating " ++ versionModulePath ++
108 putStrLn $ "Generating " ++ versionModulePath ++
111− if release then " for release" else (" for prerelease " ++ hash)
109+ if release then " for release" else " for prerelease " ++ hash
112 createDirectoryIfMissingVerbose verbosity True dir
110 createDirectoryIfMissingVerbose verbosity True dir
113 rewriteFile versionModulePath (versionModuleContents hash)
111 rewriteFile versionModulePath (versionModuleContents hash)
114
112
@@ -120,7 +118,7 @@ generateVersionModule verbosity dir release = do
120
118
121-- Generate a module that contains the lib path for a freestanding Idris
119-- Generate a module that contains the lib path for a freestanding Idris
122generateTargetModule verbosity dir targetDir = do
120generateTargetModule verbosity dir targetDir = do
123− absPath <- return $ isAbsolute targetDir
121+ let absPath = isAbsolute targetDir
124 let targetModulePath = dir </> "Target_idris" Px.<.> "hs"
122 let targetModulePath = dir </> "Target_idris" Px.<.> "hs"
125 putStrLn $ "Generating " ++ targetModulePath
123 putStrLn $ "Generating " ++ targetModulePath
126 createDirectoryIfMissingVerbose verbosity True dir
124 createDirectoryIfMissingVerbose verbosity True dir
@@ -155,15 +153,15 @@ generateToolchainModule verbosity srcDir toolDir = do
155idrisConfigure _ flags _ local = do
153idrisConfigure _ flags _ local = do
156 configureRTS
154 configureRTS
157 generateVersionModule verbosity (autogenModulesDir local) (isRelease (configFlags local))
155 generateVersionModule verbosity (autogenModulesDir local) (isRelease (configFlags local))
158− if (isFreestanding $ configFlags local)
156+ if isFreestanding $ configFlags local
159− then (do
157+ then do
160 toolDir <- lookupEnv "IDRIS_TOOLCHAIN_DIR"
158 toolDir <- lookupEnv "IDRIS_TOOLCHAIN_DIR"
161 generateToolchainModule verbosity (autogenModulesDir local) toolDir
159 generateToolchainModule verbosity (autogenModulesDir local) toolDir
162 targetDir <- lookupEnv "IDRIS_LIB_DIR"
160 targetDir <- lookupEnv "IDRIS_LIB_DIR"
163 case targetDir of
161 case targetDir of
164 Just d -> generateTargetModule verbosity (autogenModulesDir local) d
162 Just d -> generateTargetModule verbosity (autogenModulesDir local) d
165 Nothing -> error $ "Trying to build freestanding without a target directory."
163 Nothing -> error $ "Trying to build freestanding without a target directory."
166− ++ " Set it by defining IDRIS_LIB_DIR.")
164+ ++ " Set it by defining IDRIS_LIB_DIR."
167 else
165 else
168 generateToolchainModule verbosity (autogenModulesDir local) Nothing
166 generateToolchainModule verbosity (autogenModulesDir local) Nothing
169 where
167 where
@@ -179,7 +177,7 @@ idrisConfigure _ flags _ local = do
179idrisPreSDist args flags = do
177idrisPreSDist args flags = do
180 let dir = S.fromFlag (S.sDistDirectory flags)
178 let dir = S.fromFlag (S.sDistDirectory flags)
181 let verb = S.fromFlag (S.sDistVerbosity flags)
179 let verb = S.fromFlag (S.sDistVerbosity flags)
182− generateVersionModule verb ("src") True
180+ generateVersionModule verb "src" True
183 generateTargetModule verb "src" "./libs"
181 generateTargetModule verb "src" "./libs"
184 generateToolchainModule verb "src" Nothing
182 generateToolchainModule verb "src" Nothing
185 preSDist simpleUserHooks args flags
183 preSDist simpleUserHooks args flags
@@ -257,7 +255,7 @@ idrisInstall verbosity copy pkg local = unless (execOnly (configFlags local)) $
257 makeInstall "rts" target'
255 makeInstall "rts" target'
258
256
259 installManPage = do
257 installManPage = do
260− let mandest = (mandir $ L.absoluteInstallDirs pkg local copy) ++ "/man1"
258+ let mandest = mandir (L.absoluteInstallDirs pkg local copy) ++ "/man1"
261 notice verbosity $ unwords ["Copying man page to", mandest]
259 notice verbosity $ unwords ["Copying man page to", mandest]
262 installOrdinaryFiles verbosity mandest [("man", "idris.1")]
260 installOrdinaryFiles verbosity mandest [("man", "idris.1")]
263
261