@@ -14,7 +14,7 @@ module Obelisk.Command.Run where
1414import Control.Arrow ((&&&))
1515import Control.Exception (Exception, bracket)
1616import Control.Lens (ifor, (.~), (&))
17−import Control.Monad (filterM)
17+import Control.Monad (filterM, unless)
1818import Control.Monad.Except (runExceptT, throwError)
1919import Control.Monad.IO.Class (liftIO)
2020import Control.Monad.Reader (MonadIO)
@@ -46,7 +46,7 @@ import Distribution.Compiler (CompilerFlavor(..))
4646import Distribution.PackageDescription.Parsec (parseGenericPackageDescription)
4747import Distribution.Parsec.ParseResult (runParseResult)
4848import qualified Distribution.System as Dist
49−import Distribution.Types.BuildInfo (buildable, cppOptions, defaultExtensions, defaultLanguage, hsSourceDirs, options)
49+import Distribution.Types.BuildInfo (buildable, defaultExtensions, defaultLanguage, hsSourceDirs, options)
5050import Distribution.Types.CondTree (simplifyCondTree)
5151import Distribution.Types.GenericPackageDescription (ConfVar (Arch, Impl, OS), condLibrary)
5252import Distribution.Types.Library (libBuildInfo)
@@ -94,8 +94,6 @@ data CabalPackageInfo = CabalPackageInfo
9494 -- ^ List of globally set languages of the library component
9595 , _cabalPackageInfo_compilerOptions :: [(CompilerFlavor, [String])]
9696 -- ^ List of compiler-specific options (e.g., the "ghc-options" field of the cabal file)
97− , _cabalPackageInfo_cppOptions :: [String]
98− -- ^ List of CPP (C Preprocessor) options (e.g. the "cpp-options" field of the cabal file)
9997 }
10098
10199-- | 'Bool' with a better name for its purpose.
@@ -304,16 +302,15 @@ parseCabalPackage
304302 -> m (Maybe CabalPackageInfo)
305303parseCabalPackage dir = parseCabalPackage' dir >>= \case
306304 Left err -> Nothing <$ putLog Error err
307− Right (Just (warnings, pkgInfo)) -> do
305+ Right (warnings, pkgInfo) -> do
308306 for_ warnings $ putLog Warning . T.pack . show
309307 pure $ Just pkgInfo
310− Right Nothing -> pure Nothing
311308
312309-- | Like 'parseCabalPackage' but returns errors and warnings directly so as to avoid 'MonadObelisk'.
313310parseCabalPackage'
314311 :: (MonadIO m)
315312 => FilePath -- ^ Package directory
316− -> m (Either T.Text (Maybe ([Dist.PWarning], CabalPackageInfo)))
313+ -> m (Either T.Text ([Dist.PWarning], CabalPackageInfo))
317314parseCabalPackage' pkg = runExceptT $ do
318315 (cabalContents, packageFile, packageName) <- guessCabalPackageFile pkg >>= \case
319316 Left GuessPackageFileError_NotFound -> throwError $ "No .cabal or package.yaml file found in " <> T.pack pkg
@@ -341,7 +338,7 @@ parseCabalPackage' pkg = runExceptT $ do
341338 case condLibrary <$> result of
342339 Right (Just condLib) -> do
343340 let (_, lib) = simplifyCondTree evalConfVar condLib
344− pure $ Just $ (warnings,) $ CabalPackageInfo
341+ pure $ (warnings,) $ CabalPackageInfo
345342 { _cabalPackageInfo_packageName = T.pack packageName
346343 , _cabalPackageInfo_packageFile = packageFile
347344 , _cabalPackageInfo_packageRoot = takeDirectory packageFile
@@ -353,19 +350,18 @@ parseCabalPackage' pkg = runExceptT $ do
353350 , _cabalPackageInfo_defaultLanguage =
354351 defaultLanguage $ libBuildInfo lib
355352 , _cabalPackageInfo_compilerOptions = options $ libBuildInfo lib
356− , _cabalPackageInfo_cppOptions = cppOptions $ libBuildInfo lib
357353 }
358− Right Nothing -> pure Nothing
354+ Right Nothing -> throwError "Haskell package has no library component"
359355 Left (_, errors) ->
360356 throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show errors)
361357
362358parsePackagesOrFail :: (MonadObelisk m, Foldable f) => f FilePath -> m (NE.NonEmpty CabalPackageInfo)
363359parsePackagesOrFail dirs' = do
364− packageInfos' <- fmap catMaybes $ for dirs $ \dir -> do
360+ (pkgDirErrs, packageInfos') <- fmap partitionEithers $ for dirs $ \dir -> do
365361 flip fmap (parseCabalPackage dir) $ \case
366362 Just packageInfo
367− | _cabalPackageInfo_buildable packageInfo -> Just packageInfo
368− _ -> Nothing
363+ | _cabalPackageInfo_buildable packageInfo -> Right packageInfo
364+ _ -> Left dir
369365
370366 -- Sort duplicate packages such that we prefer shorter paths, but fall back to alphabetical ordering.
371367 let packagesByName = Map.map (NE.sortBy $ comparing $ \p -> let n = _cabalPackageInfo_packageFile p in (length n, n))
@@ -387,6 +383,9 @@ parsePackagesOrFail dirs' = do
387383 "No valid, buildable packages found" <> (if null dirs then "" else " in " <> intercalate ", " dirs)
388384 Just xs -> pure xs
389385
386+ unless (null pkgDirErrs) $
387+ putLog Warning $ T.pack $ "Failed to find buildable packages in " <> intercalate ", " pkgDirErrs
388+
390389 pure packageInfos
391390 where
392391 dirs = toList dirs'