From 8d8b6ace5f0c2d208e5bfccecd70b6082832bc3e Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Fri, 28 Feb 2020 07:48:45 -0800 Subject: Enable capitalization of source files --- example_project/app/Hello_world.f90 | 7 +++++++ example_project/app/hello_world.f90 | 7 ------- example_project/src/Hello_m.f90 | 12 ++++++++++++ example_project/src/hello_m.f90 | 12 ------------ src/Build.hs | 9 ++++++--- 5 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 example_project/app/Hello_world.f90 delete mode 100644 example_project/app/hello_world.f90 create mode 100644 example_project/src/Hello_m.f90 delete mode 100644 example_project/src/hello_m.f90 diff --git a/example_project/app/Hello_world.f90 b/example_project/app/Hello_world.f90 new file mode 100644 index 0000000..956a6c2 --- /dev/null +++ b/example_project/app/Hello_world.f90 @@ -0,0 +1,7 @@ +program Hello_world + use Hello_m, only: sayHello + + implicit none + + call sayHello("World") +end program Hello_world diff --git a/example_project/app/hello_world.f90 b/example_project/app/hello_world.f90 deleted file mode 100644 index b95062d..0000000 --- a/example_project/app/hello_world.f90 +++ /dev/null @@ -1,7 +0,0 @@ -program hello_world - use hello_m, only: sayHello - - implicit none - - call sayHello("World") -end program hello_world diff --git a/example_project/src/Hello_m.f90 b/example_project/src/Hello_m.f90 new file mode 100644 index 0000000..60088a2 --- /dev/null +++ b/example_project/src/Hello_m.f90 @@ -0,0 +1,12 @@ +module Hello_m + implicit none + private + + public :: sayHello +contains + subroutine sayHello(name) + character(len=*), intent(in) :: name + + print *, "Hello, " // name // "!" + end subroutine sayHello +end module Hello_m diff --git a/example_project/src/hello_m.f90 b/example_project/src/hello_m.f90 deleted file mode 100644 index a341602..0000000 --- a/example_project/src/hello_m.f90 +++ /dev/null @@ -1,12 +0,0 @@ -module hello_m - implicit none - private - - public :: sayHello -contains - subroutine sayHello(name) - character(len=*), intent(in) :: name - - print *, "Hello, " // name // "!" - end subroutine sayHello -end module hello_m diff --git a/src/Build.hs b/src/Build.hs index fa0fa96..813c10e 100644 --- a/src/Build.hs +++ b/src/Build.hs @@ -105,7 +105,7 @@ buildPrograms programDirectory libraryDirectories sourceExtensions buildDirector flags ["-o", objectFile, sourceFile] (`elem` executables) ?> \exe -> do - let objectFile = exe -<.> "o" + let objectFile = map toLower exe -<.> "o" need [objectFile] need archives cmd compiler objectFile archives ["-o", exe] flags @@ -216,8 +216,11 @@ createSourceToObjectMap buildDirectory libraryDirectory sourceFile = sourceFileToObjectFile :: FilePath -> FilePath -> FilePath -> FilePath sourceFileToObjectFile buildDirectory libraryDirectory sourceFile = buildDirectory - pathSeparatorsToUnderscores - (makeRelative libraryDirectory sourceFile) + map + toLower + (pathSeparatorsToUnderscores + (makeRelative libraryDirectory sourceFile) + ) -<.> "o" sourceFileToExecutable :: FilePath -> FilePath -> FilePath -> FilePath -- cgit v1.2.3