From 70c107c8473f6ffad587bda31fde733e78e421bb Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Tue, 28 Jan 2020 18:55:13 +0700 Subject: [PATCH] Version functions Also cleaned up a bit --- libatrade.cabal | 11 +++-------- src/ATrade.hs | 25 +++++++++++++++++++++++++ src/Lib.hs | 0 3 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/ATrade.hs delete mode 100644 src/Lib.hs diff --git a/libatrade.cabal b/libatrade.cabal index 13077be..3c49f52 100644 --- a/libatrade.cabal +++ b/libatrade.cabal @@ -26,6 +26,8 @@ library , ATrade.Broker.TradeSinks.TelegramTradeSink , ATrade.Broker.TradeSinks.ZMQTradeSink , ATrade.Util + , ATrade + other-modules: Paths_libatrade build-depends: base >= 4.7 && < 5 , time , datetime @@ -52,16 +54,9 @@ library , http-client-tls , utf8-string , scientific + , gitrev default-language: Haskell2010 -executable libatrade-exe - hs-source-dirs: app - main-is: Main.hs - ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wincomplete-patterns - build-depends: base - , libatrade - , pretty-hex - default-language: Haskell2010 test-suite libatrade-test type: exitcode-stdio-1.0 diff --git a/src/ATrade.hs b/src/ATrade.hs new file mode 100644 index 0000000..dada4ae --- /dev/null +++ b/src/ATrade.hs @@ -0,0 +1,25 @@ +{-# LANGUAGE TemplateHaskell #-} + +module ATrade +( + libatrade_version +) where +import Data.Version +import Paths_libatrade + +import Development.GitRev + +libatrade_version :: Version +libatrade_version = version + +libatrade_gitrev :: String +libatrade_gitrev = concat [ "libatrade-", + $(gitBranch), + "@", + $(gitHash), + dirty ] + where + dirty | $(gitDirty) = "+" + | otherwise = "" + + diff --git a/src/Lib.hs b/src/Lib.hs deleted file mode 100644 index e69de29..0000000