Skip to content

Commit 6db032d

Browse files
author
Jaro Reinders
committedAug 18, 2021
Use version from Paths_shuffle
1 parent 44bf11d commit 6db032d

File tree

4 files changed

+14
-31
lines changed

4 files changed

+14
-31
lines changed
 

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
dist
22
dist-*
3-
src/UHC/Shuffle/Version.hs

‎Setup.hs

+1-26
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,5 @@ import Distribution.Simple (defaultMainWithHooks)
22
import Distribution.Simple.UUAGC (uuagcLibUserHook)
33
import UU.UUAGC (uuagc)
44

5-
{-
65
main :: IO ()
7-
main = defaultMainWithHooks $
8-
uuagcLibUserHook uuagc
9-
-}
10-
11-
{-
12-
-}
13-
import Distribution.PackageDescription
14-
import Distribution.Simple.UserHooks
15-
import Distribution.Package
16-
import Distribution.Version
17-
import qualified Data.Version
18-
19-
main :: IO ()
20-
main = defaultMainWithHooks $
21-
addHook $
22-
uuagcLibUserHook uuagc
23-
where addHook hooks = hooks {
24-
postConf = postConf_InsertVersion hooks
25-
}
26-
-- postConf_InsertVersion :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
27-
postConf_InsertVersion hooks args cfg pkgDescr bi = do
28-
postConf hooks args cfg pkgDescr bi
29-
writeFile "src/UHC/Shuffle/Version.hs" $
30-
"module UHC.Shuffle.Version where\n" ++
31-
"version = \"" ++ Data.Version.showVersion (Data.Version.makeVersion $ versionNumbers $ pkgVersion $ package pkgDescr) ++ "\"\n"
6+
main = defaultMainWithHooks $ uuagcLibUserHook uuagc

‎shuffle.cabal

+6-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ Library
3838
default-language: Haskell2010
3939
default-extensions:RankNTypes, TypeSynonymInstances, FlexibleInstances, FlexibleContexts
4040
Exposed-Modules: UHC.Shuffle,
41-
UHC.Shuffle.Version,
42-
Distribution.Simple.Shuffle
41+
Distribution.Simple.Shuffle,
42+
UHC.Shuffle.Version
4343
Other-Modules: UHC.Shuffle.AspectExpr,
4444
UHC.Shuffle.AspectExprEval,
4545
UHC.Shuffle.CDoc,
@@ -48,13 +48,15 @@ Library
4848
UHC.Shuffle.CDocSubst,
4949
UHC.Shuffle.ChunkParser,
5050
UHC.Shuffle.Common,
51-
UHC.Shuffle.MainAG
51+
UHC.Shuffle.MainAG,
52+
Paths_shuffle
5253
autogen-modules: UHC.Shuffle.AspectExpr,
5354
UHC.Shuffle.AspectExprEval,
5455
UHC.Shuffle.CDoc,
5556
UHC.Shuffle.CDocInline,
5657
UHC.Shuffle.CDocSubst,
57-
UHC.Shuffle.MainAG
58+
UHC.Shuffle.MainAG,
59+
Paths_shuffle
5860
Build-Depends: base >= 4 && < 5,
5961
containers >= 0.4,
6062
directory >= 1.1,

‎src/UHC/Shuffle/Version.hs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module UHC.Shuffle.Version (version) where
2+
3+
import qualified Paths_shuffle (version)
4+
import Data.Version (showVersion)
5+
6+
version :: String
7+
version = showVersion Paths_shuffle.version

0 commit comments

Comments
 (0)
Please sign in to comment.