Merge branch 'master' into NEW

Author: urbanjost

ci/run_tests.bat

@@ -44,6 +44,41 @@ if errorlevel 1 exit 1
 if errorlevel 1 exit 1
 
 
+cd ..\hello_complex_2
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\say_hello_world
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\say_goodbye
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\test\greet_test
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\test\farewell_test
+
+
+cd ..\auto_discovery_off
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\auto_discovery_off
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\test\my_test
+if errorlevel 1 exit 1
+
+if exist .\build\gfortran_debug\app\unused exit /B 1
+
+if exist .\build\gfortran_debug\test\unused_test exit /B 1
+
+
 cd ..\with_c
 if errorlevel 1 exit 1
 

ci/run_tests.sh

@@ -19,6 +19,20 @@ cd ../hello_complex
 ./build/gfortran_debug/test/greet_test
 ./build/gfortran_debug/test/farewell_test
 
+cd ../hello_complex_2
+../../../fpm/build/gfortran_debug/app/fpm 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
+./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
 ./build/gfortran_debug/app/with_c
@@ -28,4 +42,4 @@ cd ../submodules
 
 cd ../program_with_module
 ../../../fpm/build/gfortran_debug/app/fpm build
-./build/gfortran_debug/app/Program_with_module
+./build/gfortran_debug/app/Program_with_module

fpm/src/fpm.f90

@@ -1,14 +1,17 @@
 module fpm
 
-use fpm_strings, only : string_t, str_ends_with
-use fpm_backend, only : build_package
-use fpm_command_line, only : fpm_build_settings, fpm_new_settings, &
-    fpm_run_settings, fpm_install_settings, fpm_test_settings
-use fpm_environment, only : run, get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
-use fpm_filesystem, only : join_path, number_of_rows, list_files, exists, basename, mkdir
-use fpm_model, only : srcfile_ptr, srcfile_t, fpm_model_t
-use fpm_sources, only : add_executable_sources, add_sources_from_dir, &
-    resolve_module_dependencies
+use fpm_strings, only: string_t, str_ends_with
+use fpm_backend, only: build_package
+use fpm_command_line, only: fpm_build_settings, fpm_new_settings, &
+                      fpm_run_settings, fpm_install_settings, fpm_test_settings
+use fpm_environment, only: run, get_os_type, OS_LINUX, OS_MACOS, OS_WINDOWS
+use fpm_filesystem, only: is_dir, join_path, number_of_rows, list_files, exists, basename, mkdir
+use fpm_model, only: srcfile_ptr, srcfile_t, fpm_model_t, &
+                    FPM_SCOPE_UNKNOWN, FPM_SCOPE_LIB, &
+                    FPM_SCOPE_DEP, FPM_SCOPE_APP, FPM_SCOPE_TEST
+
+use fpm_sources, only: add_executable_sources, add_sources_from_dir, &
+                       resolve_module_dependencies
 use fpm_manifest, only : get_package_data, default_executable, &
     default_library, package_t, default_test
 use fpm_error, only : error_t
@@ -56,20 +59,38 @@ subroutine build_model(model, settings, package, error)
     model%link_flags = ''
 
     ! Add sources from executable directories
-    if (allocated(package%executable)) then
+    if (is_dir('app') .and. package%build_config%auto_executables) then
+        call add_sources_from_dir(model%sources,'app', FPM_SCOPE_APP, &
+                                   with_executables=.true., error=error)
 
-        call add_executable_sources(model%sources, package%executable, &
-                                    is_test=.false., error=error)
+        if (allocated(error)) then
+            return
+        end if
+
+    end if
+    if (is_dir('test') .and. package%build_config%auto_tests) then
+        call add_sources_from_dir(model%sources,'test', FPM_SCOPE_TEST, &
+                                   with_executables=.true., error=error)
 
         if (allocated(error)) then
             return
         endif
 
