Implement example executables also for Haskell fpm

3 files changed, 83 insertions, 7 deletions

diff --git a/bootstrap/src/Fpm.hs b/bootstrap/src/Fpm.hs
index 9fc1c91..bec7706 100644
--- a/bootstrap/src/Fpm.hs
+++ b/bootstrap/src/Fpm.hs
@@ -92,6 +92,7 @@ data Arguments =
       }
   | Run
       { runRelease :: Bool
+      , runExample :: Bool
       , runCompiler :: FilePath
       , runFlags :: [String]
       , runRunner :: Maybe String
@@ -111,6 +112,7 @@ data TomlSettings = TomlSettings {
       tomlSettingsProjectName :: String
     , tomlSettingsLibrary :: (Maybe Library)
     , tomlSettingsExecutables :: [Executable]
+    , tomlSettingsExamples :: [Executable]
     , tomlSettingsTests :: [Executable]
     , tomlSettingsDependencies :: (Map.Map String Version)
     , tomlSettingsDevDependencies :: (Map.Map String Version)
@@ -122,6 +124,7 @@ data AppSettings = AppSettings {
     , appSettingsBuildPrefix :: String
     , appSettingsLibrary :: (Maybe Library)
     , appSettingsExecutables :: [Executable]
+    , appSettingsExamples :: [Executable]
     , appSettingsTests :: [Executable]
     , appSettingsDependencies :: (Map.Map String Version)
     , appSettingsDevDependencies :: (Map.Map String Version)
@@ -168,15 +171,23 @@ start args = case args of
 app :: Arguments -> AppSettings -> IO ()
 app args settings = case args of
   Build{} -> build settings
-  Run { runTarget = whichOne, runArgs = runArgs, runRunner = runner } -> do
+  Run { runTarget = whichOne, runArgs = runArgs, runRunner = runner, runExample = runExample } -> do
     build settings
     let buildPrefix = appSettingsBuildPrefix settings
     let
-      executableNames = map
-        (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } ->
-          sourceDir </> name
-        )
-        (appSettingsExecutables settings)
+      executableNames = if runExample
+        then
+          map
+          (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } ->
+            sourceDir </> name
+          )
+          (appSettingsExamples settings)
+        else
+          map
+          (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name } ->
+            sourceDir </> name
+          )
+          (appSettingsExecutables settings)
     let executables =
           map (buildPrefix </>) $ map (flip (<.>) exe) executableNames
     canonicalExecutables <- mapM makeAbsolute executables
@@ -265,6 +276,7 @@ build settings = do
   let projectName      = appSettingsProjectName settings
   let buildPrefix      = appSettingsBuildPrefix settings
   let executables      = appSettingsExecutables settings
+  let examples         = appSettingsExamples settings
   let tests            = appSettingsTests settings
   mainDependencyTrees <- fetchDependencies (appSettingsDependencies settings)
   builtDependencies   <- buildDependencies buildPrefix
@@ -341,6 +353,29 @@ build settings = do
           ++ (map snd localDependencies)
           )
     )
+    examples
+  mapM_
+    (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name, executableDependencies = dependencies } ->
+      do
+        localDependencies <-
+          fetchExecutableDependencies maybeTree dependencies
+            >>= buildDependencies buildPrefix compilerSettings
+        buildProgram
+          sourceDir
+          (  (map fst executableDepends)
+          ++ (map fst devDependencies)
+          ++ (map fst localDependencies)
+          )
+          [".f90", ".f", ".F", ".F90", ".f95", ".f03"]
+          (buildPrefix </> sourceDir)
+          compilerSettings
+          name
+          mainFile
+          (  (map snd executableDepends)
+          ++ (map snd devDependencies)
+          ++ (map snd localDependencies)
+          )
+    )
     tests
 
 getArguments :: IO Arguments
@@ -410,6 +445,10 @@ runArguments =
           (  long "release"
           <> help "Build with optimizations instead of debugging"
           )
