git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Globs for psc-bundle
commitfadbc285c57c5d66dce69e6f355181e804a5ee25 authorPhil Freeman <paf31@cantab.net> dateMon 29 Jun 2015, 16:30 (11 years ago) parent836a932
2 files changed+8−2
psc-bundle/Main.hs+6−1 purescript.cabal+2−1
psc-bundle/Main.hs+6−1
@@ -36,6 +36,7 @@ import Control.Monad.Trans.Except
3636import Control.Monad.IO.Class
3737
3838import System.FilePath (takeFileName, takeDirectory)
39+import System.FilePath.Glob (glob)
3940import System.Exit (exitFailure)
4041import System.IO (stderr, hPutStrLn)
4142import System.Directory (createDirectoryIfMissing)
@@ -533,7 +534,11 @@ codeGen Options{..} ms = renderToString (NN (JSSourceElementsTop (prelude ++ con
533534-- and generates and prints the final Javascript bundle.
534535app :: forall m. (Applicative m, MonadError ErrorMessage m, MonadIO m) => Options -> m String
535536app opts@Options{..} = do
536− input <- for optionsInputFiles $ \filename -> do
537+ inputFiles <- concat <$> mapM (liftIO . glob) optionsInputFiles
538+ when (null inputFiles) . liftIO $ do
539+ hPutStrLn stderr "psc: No input files."
540+ exitFailure
541+ input <- for inputFiles $ \filename -> do
537542 js <- liftIO (readFile filename)
538543 ast <- fromRight (parse js filename)
539544 mid <- guessModuleIdentifier filename
purescript.cabal+2−1
@@ -224,7 +224,8 @@ executable psc-bundle
224224 mtl -any,
225225 transformers -any,
226226 transformers-compat -any,
227− optparse-applicative >= 0.10.0
227+ optparse-applicative >= 0.10.0,
228+ Glob -any
228229 ghc-options: -Wall -O2
229230 hs-source-dirs: psc-bundle
230231 default-language: Haskell2010