diff options
| -rw-r--r-- | bootstrap/package.yaml | 1 | ||||
| -rw-r--r-- | bootstrap/src/Build.hs | 41 | ||||
| -rw-r--r-- | bootstrap/src/Fpm.hs | 477 | ||||
| -rw-r--r-- | bootstrap/test/Spec.hs | 74 | ||||
| -rwxr-xr-x | ci/run_tests.bat | 24 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 36 | ||||
| -rw-r--r-- | example_packages/auto_discovery_off/.gitignore | 1 | ||||
| -rw-r--r-- | example_packages/program_with_module/.gitignore | 1 | ||||
| -rw-r--r-- | example_packages/with_c/.gitignore | 1 | ||||
| -rw-r--r-- | fpm/test/new_test/new_test.f90 | 36 |
10 files changed, 474 insertions, 218 deletions
diff --git a/bootstrap/package.yaml b/bootstrap/package.yaml index 26a7f74..1f5d0fd 100644 --- a/bootstrap/package.yaml +++ b/bootstrap/package.yaml @@ -25,6 +25,7 @@ dependencies: - directory - extra - filepath +- hashable - MissingH - optparse-applicative - process diff --git a/bootstrap/src/Build.hs b/bootstrap/src/Build.hs index 3f647cd..e4f9992 100644 --- a/bootstrap/src/Build.hs +++ b/bootstrap/src/Build.hs @@ -1,6 +1,7 @@ {-# LANGUAGE MultiWayIf #-} module Build - ( buildLibrary + ( CompilerSettings(..) + , buildLibrary , buildProgram , buildWithScript ) @@ -50,22 +51,28 @@ import System.Directory ( createDirectoryIfMissing , withCurrentDirectory ) +data CompilerSettings = CompilerSettings { + compilerSettingsCompiler :: FilePath + , compilerSettingsFlags :: [String] + , compilerSettingsModuleFlag :: String + , compilerSettingsIncludeFlag :: String +} + buildProgram :: FilePath -> [FilePath] -> [FilePattern] -> FilePath - -> FilePath - -> [String] + -> CompilerSettings -> String -> FilePath -> [FilePath] -> IO () -buildProgram programDirectory' libraryDirectories sourceExtensions buildDirectory' compiler flags programName programSource archives +buildProgram programDirectory' libraryDirectories sourceExtensions buildDirectory' (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) programName programSource archives = do let programDirectory = foldl1 (</>) (splitDirectories programDirectory') - let buildDirectory = foldl1 (</>) (splitDirectories buildDirectory') - let includeFlags = map ("-I" ++) libraryDirectories + let buildDirectory = foldl1 (</>) (splitDirectories buildDirectory') + let includeFlags = map (includeFlag ++) libraryDirectories sourceFiles <- getDirectoriesFiles [programDirectory] sourceExtensions rawSources <- mapM sourceFileToRawSource sourceFiles let sources' = map processRawSource rawSources @@ -98,7 +105,7 @@ buildProgram programDirectory' libraryDirectories sourceExtensions buildDirector in fileMatcher &?> \(objectFile : _) -> do need (sourceFile : directDependencies) cmd compiler - ["-c", "-J" ++ buildDirectory] + ["-c", moduleFlag ++ buildDirectory] includeFlags flags ["-o", objectFile, sourceFile] @@ -113,14 +120,13 @@ buildLibrary :: FilePath -> [FilePattern] -> FilePath - -> FilePath - -> [String] + -> CompilerSettings -> String -> [FilePath] -> IO (FilePath) -buildLibrary libraryDirectory sourceExtensions buildDirectory compiler flags libraryName otherLibraryDirectories +buildLibrary libraryDirectory sourceExtensions buildDirectory (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) libraryName otherLibraryDirectories = do - let includeFlags = map ("-I" ++) otherLibraryDirectories + let includeFlags = map (includeFlag ++) otherLibraryDirectories sourceFiles <- getDirectoriesFiles [libraryDirectory] sourceExtensions rawSources <- mapM sourceFileToRawSource sourceFiles let sources = map processRawSource rawSources @@ -150,7 +156,7 @@ buildLibrary libraryDirectory sourceExtensions buildDirectory compiler flags lib in fileMatcher &?> \(objectFile : _) -> do need (sourceFile : directDependencies) cmd compiler - ["-c", "-J" ++ buildDirectory] + ["-c", moduleFlag ++ buildDirectory] includeFlags flags ["-o", objectFile, sourceFile] @@ -165,18 +171,19 @@ buildWithScript :: String -> FilePath -> FilePath - -> FilePath - -> [String] + -> CompilerSettings -> String -> [FilePath] -> IO (FilePath) -buildWithScript script projectDirectory buildDirectory compiler flags libraryName otherLibraryDirectories +buildWithScript script projectDirectory buildDirectory (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) libraryName otherLibraryDirectories = do absoluteBuildDirectory <- makeAbsolute buildDirectory createDirectoryIfMissing True absoluteBuildDirectory absoluteLibraryDirectories <- mapM makeAbsolute otherLibraryDirectories - setEnv "FC" compiler - setEnv "FFLAGS" (intercalate " " flags) + setEnv "FC" compiler + setEnv "FFLAGS" (intercalate " " flags) + setEnv "FINCLUDEFLAG" includeFlag + setEnv "FMODUELFLAG" moduleFlag setEnv "BUILD_DIR" $ unWindowsPath absoluteBuildDirectory setEnv "INCLUDE_DIRS" (intercalate " " (map unWindowsPath absoluteLibraryDirectories)) diff --git a/bootstrap/src/Fpm.hs b/bootstrap/src/Fpm.hs index 115b63e..256f8e1 100644 --- a/bootstrap/src/Fpm.hs +++ b/bootstrap/src/Fpm.hs @@ -3,13 +3,13 @@ module Fpm ( Arguments(..) - , Command(..) , getArguments , start ) where -import Build ( buildLibrary +import Build ( CompilerSettings(..) + , buildLibrary , buildProgram , buildWithScript ) @@ -17,7 +17,10 @@ import Control.Monad.Extra ( concatMapM , forM_ , when ) -import Data.List ( isSuffixOf +import Data.Hashable ( hash ) +import Data.List ( intercalate + , isInfixOf + , isSuffixOf , find , nub ) @@ -30,10 +33,13 @@ import Development.Shake ( FilePattern import Development.Shake.FilePath ( (</>) , (<.>) , exe + , splitDirectories ) +import Numeric ( showHex ) import Options.Applicative ( Parser , (<**>) , (<|>) + , auto , command , execParser , fullDesc @@ -42,8 +48,13 @@ import Options.Applicative ( Parser , helper , info , long + , many , metavar + , option + , optional , progDesc + , short + , showDefault , strArgument , strOption , subparser @@ -59,7 +70,7 @@ import System.Directory ( createDirectory import System.Exit ( ExitCode(..) , exitWith ) -import System.Process ( runCommand +import System.Process ( readProcess , system ) import Toml ( TomlCodec @@ -67,7 +78,32 @@ import Toml ( TomlCodec ) import qualified Toml -data Arguments = Arguments { command' :: Command, release :: Bool, commandArguments :: String } +data Arguments = + New + { newName :: String + , newWithExecutable :: Bool + , newWithTest :: Bool + , newWithLib :: Bool + } + | Build + { buildRelease :: Bool + , buildCompiler :: FilePath + , buildFlags :: [String] + } + | Run + { runRelease :: Bool + , runCompiler :: FilePath + , runFlags :: [String] + , runTarget :: Maybe String + , runArgs :: Maybe [String] + } + | Test + { testRelease :: Bool + , testCompiler :: FilePath + , testFlags :: [String] + , testTarget :: Maybe String + , testArgs :: Maybe [String] + } data TomlSettings = TomlSettings { tomlSettingsProjectName :: String @@ -79,10 +115,9 @@ data TomlSettings = TomlSettings { } data AppSettings = AppSettings { - appSettingsCompiler :: String + appSettingsCompiler :: CompilerSettings , appSettingsProjectName :: String , appSettingsBuildPrefix :: String - , appSettingsFlags :: [String] , appSettingsLibrary :: (Maybe Library) , appSettingsExecutables :: [Executable] , appSettingsTests :: [Executable] @@ -107,8 +142,6 @@ data GitRef = Tag String | Branch String | Commit String deriving Show data PathVersionSpec = PathVersionSpec { pathVersionSpecPath :: String } deriving Show -data Command = Run String | Test String | Build | New String Bool Bool - data DependencyTree = Dependency { dependencyName :: String , dependencyPath :: FilePath @@ -118,22 +151,22 @@ data DependencyTree = Dependency { } start :: Arguments -> IO () -start args = case command' args of - New projectName withExecutable withTest -> - createNewProject projectName withExecutable withTest +start args = case args of + New { newName = name, newWithExecutable = withExecutable, newWithTest = withTest, newWithLib = withLib } + -> createNewProject name withExecutable withTest withLib _ -> do fpmContents <- TIO.readFile "fpm.toml" let tomlSettings = Toml.decode settingsCodec fpmContents case tomlSettings of Left err -> print err Right tomlSettings' -> do - appSettings <- toml2AppSettings tomlSettings' (release args) + appSettings <- toml2AppSettings tomlSettings' args app args appSettings app :: Arguments -> AppSettings -> IO () -app args settings = case command' args of - Build -> build settings - Run whichOne -> do +app args settings = case args of + Build{} -> build settings + Run { runTarget = whichOne, runArgs = runArgs } -> do build settings let buildPrefix = appSettingsBuildPrefix settings let @@ -148,10 +181,16 @@ app args settings = case command' args of case canonicalExecutables of [] -> putStrLn "No Executables Found" _ -> case whichOne of - "" -> do + Nothing -> do exitCodes <- mapM system - (map (++ " " ++ commandArguments args) canonicalExecutables) + (map + (++ case runArgs of + Nothing -> "" + Just theArgs -> " " ++ (intercalate " " theArgs) + ) + canonicalExecutables + ) forM_ exitCodes (\exitCode -> when @@ -161,13 +200,16 @@ app args settings = case command' args of ) (exitWith exitCode) ) - name -> do + Just name -> do case find (name `isSuffixOf`) canonicalExecutables of Nothing -> putStrLn "Executable Not Found" Just specified -> do - exitCode <- system (specified ++ " " ++ (commandArguments args)) + exitCode <- case runArgs of + Nothing -> system specified + Just theArgs -> + system (specified ++ " " ++ (intercalate " " theArgs)) exitWith exitCode - Test whichOne -> do + Test { testTarget = whichOne, testArgs = testArgs } -> do build settings let buildPrefix = appSettingsBuildPrefix settings let @@ -182,10 +224,16 @@ app args settings = case command' args of case canonicalExecutables of [] -> putStrLn "No Tests Found" _ -> case whichOne of - "" -> do + Nothing -> do exitCodes <- mapM system - (map (++ " " ++ commandArguments args) canonicalExecutables) + (map + (++ case testArgs of + Nothing -> "" + Just theArgs -> " " ++ (intercalate " " theArgs) + ) + canonicalExecutables + ) forM_ exitCodes (\exitCode -> when @@ -195,25 +243,27 @@ app args settings = case command' args of ) (exitWith exitCode) ) - name -> do + Just name -> do case find (name `isSuffixOf`) canonicalExecutables of Nothing -> putStrLn "Test Not Found" Just specified -> do - exitCode <- system (specified ++ " " ++ (commandArguments args)) + exitCode <- case testArgs of + Nothing -> system specified + Just theArgs -> + system (specified ++ " " ++ (intercalate " " theArgs)) exitWith exitCode + _ -> putStrLn "Shouldn't be able to get here" build :: AppSettings -> IO () build settings = do - let compiler = appSettingsCompiler settings - let projectName = appSettingsProjectName settings - let buildPrefix = appSettingsBuildPrefix settings - let flags = appSettingsFlags settings - let executables = appSettingsExecutables settings - let tests = appSettingsTests settings + let compilerSettings = appSettingsCompiler settings + let projectName = appSettingsProjectName settings + let buildPrefix = appSettingsBuildPrefix settings + let executables = appSettingsExecutables settings + let tests = appSettingsTests settings mainDependencyTrees <- fetchDependencies (appSettingsDependencies settings) builtDependencies <- buildDependencies buildPrefix - compiler - flags + compilerSettings mainDependencyTrees (executableDepends, maybeTree) <- case appSettingsLibrary settings of Just librarySettings -> do @@ -229,15 +279,13 @@ build settings = do Just script -> buildWithScript script "." (buildPrefix </> projectName) - compiler - flags + compilerSettings projectName (map fst builtDependencies) Nothing -> buildLibrary librarySourceDir' [".f90", ".f", ".F", ".F90", ".f95", ".f03"] (buildPrefix </> projectName) - compiler - flags + compilerSettings projectName (map fst builtDependencies) return @@ -251,14 +299,13 @@ build settings = do do localDependencies <- fetchExecutableDependencies maybeTree dependencies - >>= buildDependencies buildPrefix compiler flags + >>= buildDependencies buildPrefix compilerSettings buildProgram sourceDir ((map fst executableDepends) ++ (map fst localDependencies)) [".f90", ".f", ".F", ".F90", ".f95", ".f03"] (buildPrefix </> sourceDir) - compiler - flags + compilerSettings name mainFile ((map snd executableDepends) ++ (map snd localDependencies)) @@ -266,13 +313,13 @@ build settings = do executables devDependencies <- fetchExecutableDependencies maybeTree (appSettingsDevDependencies settings) - >>= buildDependencies buildPrefix compiler flags + >>= buildDependencies buildPrefix compilerSettings mapM_ (\Executable { executableSourceDir = sourceDir, executableMainFile = mainFile, executableName = name, executableDependencies = dependencies } -> do localDependencies <- fetchExecutableDependencies maybeTree dependencies - >>= buildDependencies buildPrefix compiler flags + >>= buildDependencies buildPrefix compilerSettings buildProgram sourceDir ( (map fst executableDepends) @@ -281,8 +328,7 @@ build settings = do ) [".f90", ".f", ".F", ".F90", ".f95", ".f03"] (buildPrefix </> sourceDir) - compiler - flags + compilerSettings name mainFile ( (map snd executableDepends) @@ -302,42 +348,128 @@ getArguments = execParser ) arguments :: Parser Arguments -arguments = - Arguments - <$> subparser - ( command "run" (info runArguments (progDesc "Run the executable")) - <> command "test" (info testArguments (progDesc "Run the tests")) - <> command "build" - (info buildArguments (progDesc "Build the executable")) - <> command - "new" - (info newArguments - (progDesc "Create a new project in a new directory") - ) +arguments = subparser + ( command + "new" + (info (newArguments <**> helper) + (progDesc "Create a new project in a new directory") + ) + <> command + "build" + (info (buildArguments <**> helper) (progDesc "Build the project")) + <> command + "run" + (info (runArguments <**> helper) (progDesc "Run the executable(s)")) + <> command "test" + (info (testArguments <**> helper) (progDesc "Run the test(s)")) + ) + +newArguments :: Parser Arguments +newArguments = + New + <$> strArgument + ( metavar "NAME" + <> help "Name of new project (must be a valid Fortran identifier)" + ) + <*> switch (long "app" <> help "Include an executable") + <*> switch (long "test" <> help "Include a test") + <*> switch (long "lib" <> help "Include a library") + +buildArguments :: Parser Arguments +buildArguments = + Build + <$> switch + ( long "release" + <> help "Build with optimizations instead of debugging" ) - <*> switch (long "release" <> help "Build in release mode") <*> strOption - (long "args" <> metavar "ARGS" <> value "" <> help - "Arguments to pass to executables/tests" + ( long "compiler" + <> metavar "COMPILER" + <> value "gfortran" + <> help "specify the compiler to use" + <> showDefault + ) + <*> many + (strOption + ( long "flag" + <> metavar "FLAG" + <> help + "specify an addional argument to pass to the compiler (can appear multiple times)" + ) ) -runArguments :: Parser Command -runArguments = Run <$> strArgument - (metavar "EXE" <> value "" <> help "Which executable to run") +runArguments :: Parser Arguments +runArguments = + Run + <$> switch + ( long "release" + <> help "Build with optimizations instead of debugging" + ) + <*> strOption + ( long "compiler" + <> metavar "COMPILER" + <> value "gfortran" + <> help "specify the compiler to use" + <> showDefault + ) + <*> many + (strOption + ( long "flag" + <> metavar "FLAG" + <> help + "specify an addional argument to pass to the compiler (can appear multiple times)" + ) + ) + <*> optional + (strOption + (long "target" <> metavar "TARGET" <> help + "Name of the executable to run" + ) + ) + <*> optional + (many + (strArgument + ( metavar "ARGS" + <> help "Arguments to the executable(s) (should follow '--')" + ) + ) + ) -testArguments :: Parser Command +testArguments :: Parser Arguments testArguments = - Test <$> strArgument (metavar "TEST" <> value "" <> help "Which test to run") - -buildArguments :: Parser Command -buildArguments = pure Build - -newArguments :: Parser Command -newArguments = - New - <$> strArgument (metavar "NAME" <> help "Name of new project") - <*> switch (long "with-executable" <> help "Include an executable") - <*> switch (long "with-test" <> help "Include a test") + Test + <$> switch + ( long "release" + <> help "Build with optimizations instead of debugging" + ) + <*> strOption + ( long "compiler" + <> metavar "COMPILER" + <> value "gfortran" + <> help "specify the compiler to use" + <> showDefault + ) + <*> many + (strOption + ( long "flag" + <> metavar "FLAG" + <> help + "specify an addional argument to pass to the compiler (can appear multiple times)" + ) + ) + <*> optional + (strOption + (long "target" <> metavar "TARGET" <> help "Name of the test to run" + ) + ) + <*> optional + (many + (strArgument + ( metavar "ARGS" + <> help "Arguments to the test(s) (should follow '--')" + ) + ) + ) getDirectoriesFiles :: [FilePath] -> [FilePattern] -> IO [FilePath] getDirectoriesFiles dirs exts = getDirectoryFilesIO "" newPatterns @@ -437,51 +569,112 @@ pathVersionCodec :: Toml.TomlCodec PathVersionSpec pathVersionCodec = PathVersionSpec <$> Toml.string "path" .= pathVersionSpecPath -toml2AppSettings :: TomlSettings -> Bool -> IO AppSettings -toml2AppSettings tomlSettings release = do +toml2AppSettings :: TomlSettings -> Arguments -> IO AppSettings +toml2AppSettings tomlSettings args = do + let release = case args of + Build { buildRelease = r } -> r + Run { runRelease = r } -> r + Test { testRelease = r } -> r let projectName = tomlSettingsProjectName tomlSettings - let compiler = "gfortran" + let compiler = case args of + Build { buildCompiler = c } -> c + Run { runCompiler = c } -> c + Test { testCompiler = c } -> c + let specifiedFlags = case args of + Build { buildFlags = f } -> f + Run { runFlags = f } -> f + Test { testFlags = f } -> f + when (release && (length specifiedFlags > 0)) $ do + putStrLn "--release and --flag are mutually exclusive" + exitWith (ExitFailure 1) librarySettings <- getLibrarySettings $ tomlSettingsLibrary tomlSettings executableSettings <- getExecutableSettings (tomlSettingsExecutables tomlSettings) projectName testSettings <- getTestSettings $ tomlSettingsTests tomlSettings - buildPrefix <- makeBuildPrefix compiler release + compilerSettings <- defineCompilerSettings specifiedFlags compiler release + buildPrefix <- makeBuildPrefix (compilerSettingsCompiler compilerSettings) + (compilerSettingsFlags compilerSettings) let dependencies = tomlSettingsDependencies tomlSettings let devDependencies = tomlSettingsDevDependencies tomlSettings - return AppSettings - { appSettingsCompiler = compiler - , appSettingsProjectName = projectName - , appSettingsBuildPrefix = buildPrefix - , appSettingsFlags = if release - then - [ "-Wall" - , "-Wextra" - , "-Wimplicit-interface" - , "-fPIC" - , "-fmax-errors=1" - , "-O3" - , "-march=native" - , "-ffast-math" - , "-funroll-loops" - ] - else - [ "-Wall" - , "-Wextra" - , "-Wimplicit-interface" - , "-fPIC" - , "-fmax-errors=1" - , "-g" - , "-fbounds-check" - , "-fcheck-array-temporaries" - , "-fbacktrace" - ] - , appSettingsLibrary = librarySettings - , appSettingsExecutables = executableSettings - , appSettingsTests = testSettings - , appSettingsDependencies = dependencies - , appSettingsDevDependencies = devDependencies - } + return AppSettings { appSettingsCompiler = compilerSettings + , appSettingsProjectName = projectName + , appSettingsBuildPrefix = buildPrefix + , appSettingsLibrary = librarySettings + , appSettingsExecutables = executableSettings + , appSettingsTests = testSettings + , appSettingsDependencies = dependencies + , appSettingsDevDependencies = devDependencies + } + +defineCompilerSettings :: [String] -> FilePath -> Bool -> IO CompilerSettings +defineCompilerSettings specifiedFlags compiler release + | "gfortran" `isInfixOf` compiler + = let flags = case specifiedFlags of + [] -> if release + then + [ "-Wall" + , "-Wextra" + , "-Wimplicit-interface" + , "-fPIC" + , "-fmax-errors=1" + , "-O3" + , "-march=native" + , "-ffast-math" + , "-funroll-loops" + ] + else + [ "-Wall" + , "-Wextra" + , "-Wimplicit-interface" + , "-fPIC" + , "-fmax-errors=1" + , "-g" + , "-fbounds-check" + , "-fcheck-array-temporaries" + , "-fbacktrace" + ] + fs -> fs + in return $ CompilerSettings { compilerSettingsCompiler = compiler + , compilerSettingsFlags = flags + , compilerSettingsModuleFlag = "-J" + , compilerSettingsIncludeFlag = "-I" + } + | "caf" `isInfixOf` compiler + = let flags = case specifiedFlags of + [] -> if release + then + [ "-Wall" + , "-Wextra" + , "-Wimplicit-interface" + , "-fPIC" + , "-fmax-errors=1" + , "-O3" + , "-march=native" + , "-ffast-math" + , "-funroll-loops" + ] + else + [ "-Wall" + , "-Wextra" + , "-Wimplicit-interface" + , "-fPIC" + , "-fmax-errors=1" + , "-g" + , "-fbounds-check" + , "-fcheck-array-temporaries" + , "-fbacktrace" + ] + fs -> fs + in return $ CompilerSettings { compilerSettingsCompiler = compiler + , compilerSettingsFlags = flags + , compilerSettingsModuleFlag = "-J" + , compilerSettingsIncludeFlag = "-I" + } + | otherwise + = do + putStrLn $ "Sorry, compiler is currently unsupported: " ++ compiler + exitWith (ExitFailure 1) getLibrarySettings :: Maybe Library -> IO (Maybe Library) getLibrarySettings maybeSettings = case maybeSettings of @@ -531,11 +724,21 @@ getTestSettings [] = do else return [] getTestSettings tests = return tests -makeBuildPrefix :: String -> Bool -> IO String -makeBuildPrefix compiler release = +makeBuildPrefix :: FilePath -> [String] -> IO FilePath +makeBuildPrefix compiler flags = do -- TODO Figure out what other info should be part of this -- Probably version, and make sure to not include path to the compiler - return $ "build" </> compiler ++ "_" ++ if release then "release" else "debug" + versionInfo <- readProcess compiler ["--version"] [] + let compilerName = last (splitDirectories compiler) + let versionHash = abs (hash versionInfo) + let flagsHash = abs (hash flags) + return + $ "build" + </> compilerName + ++ "_" + ++ showHex versionHash "" + ++ "_" + ++ showHex flagsHash "" {- Fetching the dependencies is done on a sort of breadth first approach. All @@ -647,54 +850,49 @@ fetchDependency name version = do the transitive dependencies have been built before trying to build this one -} buildDependencies - :: String - -> String - -> [String] - -> [DependencyTree] - -> IO [(FilePath, FilePath)] -buildDependencies buildPrefix compiler flags dependencies = do - built <- concatMapM (buildDependency buildPrefix compiler flags) dependencies + :: String -> CompilerSettings -> [DependencyTree] -> IO [(FilePath, FilePath)] +buildDependencies buildPrefix compilerSettings dependencies = do + built <- concatMapM (buildDependency buildPrefix compilerSettings) + dependencies return $ reverse (nub (reverse built)) buildDependency - :: String -> String -> [String] -> DependencyTree -> IO [(FilePath, FilePath)] -buildDependency buildPrefix compiler flags (Dependency name path sourcePath mBuildScript dependencies) + :: String -> CompilerSettings -> DependencyTree -> IO [(FilePath, FilePath)] +buildDependency buildPrefix compilerSettings (Dependency name path sourcePath mBuildScript dependencies) = do transitiveDependencies <- buildDependencies buildPrefix - compiler - flags + compilerSettings dependencies let buildPath = buildPrefix </> name thisArchive <- case mBuildScript of Just script -> buildWithScript script path buildPath - compiler - flags + compilerSettings name (map fst transitiveDependencies) Nothing -> buildLibrary sourcePath [".f90", ".f", ".F", ".F90", ".f95", ".f03"] buildPath - compiler - flags + compilerSettings name (map fst transitiveDependencies) return $ (buildPath, thisArchive) : transitiveDependencies -createNewProject :: String -> Bool -> Bool -> IO () -createNewProject projectName withExecutable withTest = do +createNewProject :: String -> Bool -> Bool -> Bool -> IO () +createNewProject projectName withExecutable withTest withLib = do createDirectory projectName writeFile (projectName </> "fpm.toml") (templateFpmToml projectName) writeFile (projectName </> "README.md") (templateReadme projectName) writeFile (projectName </> ".gitignore") "build/*\n" - createDirectory (projectName </> "src") - writeFile (projectName </> "src" </> projectName <.> "f90") - (templateModule projectName) + when withLib $ do + createDirectory (projectName </> "src") + writeFile (projectName </> "src" </> projectName <.> "f90") + (templateModule projectName) when withExecutable $ do createDirectory (projectName </> "app") writeFile (projectName </> "app" </> "main.f90") - (templateProgram projectName) + (templateProgram projectName withLib) when withTest $ do createDirectory (projectName </> "test") writeFile (projectName </> "test" </> "main.f90") templateTest @@ -736,12 +934,11 @@ templateReadme :: String -> String templateReadme projectName = "# " ++ projectName ++ "\n" ++ "\n" ++ "My cool new project!\n" -templateProgram :: String -> String -templateProgram projectName = +templateProgram :: String -> Bool -> String +templateProgram projectName withLib = "program main\n" - ++ " use " - ++ projectName - ++ ", only: say_hello\n" + ++ (if withLib then " use " ++ projectName ++ ", only: say_hello\n" else "" + ) ++ "\n" ++ " implicit none\n" ++ "\n" diff --git a/bootstrap/test/Spec.hs b/bootstrap/test/Spec.hs index 4e660e7..dfa73df 100644 --- a/bootstrap/test/Spec.hs +++ b/bootstrap/test/Spec.hs @@ -1,6 +1,5 @@ import Development.Shake.FilePath ( (</>) ) import Fpm ( Arguments(..) - , Command(..) , start ) import System.Directory ( withCurrentDirectory ) @@ -19,49 +18,66 @@ main = do testHelloWorld :: IO () testHelloWorld = - withCurrentDirectory (example_path </> "hello_world") $ start $ Arguments - (Run "") - False - "" + withCurrentDirectory (example_path </> "hello_world") $ start $ Run + { runRelease = False + , runCompiler = "gfortran" + , runFlags = [] + , runTarget = Nothing + , runArgs = Nothing + } testHelloComplex :: IO () testHelloComplex = - withCurrentDirectory (example_path </> "hello_complex") $ start $ Arguments - (Test "") - False - "" + withCurrentDirectory (example_path </> "hello_complex") $ start $ Test + { testRelease = False + , testCompiler = "gfortran" + , testFlags = [] + , testTarget = Nothing + , testArgs = Nothing + } testHelloFpm :: IO () testHelloFpm = - withCurrentDirectory (example_path </> "hello_fpm") $ start $ Arguments - (Run "") - False - "" + withCurrentDirectory (example_path </> "hello_fpm") $ start $ Run + { runRelease = False + , runCompiler = "gfortran" + , runFlags = [] + , runTarget = Nothing + , runArgs = Nothing + } testCircular :: IO () testCircular = - withCurrentDirectory (example_path </> "circular_example") $ start $ Arguments - (Test "") - False - "" + withCurrentDirectory (example_path </> "circular_example") $ start $ Test + { testRelease = False + , testCompiler = "gfortran" + , testFlags = [] + , testTarget = Nothing + , testArgs = Nothing + } testWithMakefile :: IO () testWithMakefile = - withCurrentDirectory (example_path </> "with_makefile") $ start $ Arguments - (Build) - False - "" + withCurrentDirectory (example_path </> "with_makefile") $ start $ Build + { buildRelease = False + , buildCompiler = "gfortran" + , buildFlags = [] + } testMakefileComplex :: IO () testMakefileComplex = - withCurrentDirectory (example_path </> "makefile_complex") $ start $ Arguments - (Run "") - False - "" + withCurrentDirectory (example_path </> "makefile_complex") $ start $ Run + { runRelease = False + , runCompiler = "gfortran" + , runFlags = [] + , runTarget = Nothing + , runArgs = Nothing + } testSubmodule :: IO () testSubmodule = - withCurrentDirectory (example_path </> "submodules") $ start $ Arguments - (Build) - False - "" + withCurrentDirectory (example_path </> "submodules") $ start $ Build + { buildRelease = False + , buildCompiler = "gfortran" + , buildFlags = [] + } diff --git a/ci/run_tests.bat b/ci/run_tests.bat index de45f24..0c0339c 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -14,13 +14,15 @@ fpm test if errorlevel 1 exit 1 rmdir fpm_scratch_* /s /q -build\gfortran_debug\app\fpm +for /f %%i in ('where /r build fpm.exe') do set fpm_path=%%i + +%fpm_path% if errorlevel 1 exit 1 cd ..\example_packages\hello_world if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 .\build\gfortran_debug\app\hello_world @@ -30,7 +32,7 @@ if errorlevel 1 exit 1 cd ..\hello_fpm if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 .\build\gfortran_debug\app\hello_fpm @@ -40,21 +42,21 @@ if errorlevel 1 exit 1 cd ..\circular_test if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 cd ..\circular_example if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 cd ..\hello_complex if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 .\build\gfortran_debug\app\say_Hello @@ -73,7 +75,7 @@ if errorlevel 1 exit 1 cd ..\hello_complex_2 if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 .\build\gfortran_debug\app\say_hello_world @@ -91,7 +93,7 @@ if errorlevel 1 exit 1 cd ..\auto_discovery_off if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 .\build\gfortran_debug\app\auto_discovery_off @@ -108,7 +110,7 @@ if exist .\build\gfortran_debug\test\unused_test exit /B 1 cd ..\with_c if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 .\build\gfortran_debug\app\with_c @@ -118,14 +120,14 @@ if errorlevel 1 exit 1 cd ..\submodules if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 cd ..\program_with_module if errorlevel 1 exit 1 -..\..\fpm\build\gfortran_debug\app\fpm build +%fpm_path% build if errorlevel 1 exit 1 .\build\gfortran_debug\app\Program_with_module diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 4f293e2..625f37b 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -1,5 +1,17 @@ #!/bin/bash +get_abs_filename() { + # $1 : relative filename + filename=$1 + parentdir=$(dirname "${filename}") + + if [ -d "${filename}" ]; then + echo "$(cd "${filename}" && pwd)" + elif [ -d "${parentdir}" ]; then + echo "$(cd "${parentdir}" && pwd)/$(basename "${filename}")" + fi +} + set -ex cd fpm @@ -8,50 +20,52 @@ fpm run rm -rf fpm_scratch_*/ fpm test rm -rf fpm_scratch_*/ -build/gfortran_debug/app/fpm + +f_fpm_path="$(get_abs_filename $(find build -regex 'build/.*/app/fpm'))" +"${f_fpm_path}" cd ../example_packages/hello_world -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build ./build/gfortran_debug/app/hello_world cd ../hello_fpm -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build ./build/gfortran_debug/app/hello_fpm cd ../circular_test -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build cd ../circular_example -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build cd ../hello_complex -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build ./build/gfortran_debug/app/say_Hello ./build/gfortran_debug/app/say_goodbye ./build/gfortran_debug/test/greet_test ./build/gfortran_debug/test/farewell_test cd ../hello_complex_2 -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build ./build/gfortran_debug/app/say_hello_world ./build/gfortran_debug/app/say_goodbye ./build/gfortran_debug/test/greet_test ./build/gfortran_debug/test/farewell_test cd ../auto_discovery_off -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build ./build/gfortran_debug/app/auto_discovery_off ./build/gfortran_debug/test/my_test test ! -x ./build/gfortran_debug/app/unused test ! -x ./build/gfortran_debug/test/unused_test cd ../with_c -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build ./build/gfortran_debug/app/with_c cd ../submodules -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build cd ../program_with_module -../../fpm/build/gfortran_debug/app/fpm build +"${f_fpm_path}" build ./build/gfortran_debug/app/Program_with_module diff --git a/example_packages/auto_discovery_off/.gitignore b/example_packages/auto_discovery_off/.gitignore new file mode 100644 index 0000000..a007fea --- /dev/null +++ b/example_packages/auto_discovery_off/.gitignore @@ -0,0 +1 @@ +build/* diff --git a/example_packages/program_with_module/.gitignore b/example_packages/program_with_module/.gitignore new file mode 100644 index 0000000..a007fea --- /dev/null +++ b/example_packages/program_with_module/.gitignore @@ -0,0 +1 @@ +build/* diff --git a/example_packages/with_c/.gitignore b/example_packages/with_c/.gitignore new file mode 100644 index 0000000..a007fea --- /dev/null +++ b/example_packages/with_c/.gitignore @@ -0,0 +1 @@ +build/* diff --git a/fpm/test/new_test/new_test.f90 b/fpm/test/new_test/new_test.f90 index 8007f7a..2220b43 100644 --- a/fpm/test/new_test/new_test.f90 +++ b/fpm/test/new_test/new_test.f90 @@ -1,13 +1,13 @@ program new_test use,intrinsic :: iso_fortran_env, only : stdin=>input_unit, stdout=>output_unit, stderr=>error_unit -use fpm_filesystem, only : is_dir, list_files, exists, windows_path +use fpm_filesystem, only : is_dir, list_files, exists, windows_path, join_path use fpm_strings, only : string_t, operator(.in.) -use fpm_environment, only : run, get_os_type +use fpm_environment, only : run, get_os_type use fpm_environment, only : OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_CYGWIN, OS_SOLARIS, OS_FREEBSD, OS_WINDOWS implicit none type(string_t), allocatable :: file_names(:) integer :: i, j, k -character(len=*),parameter :: cmdpath = 'build/gfortran_debug/app/fpm' +character(len=:),allocatable :: cmdpath character(len=:),allocatable :: path character(len=*),parameter :: scr = 'fpm_scratch_' character(len=*),parameter :: cmds(*) = [character(len=80) :: & @@ -35,6 +35,8 @@ character(len=:),allocatable :: expected(:) logical,allocatable :: tally(:) logical :: IS_OS_WINDOWS write(*,'(g0:,1x)')'TEST new SUBCOMMAND (draft):' + + cmdpath = get_command_path() allocate(tally(0)) shortdirs=[character(len=80) :: 'A','B','C','D','E','F','G','BB','CC'] allocate(character(len=80) :: directories(size(shortdirs))) @@ -44,18 +46,18 @@ logical :: IS_OS_WINDOWS !! o assuming fpm command is in expected path and the new version !! o DOS versus POSIX filenames is_os_windows=.false. - select case (get_os_type()) + select case (get_os_type()) case (OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_CYGWIN, OS_SOLARIS, OS_FREEBSD) call execute_command_line('rm -rf fpm_scratch_*',exitstat=estat,cmdstat=cstat,cmdmsg=message) path=cmdpath - case (OS_WINDOWS) + case (OS_WINDOWS) path=windows_path(cmdpath) is_os_windows=.true. call execute_command_line('rmdir fpm_scratch_* /s /q',exitstat=estat,cmdstat=cstat,cmdmsg=message) case default write(*,*)'ERROR: unknown OS. Stopping test' stop 2 - end select + end select do i=1,size(directories) directories(i)=scr//trim(shortdirs(i)) if( is_dir(trim(directories(i))) ) then @@ -121,7 +123,7 @@ logical :: IS_OS_WINDOWS endif do j=1,size(expected) - + expected(j)=scr//expected(j) if(is_os_windows) expected(j)=windows_path(expected(j)) if( .not.(trim(expected(j)).in.file_names) )then @@ -137,12 +139,12 @@ logical :: IS_OS_WINDOWS enddo TESTS ! clean up scratch files; might want an option to leave them for inspection - select case (get_os_type()) + select case (get_os_type()) case (OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_CYGWIN, OS_SOLARIS, OS_FREEBSD) call execute_command_line('rm -rf fpm_scratch_*',exitstat=estat,cmdstat=cstat,cmdmsg=message) - case (OS_WINDOWS) + case (OS_WINDOWS) call execute_command_line('rmdir fpm_scratch_* /s /q',exitstat=estat,cmdstat=cstat,cmdmsg=message) - end select + end select write(*,'("TALLY=",*(g0))')tally if(all(tally))then @@ -151,5 +153,19 @@ logical :: IS_OS_WINDOWS write(*,*)'FAILED: PASSED=',count(tally),' FAILED=',count(.not.tally) stop 5 endif +contains + function get_command_path() result(command_path) + character(len=:), allocatable :: command_path + + type(string_t), allocatable :: files(:) + integer :: i + call list_files("build", files) + do i = 1, size(files) + if (index(files(i)%s, "gfortran") > 0) then + command_path = join_path(files(i)%s, "app", "fpm") + return + end if + end do + end function end program new_test |