Merge branch 'main' into space-help-cmd-test

Author: LKedward

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
@@ -73,6 +74,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

@@ -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

example_packages/README.md

@@ -20,6 +20,8 @@ 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  |

example_packages/submodule_tree_shake/.gitignore

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

example_packages/submodule_tree_shake/app/main.f90

@@ -0,0 +1,9 @@
+program test
+use parent
+
+integer :: a, b
+
+call my_sub1(a)
+call my_sub2(b)
+
+end program test

example_packages/submodule_tree_shake/fpm.toml

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

example_packages/submodule_tree_shake/src/child1.f90

@@ -0,0 +1,16 @@
+submodule(parent) child1
+implicit none
+
+interface
+    module function my_fun() result (b)
+        integer :: b
+    end function my_fun
+end interface
+
+contains
+
+module procedure my_sub1
+    a = my_fun()
+end procedure my_sub1
+
+end submodule child1

example_packages/submodule_tree_shake/src/child2.f90

@@ -0,0 +1,10 @@
+submodule(parent) child2
+implicit none
+
+contains
+
+module procedure my_sub2
+    a = 2
+end procedure my_sub2
+
+end submodule child2

example_packages/submodule_tree_shake/src/child_unused.f90

@@ -0,0 +1,10 @@
+submodule(parent_unused) child_unused
+implicit none
+
+contains
+
+module procedure unused_sub
+    a = 1
+end procedure unused_sub
+
+end submodule child_unused

example_packages/submodule_tree_shake/src/grandchild.f90

@@ -0,0 +1,10 @@
+submodule(parent:child1) grandchild
+implicit none
+
+contains
+
+module procedure my_fun
+    b = 2
+end procedure my_fun
+
+end submodule grandchild