-    endif
-    if (allocated(package%test)) then
+    end if
+    if (allocated(package%executable)) then
+        call add_executable_sources(model%sources, package%executable, FPM_SCOPE_APP, &
+                                     auto_discover=package%build_config%auto_executables, &
+                                     error=error)
+
+        if (allocated(error)) then
+            return
+        end if
 
-        call add_executable_sources(model%sources, package%test, &
-                                    is_test=.true., error=error)
+    end if
+    if (allocated(package%test)) then
+        call add_executable_sources(model%sources, package%test, FPM_SCOPE_TEST, &
+                                     auto_discover=package%build_config%auto_tests, &
+                                     error=error)
 
         if (allocated(error)) then
             return
@@ -79,13 +100,14 @@ subroutine build_model(model, settings, package, error)
 
     if (allocated(package%library)) then
 
-        call add_sources_from_dir(model%sources,package%library%source_dir, &
-                                  error=error)
+        call add_sources_from_dir(model%sources, package%library%source_dir, &
+                                    FPM_SCOPE_LIB, error=error)
 
         if (allocated(error)) then
             return
         endif
 
+
     endif
     if(settings%list)then
         do i=1,size(model%sources)
@@ -94,7 +116,7 @@ subroutine build_model(model, settings, package, error)
         enddo
         stop
     else
-        call resolve_module_dependencies(model%sources)
+        call resolve_module_dependencies(model%sources,error)
     endif
 
 end subroutine build_model
@@ -106,45 +128,39 @@ subroutine cmd_build(settings)
 type(fpm_model_t) :: model
 type(error_t), allocatable :: error
 
-    call get_package_data(package, "fpm.toml", error)
-    if (allocated(error)) then
-        print '(a)', error%message
-        error stop 5
-    endif
-
-    ! Populate library in case we find the default src directory
-    if (.not.allocated(package%library) .and. exists("src")) then
-        allocate(package%library)
-        call default_library(package%library)
-    endif
-
-    ! Populate executable in case we find the default app directory
-    if (.not.allocated(package%executable) .and. exists("app")) then
-        allocate(package%executable(1))
-        call default_executable(package%executable(1), package%name)
-    endif
-
-    ! Populate test in case we find the default test directory
-    if (.not.allocated(package%test) .and. exists("test")) then
-        allocate(package%test(1))
-        call default_test(package%test(1), package%name)
-    endif
-
-    if (.not.(allocated(package%library) .or. allocated(package%executable) .or. allocated(package%test) )) then
-        print '(a)', "Neither library nor executable found, there is nothing to do"
-        error stop 6
-    endif
-
-    call build_model(model, settings, package, error)
-    if (allocated(error)) then
-        print '(a)', error%message
-        error stop 7
-    endif
-
-    call build_package(model)
-
-end subroutine cmd_build
-
+call get_package_data(package, "fpm.toml", error)
+if (allocated(error)) then
+    print '(a)', error%message
+    error stop 1
+end if
+
+! Populate library in case we find the default src directory
+if (.not.allocated(package%library) .and. exists("src")) then
+    allocate(package%library)
+    call default_library(package%library)
+end if
+
+! Populate executable in case we find the default app
+if (.not.allocated(package%executable) .and. &
+     exists(join_path('app',"main.f90"))) then
+    allocate(package%executable(1))
+    call default_executable(package%executable(1), package%name)
+end if
+
+if (.not.(allocated(package%library) .or. allocated(package%executable))) then
+    print '(a)', "Neither library nor executable found, there is nothing to do"
+    error stop 1
+end if
+
+call build_model(model, settings, package, error)
+if (allocated(error)) then
+    print '(a)', error%message
+    error stop 1
+end if
+
+call build_package(model)
+
+end subroutine
 
 subroutine cmd_install(settings)
 type(fpm_install_settings), intent(in) :: settings

fpm/src/fpm/manifest.f90

@@ -7,6 +7,7 @@
 !  Additionally, the required data types for users of this module are reexported
 !  to hide the actual implementation details.
 module fpm_manifest
