From 197f301795ecc2f64fb031289e76c48128dcb09b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 6 Jan 2016 11:11:59 -0800 Subject: [PATCH] Revert "Make file globbing work on windows." This reverts commit 363ecfebc32c6fe15d81634422e8607847f588fb. --- pandoc.cabal | 3 +-- pandoc.hs | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pandoc.cabal b/pandoc.cabal index c52b30d3f..e0b4f6021 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -300,8 +300,7 @@ Library Build-Tools: hsb2hs >= 0.3.1 other-modules: Text.Pandoc.Data if os(windows) - Cpp-options: -D_WINDOWS - Build-depends: Glob >= 0.7 && < 0.8 + Cpp-options: -D_WINDOWS Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind Ghc-Prof-Options: -fprof-auto-exported -rtsopts Default-Language: Haskell98 diff --git a/pandoc.hs b/pandoc.hs index 26558aa61..a4906382a 100644 --- a/pandoc.hs +++ b/pandoc.hs @@ -73,9 +73,6 @@ import Text.Pandoc.Readers.Txt2Tags (getT2TMeta) import Paths_pandoc (getDataDir) import Text.Printf (printf) import Text.Pandoc.Error -#ifdef _WINDOWS -import System.FilePath.Glob (glob) -#endif type Transform = Pandoc -> Pandoc @@ -1059,13 +1056,7 @@ main = do -- thread option data structure through all supplied option actions opts <- foldl (>>=) (return defaultOpts) actions - --- on windows we need to do our own file globbing, since the shell doesn't. -#ifdef _WINDOWS - mapM glob args >>= convertWithOpts opts . concat -#else convertWithOpts opts args -#endif convertWithOpts :: Opt -> [FilePath] -> IO () convertWithOpts opts args = do