implement clean --test --apps --examples

Author: perazz

src/fpm.f90

@@ -17,7 +17,7 @@ module fpm
 
 use fpm_sources, only: add_executable_sources, add_sources_from_dir
 use fpm_targets, only: targets_from_sources, build_target_t, build_target_ptr, &
-                        FPM_TARGET_EXECUTABLE, get_library_dirs
+                        FPM_TARGET_EXECUTABLE, get_library_dirs, filter_executable_targets
 use fpm_manifest, only : get_package_data, package_config_t
 use fpm_meta, only : resolve_metapackages
 use fpm_error, only : error_t, fatal_error, fpm_stop
@@ -692,6 +692,81 @@ subroutine delete_skip(is_unix)
     end do
 end subroutine delete_skip
 
+!> Delete targets of a specific scope with given description
+subroutine delete_targets_by_scope(targets, scope, scope_name, deleted_any)
+    type(build_target_ptr), intent(in) :: targets(:)
+    integer, intent(in) :: scope
+    character(len=*), intent(in) :: scope_name
+    logical, intent(inout) :: deleted_any
+
+    type(string_t), allocatable :: scope_targets(:)
+    integer :: i
+
+    call filter_executable_targets(targets, scope, scope_targets)
+    if (size(scope_targets) > 0) then
+        write(stdout, '(A,I0,A,A,A)') "Deleting ", size(scope_targets), " ", scope_name, " targets"
+        do i = 1, size(scope_targets)
+            if (exists(scope_targets(i)%s)) then
+                call run('rm -f "'//scope_targets(i)%s//'"')
+                deleted_any = .true.
+            end if
+        end do
+    end if
+end subroutine delete_targets_by_scope
+
+!> Delete build artifacts for specific target types (test, apps, examples)
+subroutine delete_targets(settings, error)
+    class(fpm_clean_settings), intent(in) :: settings
+    type(error_t), allocatable, intent(out) :: error
+
+    type(package_config_t) :: package
+    type(fpm_model_t) :: model
+    type(build_target_ptr), allocatable :: targets(:)
+    type(fpm_build_settings) :: build_settings
+    logical :: deleted_any
+
+    ! Get package configuration
+    call get_package_data(package, settings%working_dir, error)
+    if (allocated(error)) return
+
+    ! Create minimal build settings to build the model
+    build_settings%working_dir = settings%working_dir
+    build_settings%path_to_config = settings%path_to_config
+    build_settings%build_tests = .true.
+    build_settings%prune = .true.
+    if (allocated(build_settings%profile)) deallocate(build_settings%profile)
+    allocate(character(len=5) :: build_settings%profile)
+    build_settings%profile = "debug"
+
+    ! Build the model to understand targets
+    call build_model(model, build_settings, package, error)
+    if (allocated(error)) return
+
+    ! Get build targets
+    call targets_from_sources(targets, model, build_settings%prune, error=error)
+    if (allocated(error)) return
+
+    deleted_any = .false.
+
+    ! Delete targets by scope
+    if (settings%clean_test) then
+        call delete_targets_by_scope(targets, FPM_SCOPE_TEST, "test", deleted_any)
+    end if
+
+    if (settings%clean_apps) then
+        call delete_targets_by_scope(targets, FPM_SCOPE_APP, "app", deleted_any)
+    end if
+
+    if (settings%clean_examples) then
+        call delete_targets_by_scope(targets, FPM_SCOPE_EXAMPLE, "example", deleted_any)
+    end if
+
+    if (.not. deleted_any) then
+        write(stdout, '(A)') "No matching build targets found to delete."
+    end if
+
+end subroutine delete_targets
+
 !> Delete the build directory including or excluding dependencies. Can be used
 !> to clear the registry cache.
 subroutine cmd_clean(settings)
@@ -710,6 +785,20 @@ subroutine cmd_clean(settings)
         call os_delete_dir(os_is_unix(), global_settings%registry_settings%cache_path)
     end if
 
+    ! Handle target-specific cleaning
+    if (any([settings%clean_test, settings%clean_apps, settings%clean_examples])) then
+        if (.not. is_dir('build')) then
+            write (stdout, '(A)') "fpm: No build directory found."
+            return
+        end if
+        call delete_targets(settings, error)
+        if (allocated(error)) then
+            write(stderr, '(A)') 'Error: ' // error%message
+            return
+        end if
+        return
+    end if
+
     if (is_dir('build')) then
         ! Remove the entire build directory
         if (settings%clean_all) then

src/fpm_command_line.f90

@@ -132,6 +132,9 @@ module fpm_command_line
 type, extends(fpm_cmd_settings)   :: fpm_clean_settings
     logical                       :: clean_skip = .false.
     logical                       :: clean_all = .false.
+    logical                       :: clean_test = .false.
+    logical                       :: clean_apps = .false.
+    logical                       :: clean_examples = .false.
     logical                       :: registry_cache = .false.
 end type
 
@@ -712,26 +715,42 @@ subroutine get_command_line_settings(cmd_settings)
             &   ' --registry-cache'   // &
             &   ' --skip'             // &
             &   ' --all'              // &
+            &   ' --test'             // &
+            &   ' --apps'             // &
+            &   ' --examples'         // &
             &   ' --config-file ""', help_clean, version_text)
 
             block
