git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Globs for psc-bundle
fadbc28Phil Freeman
psc-bundle/Main.hs+6−1
@@ -36,6 +36,7 @@ import Control.Monad.Trans.Except
36import Control.Monad.IO.Class
36import Control.Monad.IO.Class
37
37
38import System.FilePath (takeFileName, takeDirectory)
38import System.FilePath (takeFileName, takeDirectory)
39+import System.FilePath.Glob (glob)
39import System.Exit (exitFailure)
40import System.Exit (exitFailure)
40import System.IO (stderr, hPutStrLn)
41import System.IO (stderr, hPutStrLn)
41import System.Directory (createDirectoryIfMissing)
42import System.Directory (createDirectoryIfMissing)
@@ -533,7 +534,11 @@ codeGen Options{..} ms = renderToString (NN (JSSourceElementsTop (prelude ++ con
533-- and generates and prints the final Javascript bundle.
534-- and generates and prints the final Javascript bundle.
534app :: forall m. (Applicative m, MonadError ErrorMessage m, MonadIO m) => Options -> m String
535app :: forall m. (Applicative m, MonadError ErrorMessage m, MonadIO m) => Options -> m String
535app opts@Options{..} = do
536app 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
537 js <- liftIO (readFile filename)
542 js <- liftIO (readFile filename)
538 ast <- fromRight (parse js filename)
543 ast <- fromRight (parse js filename)
539 mid <- guessModuleIdentifier filename
544 mid <- guessModuleIdentifier filename
purescript.cabal+2−1
@@ -224,7 +224,8 @@ executable psc-bundle
224 mtl -any,
224 mtl -any,
225 transformers -any,
225 transformers -any,
226 transformers-compat -any,
226 transformers-compat -any,
227− optparse-applicative >= 0.10.0
227+ optparse-applicative >= 0.10.0,
228+ Glob -any
228 ghc-options: -Wall -O2
229 ghc-options: -Wall -O2
229 hs-source-dirs: psc-bundle
230 hs-source-dirs: psc-bundle
230 default-language: Haskell2010
231 default-language: Haskell2010