+    use fpm_manifest_build_config, only: build_config_t
     use fpm_manifest_executable, only : executable_t
     use fpm_manifest_library, only : library_t
     use fpm_manifest_package, only : package_t, new_package

fpm/src/fpm/manifest/build_config.f90

@@ -0,0 +1,140 @@
+!> Implementation of the build configuration data.
+!
+!  A build table can currently have the following fields
+!
+!  ```toml
+!  [build]
+!  auto-executables = <bool>
+!  auto-tests = <bool>
+!  ```
+module fpm_manifest_build_config
+    use fpm_error, only : error_t, syntax_error, fatal_error
+    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
+    implicit none
+    private
+
+    public :: build_config_t, new_build_config
+
+
+    !> Configuration data for build
+    type :: build_config_t
+
+        !> Automatic discovery of executables
+        logical :: auto_executables
+
+        !> Automatic discovery of tests
+        logical :: auto_tests
+
+    contains
+
+        !> Print information on this instance
+        procedure :: info
+
+    end type build_config_t
+
+
+contains
+
+
+    !> Construct a new build configuration from a TOML data structure
+    subroutine new_build_config(self, table, error)
+
+        !> Instance of the build configuration
+        type(build_config_t), intent(out) :: self
+
+        !> Instance of the TOML data structure
+        type(toml_table), intent(inout) :: table
+
+        !> Error handling
+        type(error_t), allocatable, intent(out) :: error
+
+        !> Status 
+        integer :: stat
+
+        call check(table, error)
+        if (allocated(error)) return
+
+        call get_value(table, "auto-executables", self%auto_executables, .true., stat=stat)
+
+        if (stat /= toml_stat%success) then
+            call fatal_error(error,"Error while reading value for 'auto-executables' in fpm.toml, expecting logical")
+            return
+        end if
+
+        call get_value(table, "auto-tests", self%auto_tests, .true., stat=stat)
+
+        if (stat /= toml_stat%success) then
+            call fatal_error(error,"Error while reading value for 'auto-tests' in fpm.toml, expecting logical")
+            return
+        end if
+
+    end subroutine new_build_config
+
+
+    !> Check local schema for allowed entries
+    subroutine check(table, error)
+
+        !> Instance of the TOML data structure
+        type(toml_table), intent(inout) :: table
+
+        !> Error handling
+        type(error_t), allocatable, intent(out) :: error
+
+        type(toml_key), allocatable :: list(:)
+        integer :: ikey
+
+        call table%get_keys(list)
+
+        ! table can be empty
+        if (size(list) < 1) return
+
+        do ikey = 1, size(list)
+            select case(list(ikey)%key)
+
+            case("auto-executables", "auto-tests")
+                continue
+
+            case default
+                call syntax_error(error, "Key "//list(ikey)%key//" is not allowed in [build]")
+                exit
+
+            end select
+        end do
+
+    end subroutine check
+
+
+    !> Write information on build configuration instance
+    subroutine info(self, unit, verbosity)
+
+        !> Instance of the build configuration
+        class(build_config_t), intent(in) :: self
+
+        !> Unit for IO
+        integer, intent(in) :: unit
+
+        !> Verbosity of the printout
+        integer, intent(in), optional :: verbosity
+
+        integer :: pr
+        character(len=*), parameter :: fmt = '("#", 1x, a, t30, a)'
+
+        if (present(verbosity)) then
+            pr = verbosity
+        else
+            pr = 1
+        end if
+
+        if (pr < 1) return
+
+        write(unit, fmt) "Build configuration"
+        ! if (allocated(self%auto_executables)) then
+            write(unit, fmt) " - auto-discovery (apps) ", merge("enabled ", "disabled", self%auto_executables)
+        ! end if
+        ! if (allocated(self%auto_tests)) then
+            write(unit, fmt) " - auto-discovery (tests) ", merge("enabled ", "disabled", self%auto_tests)
+        ! end if
+
+    end subroutine info
+
+end module fpm_manifest_build_config