+    <*> switch
+          (  long "example"
+          <> help "Run example programs instead of applications"
+          )
     <*> strOption
           (  long "compiler"
           <> metavar "COMPILER"
@@ -503,6 +542,8 @@ settingsCodec =
     .=  tomlSettingsLibrary
     <*> Toml.list executableCodec "executable"
     .=  tomlSettingsExecutables
+    <*> Toml.list executableCodec "example"
+    .=  tomlSettingsExamples
     <*> Toml.list executableCodec "test"
     .=  tomlSettingsTests
     <*> Toml.tableMap Toml._KeyString versionCodec "dependencies"
@@ -608,6 +649,7 @@ toml2AppSettings tomlSettings args = do
   executableSettings <- getExecutableSettings
     (tomlSettingsExecutables tomlSettings)
     projectName
+  exampleSettings <- getExampleSettings $ tomlSettingsExamples tomlSettings
   testSettings <- getTestSettings $ tomlSettingsTests tomlSettings
   compilerSettings <- defineCompilerSettings specifiedFlags compiler release
   buildPrefix <- makeBuildPrefix (compilerSettingsCompiler compilerSettings)
@@ -619,6 +661,7 @@ toml2AppSettings tomlSettings args = do
                      , appSettingsBuildPrefix     = buildPrefix
                      , appSettingsLibrary         = librarySettings
                      , appSettingsExecutables     = executableSettings
+                     , appSettingsExamples        = exampleSettings
                      , appSettingsTests           = testSettings
                      , appSettingsDependencies    = dependencies
                      , appSettingsDevDependencies = devDependencies
@@ -725,6 +768,24 @@ getExecutableSettings [] projectName = do
     else return []
 getExecutableSettings executables _ = return executables
 
+getExampleSettings :: [Executable] -> IO [Executable]
+getExampleSettings [] = do
+  defaultDirectoryExists <- doesDirectoryExist "example"
+  if defaultDirectoryExists
+    then do
+      defaultMainExists <- doesFileExist ("example" </> "main.f90")
+      if defaultMainExists
+        then return
+          [ Executable { executableSourceDir    = "example"
+                       , executableMainFile     = "main.f90"
+                       , executableName         = "demo"
+                       , executableDependencies = Map.empty
+                       }
+          ]
+        else return []
+    else return []
+getExampleSettings examples = return examples
+
 getTestSettings :: [Executable] -> IO [Executable]
 getTestSettings [] = do
   defaultDirectoryExists <- doesDirectoryExist "test"
diff --git a/bootstrap/test/Spec.hs b/bootstrap/test/Spec.hs
index 215024d..6e9daa2 100644
--- a/bootstrap/test/Spec.hs
+++ b/bootstrap/test/Spec.hs
@@ -20,6 +20,7 @@ testHelloWorld :: IO ()
 testHelloWorld =
   withCurrentDirectory (example_path </> "hello_world") $ start $ Run
     { runRelease = False
+    , runExample = False
     , runCompiler = "gfortran"
     , runFlags = []
     , runRunner = Nothing
@@ -42,6 +43,19 @@ testHelloFpm :: IO ()
 testHelloFpm =
   withCurrentDirectory (example_path </> "hello_fpm") $ start $ Run
     { runRelease = False
+    , runExample = False
+    , runCompiler = "gfortran"
+    , runFlags = []
+    , runRunner = Nothing
+    , runTarget  = Nothing
+    , runArgs    = Nothing
+    }
+
+testWithExamples :: IO ()
+testWithExamples =
+  withCurrentDirectory (example_path </> "with_examples") $ start $ Run
+    { runRelease = False
+    , runExample = True
     , runCompiler = "gfortran"
     , runFlags = []
     , runRunner = Nothing
@@ -72,6 +86,7 @@ testMakefileComplex :: IO ()
 testMakefileComplex =
   withCurrentDirectory (example_path </> "makefile_complex") $ start $ Run
     { runRelease = False
+    , runExample = False
     , runCompiler = "gfortran"
     , runFlags = []
     , runRunner = Nothing
diff --git a/example_packages/README.md b/example_packages/README.md
index a360225..667b9a3 100644
--- a/example_packages/README.md
+++ b/example_packages/README.md
@@ -13,7 +13,7 @@ the features demonstrated in each package and which versions of fpm are supporte
 | hello_complex_2     | Auto-discovery of tests and executables with modules          |            N            |  Y  |
 | hello_fpm           | App-only; local path dependency                               |            Y            |  Y  |
 | hello_world         | App-only                                                      |            Y            |  Y  |
-| with_examples       | Example-only                                                  |            N            |  Y  |
+| with_examples       | Example-only                                                  |            Y            |  Y  |
 | makefile_complex    | External build command (makefile); local path dependency      |            Y            |  N  |
 | program_with_module | App-only; module+program in single source file                |            Y            |  Y  |
 | submodules          | Lib-only; submodules (3 levels)                               |            N            |  Y  |