From 038ac8587792cdf4d7c6d92efebb56fe00eaf4da Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sat, 11 Apr 2020 17:27:49 -0500 Subject: Enable running the executables from fpm --- app/Main.hs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/Main.hs b/app/Main.hs index 9438eb2..75b5e5f 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -28,6 +28,7 @@ import Options.Applicative ( Parser import System.Directory ( doesDirectoryExist , doesFileExist ) +import System.Process ( runCommand ) import Toml ( TomlCodec , (.=) ) @@ -74,13 +75,22 @@ main = do app :: Arguments -> AppSettings -> IO () app args settings = case command' args of - Run -> putStrLn "Run" - Test -> putStrLn "Test" Build -> build settings + Run -> do + build settings + let buildPrefix = appSettingsBuildPrefix settings + let + executableNames = map + (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } -> + sourceDir name + ) + (appSettingsExecutables settings) + let executables = map (buildPrefix ) executableNames + mapM_ runCommand executables + Test -> putStrLn "Test" build :: AppSettings -> IO () build settings = do - putStrLn "Building" let compiler = appSettingsCompiler settings let projectName = appSettingsProjectName settings let buildPrefix = appSettingsBuildPrefix settings -- cgit v1.2.3 From 69a430f65069596e88f121c62d3161a8b4856bad Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sat, 11 Apr 2020 17:38:31 -0500 Subject: Enable tests with fpm --- app/Main.hs | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/Main.hs b/app/Main.hs index 75b5e5f..b75d02f 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -41,6 +41,7 @@ data TomlSettings = TomlSettings { , tomlSettingsProjectName :: String , tomlSettingsLibrary :: (Maybe Library) , tomlSettingsExecutables :: [Executable] + , tomlSettingsTests :: [Executable] } data AppSettings = AppSettings { @@ -50,6 +51,7 @@ data AppSettings = AppSettings { , appSettingsFlags :: [String] , appSettingsLibrary :: (Maybe Library) , appSettingsExecutables :: [Executable] + , appSettingsTests :: [Executable] } data Library = Library { librarySourceDir :: String } @@ -87,7 +89,17 @@ app args settings = case command' args of (appSettingsExecutables settings) let executables = map (buildPrefix ) executableNames mapM_ runCommand executables - Test -> putStrLn "Test" + Test -> do + build settings + let buildPrefix = appSettingsBuildPrefix settings + let + executableNames = map + (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } -> + sourceDir name + ) + (appSettingsTests settings) + let executables = map (buildPrefix ) executableNames + mapM_ runCommand executables build :: AppSettings -> IO () build settings = do @@ -96,6 +108,7 @@ build settings = do let buildPrefix = appSettingsBuildPrefix settings let flags = appSettingsFlags settings let executables = appSettingsExecutables settings + let tests = appSettingsTests settings executableDepends <- case appSettingsLibrary settings of Just librarySettings -> do let librarySourceDir' = librarySourceDir librarySettings @@ -122,6 +135,19 @@ build settings = do mainFile ) executables + mapM_ + (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } -> + do + buildProgram sourceDir + executableDepends + [".f90", ".f", ".F", ".F90", ".f95", ".f03"] + (buildPrefix sourceDir) + compiler + flags + name + mainFile + ) + tests getArguments :: IO Arguments getArguments = execParser @@ -169,6 +195,8 @@ settingsCodec = .= tomlSettingsLibrary <*> Toml.list executableCodec "executable" .= tomlSettingsExecutables + <*> Toml.list executableCodec "test" + .= tomlSettingsTests libraryCodec :: TomlCodec Library libraryCodec = Library <$> Toml.string "source-dir" .= librarySourceDir @@ -190,6 +218,7 @@ toml2AppSettings tomlSettings release = do executableSettings <- getExecutableSettings (tomlSettingsExecutables tomlSettings) projectName + testSettings <- getTestSettings $ tomlSettingsTests tomlSettings return AppSettings { appSettingsCompiler = tomlSettingsCompiler tomlSettings , appSettingsProjectName = projectName @@ -222,6 +251,7 @@ toml2AppSettings tomlSettings release = do ] , appSettingsLibrary = librarySettings , appSettingsExecutables = executableSettings + , appSettingsTests = testSettings } getLibrarySettings :: Maybe Library -> IO (Maybe Library) @@ -249,3 +279,20 @@ getExecutableSettings [] projectName = do else return [] else return [] getExecutableSettings executables _ = return executables + +getTestSettings :: [Executable] -> IO [Executable] +getTestSettings [] = do + defaultDirectoryExists <- doesDirectoryExist "test" + if defaultDirectoryExists + then do + defaultMainExists <- doesFileExist ("test" "main.f90") + if defaultMainExists + then return + [ Executable { executableSourceDir = "test" + , executableMainFile = "main.f90" + , executableName = "runTests" + } + ] + else return [] + else return [] +getTestSettings tests = return tests -- cgit v1.2.3