From 1fd642dd30f92ceb6298369f2e1b6b7e9b67c665 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 10 Dec 2020 10:08:24 -0800 Subject: Move executable to app directory. Otherwise we have problems with cabal repl. --- app/pandoc.hs | 22 ++++++++++++++++++++++ pandoc.cabal | 2 +- pandoc.hs | 22 ---------------------- 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 app/pandoc.hs delete mode 100644 pandoc.hs diff --git a/app/pandoc.hs b/app/pandoc.hs new file mode 100644 index 000000000..9ed3b9e9f --- /dev/null +++ b/app/pandoc.hs @@ -0,0 +1,22 @@ +{-# LANGUAGE NoImplicitPrelude #-} +{- | + Module : Main + Copyright : Copyright (C) 2006-2020 John MacFarlane + License : GNU GPL, version 2 or above + + Maintainer : John MacFarlane + Stability : alpha + Portability : portable + +Parses command-line options and calls the appropriate readers and +writers. +-} +module Main where +import Prelude +import qualified Control.Exception as E +import Text.Pandoc.App (convertWithOpts, defaultOpts, options, parseOptions) +import Text.Pandoc.Error (handleError) + +main :: IO () +main = E.catch (parseOptions options defaultOpts >>= convertWithOpts) + (handleError . Left) diff --git a/pandoc.cabal b/pandoc.cabal index 5829856da..2e447a553 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -683,7 +683,7 @@ executable pandoc build-depends: base-compat >= 0.9 default-language: Haskell2010 other-extensions: NoImplicitPrelude - hs-source-dirs: . + hs-source-dirs: app main-is: pandoc.hs buildable: True other-modules: Paths_pandoc diff --git a/pandoc.hs b/pandoc.hs deleted file mode 100644 index 9ed3b9e9f..000000000 --- a/pandoc.hs +++ /dev/null @@ -1,22 +0,0 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{- | - Module : Main - Copyright : Copyright (C) 2006-2020 John MacFarlane - License : GNU GPL, version 2 or above - - Maintainer : John MacFarlane - Stability : alpha - Portability : portable - -Parses command-line options and calls the appropriate readers and -writers. --} -module Main where -import Prelude -import qualified Control.Exception as E -import Text.Pandoc.App (convertWithOpts, defaultOpts, options, parseOptions) -import Text.Pandoc.Error (handleError) - -main :: IO () -main = E.catch (parseOptions options defaultOpts >>= convertWithOpts) - (handleError . Left) -- cgit v1.2.3