on master help sign in
Fix source locations for generated version number
commitb6a14bce539c88da35783b2760afff28d7c4e579 authorDavid Raymond Christiansen <david@davidchristiansen.dk> dateThu 2 Jan 2014, 16:46 (13 years ago) parente985815
3 files changed+13−3
.gitignore+1 Setup.hs+11−2 idris.cabal+1−1
.gitignore+1
@@ -29,3 +29,4 @@ tutorial/*.fdb_latexmk
2929tutorial/*.fls
3030tags
3131TAGS
32+src/Version_idris.hs
Setup.hs+11−2
@@ -127,8 +127,16 @@ idrisConfigure _ flags _ local = do
127127idrisPreSDist args flags = do
128128 let dir = S.fromFlag (S.sDistDirectory flags)
129129 let verb = S.fromFlag (S.sDistVerbosity flags)
130− generateVersionModule verb (dir </> "dist" </>"build" </> "autogen") True
130+ generateVersionModule verb ("src") True
131131 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+
132140-- -----------------------------------------------------------------------------
133141-- Build
134142
@@ -203,4 +211,5 @@ main = defaultMainWithHooks $ simpleUserHooks
203211 idrisInstall (S.fromFlag $ S.installVerbosity flags)
204212 NoCopyDest pkg local
205213 , preSDist = idrisPreSDist --do { putStrLn (show args) ; putStrLn (show flags) ; return emptyHookedBuildInfo }
206− }
214+ , postSDist = idrisPostSDist
215+ }
idris.cabal+1−1
@@ -331,7 +331,7 @@ Flag release
331331 manual: True
332332
333333Library
334− hs-source-dirs: src, dist/build/autogen
334+ hs-source-dirs: src
335335 Exposed-modules:
336336 Idris.Core.CaseTree
337337 , Idris.Core.Constraints