-                logical :: skip, clean_all
+                logical :: skip, clean_all, clean_test, clean_apps, clean_examples
+                logical :: target_specific
 
                 skip = lget('skip')
                 clean_all = lget('all')
+                clean_test = lget('test')
+                clean_apps = lget('apps')
+                clean_examples = lget('examples')
                 config_file = sget('config-file')
 
+                target_specific = any([clean_test, clean_apps, clean_examples])
+
                 if (all([skip, clean_all])) then
                     call fpm_stop(6, 'Do not specify both --skip and --all options on the clean subcommand.')
                 end if
 
+                if (target_specific .and. any([skip, clean_all])) then
+                    call fpm_stop(6, 'Cannot combine target-specific flags (--test, --apps, --examples) with --skip or --all.')
+                end if
+
                 allocate(fpm_clean_settings :: cmd_settings)
                 call get_current_directory(working_dir, error)
                 cmd_settings = fpm_clean_settings( &
                 &   working_dir=working_dir, &
                 &   clean_skip=skip, &
                 &   registry_cache=lget('registry-cache'), &
                 &   clean_all=clean_all, &
+                &   clean_test=clean_test, &
+                &   clean_apps=clean_apps, &
+                &   clean_examples=clean_examples, &
                 &   path_to_config=config_file)
             end block
 
@@ -1501,16 +1520,21 @@ subroutine set_help()
     ' clean(1) - delete the build', &
     '', &
     'SYNOPSIS', &
-    ' fpm clean', &
+    ' fpm clean [--skip|--all]', &
+    ' fpm clean [--test] [--apps] [--examples]', &
     '', &
     'DESCRIPTION', &
     ' Prompts the user to confirm deletion of the build. If affirmative,', &
     ' directories in the build/ directory are deleted, except dependencies.', &
     ' Use the --registry-cache option to delete the registry cache.', &
+    ' Use target-specific flags to delete only certain build artifacts.', &
     '', &
     'OPTIONS', &
     ' --skip              Delete the build without prompting but skip dependencies.', &
     ' --all               Delete the build without prompting including dependencies.', &
+    ' --test              Delete only test executables.', &
+    ' --apps              Delete only application executables.', &
+    ' --examples          Delete only example executables.', &
     ' --config-file PATH  Custom location of the global config file.', &
     ' --registry-cache    Delete registry cache.', &
     '' ]

test/cli_test/cli_test.f90

@@ -29,6 +29,9 @@ program main
 logical                              :: w_t,act_w_t          ; namelist/act_cli/act_w_t
 logical                              :: c_s,act_c_s          ; namelist/act_cli/act_c_s
 logical                              :: c_a,act_c_a          ; namelist/act_cli/act_c_a
+logical                              :: c_t,act_c_t          ; namelist/act_cli/act_c_t
+logical                              :: c_apps,act_c_apps    ; namelist/act_cli/act_c_apps
+logical                              :: c_ex,act_c_ex        ; namelist/act_cli/act_c_ex
 logical                              :: reg_c,act_reg_c      ; namelist/act_cli/act_reg_c
 logical                              :: show_v,act_show_v    ; namelist/act_cli/act_show_v
 logical                              :: show_u_d,act_show_u_d; namelist/act_cli/act_show_u_d
@@ -37,7 +40,7 @@ program main
 
 character(len=:), allocatable        :: profile,act_profile  ; namelist/act_cli/act_profile
 character(len=:), allocatable        :: args,act_args        ; namelist/act_cli/act_args
-namelist/expected/cmd,cstat,estat,w_e,w_t,c_s,c_a,reg_c,name,profile,args,show_v,show_u_d,dry_run,token
+namelist/expected/cmd,cstat,estat,w_e,w_t,c_s,c_a,c_t,c_apps,c_ex,reg_c,name,profile,args,show_v,show_u_d,dry_run,token
 integer                              :: lun
 logical,allocatable                  :: tally(:)
 logical,allocatable                  :: subtally(:)
@@ -76,6 +79,10 @@ program main
 'CMD="clean",                                                      NAME=, ARGS="",', &
 'CMD="clean --skip",                                        C_S=T, NAME=, ARGS="",', &
 'CMD="clean --all",                                         C_A=T, NAME=, ARGS="",', &
+'CMD="clean --test",                                        C_T=T, NAME=, ARGS="",', &
+'CMD="clean --apps",                                     C_APPS=T, NAME=, ARGS="",', &
+'CMD="clean --examples",                                    C_EX=T, NAME=, ARGS="",', &
+'CMD="clean --test --apps",                           C_T=T, C_APPS=T, NAME=, ARGS="",', &
 'CMD="clean --registry-cache",                            REG_C=T, NAME=, ARGS="",', &
 'CMD="publish --token abc --show-package-version",       SHOW_V=T, NAME=, token="abc",ARGS="",', &
 'CMD="publish --token abc --show-upload-data",           SHOW_U_D=T, NAME=, token="abc",ARGS="",', &
@@ -273,6 +280,9 @@ subroutine parse()
 type is (fpm_clean_settings)
     act_c_s=settings%clean_skip
     act_c_a=settings%clean_all
+    act_c_t=settings%clean_test
+    act_c_apps=settings%clean_apps
+    act_c_ex=settings%clean_examples
     act_reg_c=settings%registry_cache
 type is (fpm_install_settings)
 type is (fpm_publish_settings)