on master help sign in
Fix source locations for generated version number
b6a14bcDavid Raymond Christiansen
.gitignore+1
@@ -29,3 +29,4 @@ tutorial/*.fdb_latexmk
29tutorial/*.fls
29tutorial/*.fls
30tags
30tags
31TAGS
31TAGS
32+src/Version_idris.hs
Setup.hs+11−2
@@ -127,8 +127,16 @@ idrisConfigure _ flags _ local = do
127idrisPreSDist args flags = do
127idrisPreSDist args flags = do
128 let dir = S.fromFlag (S.sDistDirectory flags)
128 let dir = S.fromFlag (S.sDistDirectory flags)
129 let verb = S.fromFlag (S.sDistVerbosity flags)
129 let verb = S.fromFlag (S.sDistVerbosity flags)
130− generateVersionModule verb (dir </> "dist" </>"build" </> "autogen") True
130+ generateVersionModule verb ("src") True
131 preSDist simpleUserHooks args flags
131 preSDist simpleUserHooks args flags
132+
133+idrisPostSDist args flags desc lbi = do
134+ Control.Exception.catch (do let file = "src" </> "Version_idris" Px.<.> "hs"
135+ putStrLn $ "Removing generated module " ++ file
136+ removeFile file)
137+ (\e -> let e' = (e :: SomeException) in return ())
138+ postSDist simpleUserHooks args flags desc lbi
139+
132-- -----------------------------------------------------------------------------
140-- -----------------------------------------------------------------------------
133-- Build
141-- Build
134
142
@@ -203,4 +211,5 @@ main = defaultMainWithHooks $ simpleUserHooks
203 idrisInstall (S.fromFlag $ S.installVerbosity flags)
211 idrisInstall (S.fromFlag $ S.installVerbosity flags)
204 NoCopyDest pkg local
212 NoCopyDest pkg local
205 , preSDist = idrisPreSDist --do { putStrLn (show args) ; putStrLn (show flags) ; return emptyHookedBuildInfo }
213 , preSDist = idrisPreSDist --do { putStrLn (show args) ; putStrLn (show flags) ; return emptyHookedBuildInfo }
214+ , postSDist = idrisPostSDist
206− }
215+ }
idris.cabal+1−1
@@ -331,7 +331,7 @@ Flag release
331 manual: True
331 manual: True
332
332
333Library
333Library
334− hs-source-dirs: src, dist/build/autogen
334+ hs-source-dirs: src
335 Exposed-modules:
335 Exposed-modules:
336 Idris.Core.CaseTree
336 Idris.Core.CaseTree
337 , Idris.Core.Constraints
337 , Idris.Core.Constraints