pkg:ui: fix wasteful double-building of hledger-ui modules
This commit is contained in:
parent
96117ae514
commit
4813e3fc5f
@ -56,8 +56,8 @@ writeChan :: BC.BChan a -> a -> IO ()
|
|||||||
writeChan = BC.writeBChan
|
writeChan = BC.writeBChan
|
||||||
|
|
||||||
|
|
||||||
main :: IO ()
|
hledgerUiMain :: IO ()
|
||||||
main = withProgName "hledger-ui.log" $ do -- force Hledger.Utils.Debug.* to log to hledger-ui.log
|
hledgerUiMain = withProgName "hledger-ui.log" $ do -- force Hledger.Utils.Debug.* to log to hledger-ui.log
|
||||||
traceLogAtIO 1 "\n\n\n\n==== hledger-ui start"
|
traceLogAtIO 1 "\n\n\n\n==== hledger-ui start"
|
||||||
dbg1IO "args" progArgs
|
dbg1IO "args" progArgs
|
||||||
dbg1IO "debugLevel" debugLevel
|
dbg1IO "debugLevel" debugLevel
|
||||||
|
|||||||
4
hledger-ui/app/hledger-ui.hs
Normal file
4
hledger-ui/app/hledger-ui.hs
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
import Hledger.UI.Main (hledgerUiMain)
|
||||||
|
|
||||||
|
main :: IO ()
|
||||||
|
main = hledgerUiMain
|
||||||
@ -1,7 +0,0 @@
|
|||||||
module Main (main)
|
|
||||||
where
|
|
||||||
-- import Hledger.UI (main)
|
|
||||||
-- workaround for GHC 9.0.1 https://gitlab.haskell.org/ghc/ghc/-/issues/19397, #1503
|
|
||||||
import qualified Hledger.UI.Main (main)
|
|
||||||
main :: IO ()
|
|
||||||
main = Hledger.UI.Main.main
|
|
||||||
@ -50,34 +50,6 @@ ghc-options:
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- base >=4.14 && <4.19
|
- base >=4.14 && <4.19
|
||||||
- hledger-lib >=1.31.99 && <1.32
|
|
||||||
- hledger >=1.31.99 && <1.32
|
|
||||||
- ansi-terminal >=0.9
|
|
||||||
- async
|
|
||||||
- cmdargs >=0.8
|
|
||||||
- containers >=0.5.9
|
|
||||||
- data-default
|
|
||||||
- directory
|
|
||||||
- doclayout >=0.3 && <0.5
|
|
||||||
- extra >=1.6.3
|
|
||||||
- filepath
|
|
||||||
- fsnotify >=0.4 && <0.5
|
|
||||||
- microlens >=0.4
|
|
||||||
- microlens-platform >=0.2.3.1
|
|
||||||
- megaparsec >=7.0.0 && <9.6
|
|
||||||
- mtl >=2.2.1
|
|
||||||
- process >=1.2
|
|
||||||
- safe >=0.3.19
|
|
||||||
- split >=0.1
|
|
||||||
- text >=1.2
|
|
||||||
- text-zipper >=0.4
|
|
||||||
- time >=1.5
|
|
||||||
- transformers
|
|
||||||
- vector
|
|
||||||
# not installable on windows, cf buildable flag below
|
|
||||||
- brick >=1.5
|
|
||||||
- vty >=5.15
|
|
||||||
- unix
|
|
||||||
|
|
||||||
when:
|
when:
|
||||||
# curses is required to build terminfo for vty for hledger-ui.
|
# curses is required to build terminfo for vty for hledger-ui.
|
||||||
@ -104,11 +76,43 @@ library:
|
|||||||
- Hledger.UI.Main
|
- Hledger.UI.Main
|
||||||
- Hledger.UI.Theme
|
- Hledger.UI.Theme
|
||||||
- Hledger.UI.UIOptions
|
- Hledger.UI.UIOptions
|
||||||
|
dependencies:
|
||||||
|
- hledger-lib >=1.31.99 && <1.32
|
||||||
|
- hledger >=1.31.99 && <1.32
|
||||||
|
- ansi-terminal >=0.9
|
||||||
|
- async
|
||||||
|
- cmdargs >=0.8
|
||||||
|
- containers >=0.5.9
|
||||||
|
- data-default
|
||||||
|
- directory
|
||||||
|
- doclayout >=0.3 && <0.5
|
||||||
|
- extra >=1.6.3
|
||||||
|
- filepath
|
||||||
|
- fsnotify >=0.4 && <0.5
|
||||||
|
- microlens >=0.4
|
||||||
|
- microlens-platform >=0.2.3.1
|
||||||
|
- megaparsec >=7.0.0 && <9.6
|
||||||
|
- mtl >=2.2.1
|
||||||
|
- process >=1.2
|
||||||
|
- safe >=0.3.19
|
||||||
|
- split >=0.1
|
||||||
|
- text >=1.2
|
||||||
|
- text-zipper >=0.4
|
||||||
|
- time >=1.5
|
||||||
|
- transformers
|
||||||
|
- vector
|
||||||
|
# not installable on windows, cf buildable flag below
|
||||||
|
- brick >=1.5
|
||||||
|
- vty >=5.15
|
||||||
|
- unix
|
||||||
|
|
||||||
executables:
|
executables:
|
||||||
hledger-ui:
|
hledger-ui:
|
||||||
source-dirs: .
|
source-dirs: app
|
||||||
main: hledger-ui.hs
|
main: hledger-ui.hs
|
||||||
|
dependencies:
|
||||||
|
- base >=4.14 && <4.19
|
||||||
|
- hledger-ui
|
||||||
when:
|
when:
|
||||||
- condition: flag(threaded)
|
- condition: flag(threaded)
|
||||||
ghc-options: -threaded
|
ghc-options: -threaded
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user