git.iko.soy/typeable/pandoc
on master help sign in
Revert "Make file globbing work on windows."

This reverts commit 363ecfebc32c6fe15d81634422e8607847f588fb.

commit197f301795ecc2f64fb031289e76c48128dcb09b authorJohn MacFarlane <jgm@berkeley.edu> dateWed 6 Jan 2016, 11:11 (11 years ago) parent363ecfe
2 files changed+1−11
compare with master
unifiedsplit
pandoc.cabal+1−2 pandoc.hs−9
pandoc.cabal+1−2
@@ -300,8 +300,7 @@ Library
300300 Build-Tools: hsb2hs >= 0.3.1
301301 other-modules: Text.Pandoc.Data
302302 if os(windows)
303− Cpp-options: -D_WINDOWS
304− Build-depends: Glob >= 0.7 && < 0.8
303+ Cpp-options: -D_WINDOWS
305304 Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
306305 Ghc-Prof-Options: -fprof-auto-exported -rtsopts
307306 Default-Language: Haskell98
pandoc.hs−9
@@ -73,9 +73,6 @@ import Text.Pandoc.Readers.Txt2Tags (getT2TMeta)
7373import Paths_pandoc (getDataDir)
7474import Text.Printf (printf)
7575import Text.Pandoc.Error
76−#ifdef _WINDOWS
77−import System.FilePath.Glob (glob)
78−#endif
7976
8077type Transform = Pandoc -> Pandoc
8178
@@ -1059,13 +1056,7 @@ main = do
10591056
10601057 -- thread option data structure through all supplied option actions
10611058 opts <- foldl (>>=) (return defaultOpts) actions
1062−
1063−-- on windows we need to do our own file globbing, since the shell doesn't.
1064−#ifdef _WINDOWS
1065− mapM glob args >>= convertWithOpts opts . concat
1066−#else
10671059 convertWithOpts opts args
1068−#endif
10691060
10701061convertWithOpts :: Opt -> [FilePath] -> IO ()
10711062convertWithOpts opts args = do