Merge branch 'main' into enable_profiles_in_toml

Author: everythingfunctional

.github/workflows/CI.yml

@@ -59,11 +59,20 @@ jobs:
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
         --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
 
+    - name: Install GFortran Windows
+      if: contains(matrix.os, 'windows')
+      run: |
+        Invoke-WebRequest -Uri $Env:GCC_DOWNLOAD -OutFile mingw-w64.zip
+        Expand-Archive mingw-w64.zip
+        echo "$pwd\mingw-w64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      env:
+        GCC_DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/9.4.0-9.0.0-msvcrt-r2/winlibs-x86_64-posix-seh-gcc-9.4.0-mingw-w64-9.0.0-r2.zip"
+
     # Phase 1: Bootstrap fpm with existing version
     - name: Install fpm
       uses: fortran-lang/setup-fpm@v3
       with:
-        fpm-version: 'v0.2.0'
+        fpm-version: 'v0.3.0'
 
     - name: Remove fpm from path
       shell: bash

README.md

@@ -37,7 +37,7 @@ Binaries for the latest stable release are available [to download](https://githu
 
 __Note:__ On Linux and MacOS, you will need to enable executable permission before you can use the binary.
 
-_e.g._ `$ chmod u+x fpm-0.5.0-linux-x86_64`
+_e.g._ `$ chmod u+x fpm-0.6.0-linux-x86_64`
 
 The binaries at the [current tag](https://github.com/fortran-lang/fpm/releases/tag/current) are updated automatically to always provide the current git version from the default branch.
 
@@ -66,7 +66,8 @@ or from [miniconda](https://docs.conda.io/en/latest/miniconda.html).
 
 #### [MSYS2]
 
-Fpm is available as MinGW package in the MSYS2 package manager.
+Fpm is available as MinGW package in the MSYS2 package manager,
+which supports parallelization of the target compilation.
 To install fpm with pacman use
 
 ```
@@ -101,6 +102,21 @@ For more details check the package information [here](https://spack.readthedocs.
 [Spack]: https://spack.io
 
 
+#### Homebrew
+
+The Fortran Package Manager (fpm) is available for the [Homebrew](https://brew.sh/) package manager via an additional tap.
+To install fpm via brew, include the new tap and install using
+
+```
+brew tap fortran-lang/fortran
+brew install fpm
+```
+
+Binary distributions are available for MacOS 11 (Catalina) and 12 (Big Sur) for x86_64 architectures. For other platforms fpm will be built locally from source automatically.
+
+Fpm should be available and functional after those steps.
+For more details checkout the tap [here](https://github.com/fortran-lang/homebrew-fortran).
+
 #### Github Actions
 
 To setup *fpm* within Github actions for automated testing, you can use the [fortran-lang/setup-fpm](https://github.com/marketplace/actions/setup-fpm) action.

app/main.f90

@@ -8,10 +8,11 @@ program main
         fpm_test_settings, &
         fpm_install_settings, &
         fpm_update_settings, &
+        fpm_clean_settings, &
         get_command_line_settings
 use fpm_error, only: error_t
 use fpm_filesystem, only: exists, parent_dir, join_path
-use fpm, only: cmd_build, cmd_run
+use fpm, only: cmd_build, cmd_run, cmd_clean
 use fpm_cmd_install, only: cmd_install
 use fpm_cmd_new, only: cmd_new
 use fpm_cmd_update, only : cmd_update
@@ -45,20 +46,24 @@ program main
     pwd_working = pwd_start
 end if
 
-if (.not.has_manifest(pwd_working)) then
-    project_root = pwd_working
-    do while(.not.has_manifest(project_root))
-        working_dir = parent_dir(project_root)
-        if (len(working_dir) == 0) exit
-        project_root = working_dir
-    end do
-
-    if (has_manifest(project_root)) then
-        call change_directory(project_root, error)
-        call handle_error(error)
-        write(output_unit, '(*(a))') "fpm: Entering directory '"//project_root//"'"
+select type (settings => cmd_settings)
+type is (fpm_new_settings)
+class default
+    if (.not.has_manifest(pwd_working)) then
+        project_root = pwd_working
+        do while(.not.has_manifest(project_root))
+            working_dir = parent_dir(project_root)
+            if (len(working_dir) == 0) exit
+            project_root = working_dir
+        end do
+
+        if (has_manifest(project_root)) then
+            call change_directory(project_root, error)
+            call handle_error(error)
+            write(output_unit, '(*(a))') "fpm: Entering directory '"//project_root//"'"
+        end if
     end if
-end if
+end select
 
 select type(settings=>cmd_settings)
 type is (fpm_new_settings)
@@ -73,6 +78,8 @@ program main
     call cmd_install(settings)
 type is (fpm_update_settings)
     call cmd_update(settings)
+type is (fpm_clean_settings)
+    call cmd_clean(settings)
 end select
 
 if (allocated(project_root)) then

ci/run_tests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -ex
 
 cd "$(dirname $0)/.."
@@ -62,6 +62,22 @@ test ! -x ./build/gfortran_*/app/unused
 test ! -x ./build/gfortran_*/test/unused_test
 popd
 
+pushd tree_shake
+"$fpm" build
+"$fpm" run
+"$fpm" test
+test ! -e ./build/gfortran_*/tree_shake/src_farewell_m.f90.o
+test ! -e ./build/gfortran_*/tree_shake/src_farewell_m.f90.o.log
+popd
+
+pushd submodule_tree_shake
+"$fpm" run
+test ! -e ./build/gfortran_*/submodule_tree_shake/src_parent_unused.f90.o
+test ! -e ./build/gfortran_*/submodule_tree_shake/src_parent_unused.f90.o.log
+test ! -e ./build/gfortran_*/submodule_tree_shake/src_child_unused.f90.o
+test ! -e ./build/gfortran_*/submodule_tree_shake/src_child_unused.f90.o.log
+popd
+
 pushd version_file
 "$fpm" build
 "$fpm" run
@@ -76,6 +92,10 @@ pushd submodules
 "$fpm" build
 popd
 
+pushd app_with_submodule
+"$fpm" run --all
+popd
+
 pushd program_with_module
 "$fpm" build
 "$fpm" run --target Program_with_module
@@ -102,5 +122,29 @@ pushd c_main
 "$fpm" run
 popd
 
+pushd app_with_c
+"$fpm" run
+popd
+
+pushd hello_fpm_path
+"$fpm" run
+popd
+
+pushd preprocess_cpp
+"$fpm" build
+popd
+
+pushd preprocess_hello
+"$fpm" build
+popd
+
+pushd fpm_test_exe_issues
+"$fpm" build
+popd
+
+pushd cpp_files
+"$fpm" test
+popd
+
 # Cleanup
 rm -rf ./*/build

example_packages/README.md

@@ -6,6 +6,8 @@ the features demonstrated in each package and which versions of fpm are supporte
 
 | Name                | Features                                                      | Bootstrap (Haskell) fpm | fpm |
 |---------------------|---------------------------------------------------------------|:-----------------------:|:---:|
+| app_with_c          | C files located in app directory (not src)                    |            N            |  Y  |
+| app_with_submodule  | Submodules located in app directory (not src)                 |            N            |  Y  |
 | auto_discovery_off  | Default layout with auto-discovery disabled                   |            N            |  Y  |
 | c_header_only       | C header-only library                                         |            N            |  Y  |
 | c_includes          | C library with c include directory and dependency includes    |            N            |  Y  |
@@ -20,8 +22,14 @@ the features demonstrated in each package and which versions of fpm are supporte
 | 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  |
+| tree_shake          | Test tree-shaking/pruning of unused module dependencies       |            N            |  Y  |
+| submodule_tree_shake| Test tree-shaking/pruning with submodules dependencies        |            N            |  Y  |
 | link_external       | Link external library                                         |            N            |  Y  |
 | link_executable     | Link external library to a single executable                  |            N            |  Y  |
 | version_file        | Read version number from a file in the project root           |            N            |  Y  |
 | with_c              | Compile with `c` source files                                 |            N            |  Y  |
 | with_makefile       | External build command (makefile)                             |            Y            |  N  |
+| preprocess_cpp      | Lib only; C preprocessing; Macro parsing                      |            N            |  Y  |
+| preprocess_hello    | App only; Macros remain local to the package                 |            N            |  Y  |
+| preprocess_hello_dependency | Lib only; Macros not getting passed here from root    |            N            |  Y  |
+| cpp_files           | C++ files get compiled using fpm                              |            N            |  Y  |

example_packages/app_with_c/.gitignore

@@ -0,0 +1 @@
+build/*

example_packages/app_with_c/app/c_code.c

@@ -0,0 +1,11 @@
+#include <sys/stat.h>
+/*
+ *  Decides whether a given file name is a directory.
+ *  return 1 if file exists and is a directory
+ *  Source (Public domain): https://github.com/urbanjost/M_system
+ */
+int my_isdir(const char *path)
+{
+    struct stat sb;
+    return stat(path, &sb) == 0 && S_ISDIR(sb.st_mode);
+}

example_packages/app_with_c/app/main.f90

@@ -0,0 +1,37 @@
+module with_c
+    use iso_c_binding, only: c_char, c_int, c_null_char
+    implicit none
+
+contains
+
+    function system_isdir(dirname)
+        ! Source (Public domain): https://github.com/urbanjost/M_system
+        !
+        implicit none
+        character(len=*), intent(in) :: dirname
+        logical :: system_isdir
+
+        interface
+            function c_isdir(dirname) bind(C, name="my_isdir") result(c_ierr)
+                import c_char, c_int
+                character(kind=c_char, len=1), intent(in) :: dirname(*)
+                integer(kind=c_int) :: c_ierr
+            end function c_isdir
+        end interface
+
+        system_isdir = c_isdir(trim(dirname)//c_null_char) == 1
+
+    end function system_isdir
+
+end module with_c
+
+program with_c_app
+    use with_c
+    implicit none
+
+    write (*, *) "isdir('app') = ", system_isdir('app')
+    write (*, *) "isdir('src') = ", system_isdir('src')
+    write (*, *) "isdir('test') = ", system_isdir('test')
+    write (*, *) "isdir('bench') = ", system_isdir('bench')
+
+end program with_c_app

example_packages/app_with_c/fpm.toml

@@ -0,0 +1 @@
+name = "with_c"

example_packages/app_with_submodule/.gitignore

@@ -0,0 +1 @@
+build/*