Merge branch 'master' into incremental2

Author: LKedward

fpm/src/fpm.f90

@@ -13,14 +13,13 @@ module fpm
 use fpm_sources, only: add_executable_sources, add_sources_from_dir
 use fpm_targets, only: targets_from_sources, resolve_module_dependencies, &
                         resolve_target_linking
-use fpm_manifest, only : get_package_data, default_executable, &
-    default_library, package_t, default_test
+use fpm_manifest, only : get_package_data, package_config_t
 use fpm_error, only : error_t, fatal_error
-use fpm_manifest_test, only : test_t
+use fpm_manifest_test, only : test_config_t
 use,intrinsic :: iso_fortran_env, only : stdin=>input_unit,   &
                                        & stdout=>output_unit, &
                                        & stderr=>error_unit
-use fpm_manifest_dependency, only: dependency_t
+use fpm_manifest_dependency, only: dependency_config_t
 implicit none
 private
 public :: cmd_build, cmd_install, cmd_run
@@ -35,7 +34,7 @@ recursive subroutine add_libsources_from_package(sources,link_libraries,package_
     type(srcfile_t), allocatable, intent(inout), target :: sources(:)
     type(string_t), allocatable, intent(inout) :: link_libraries(:)
     type(string_t), allocatable, intent(inout) :: package_list(:)
-    type(package_t), intent(in) :: package
+    type(package_config_t), intent(in) :: package
     character(*), intent(in) :: package_root
     logical, intent(in) :: dev_depends
     type(error_t), allocatable, intent(out) :: error
@@ -77,11 +76,11 @@ recursive subroutine add_libsources_from_package(sources,link_libraries,package_
     contains
 
     subroutine add_dependencies(dependency_list)
-        type(dependency_t), intent(in) :: dependency_list(:)
+        type(dependency_config_t), intent(in) :: dependency_list(:)
 
         integer :: i
         type(string_t) :: dep_name
-        type(package_t) :: dependency
+        type(package_config_t) :: dependency
 
         character(:), allocatable :: dependency_path
 
@@ -136,8 +135,8 @@ subroutine add_dependencies(dependency_list)
 
             dep_name%s = dependency_list(i)%name
             package_list = [package_list, dep_name]
-            if (allocated(dependency%build_config%link)) then
-                link_libraries = [link_libraries, dependency%build_config%link]
+            if (allocated(dependency%build%link)) then
+                link_libraries = [link_libraries, dependency%build%link]
             end if
 
         end do
@@ -152,15 +151,15 @@ subroutine build_model(model, settings, package, error)
     !
     type(fpm_model_t), intent(out) :: model
     type(fpm_build_settings), intent(in) :: settings
-    type(package_t), intent(in) :: package
+    type(package_config_t), intent(in) :: package
     type(error_t), allocatable, intent(out) :: error
 
     integer :: i
     type(string_t), allocatable :: package_list(:)
 
     model%package_name = package%name
-    if (allocated(package%build_config%link)) then
-        model%link_libraries = package%build_config%link
+    if (allocated(package%build%link)) then
+        model%link_libraries = package%build%link
     else
         allocate(model%link_libraries(0))
     end if
@@ -190,7 +189,7 @@ subroutine build_model(model, settings, package, error)
     model%link_flags = ''
 
     ! Add sources from executable directories
-    if (is_dir('app') .and. package%build_config%auto_executables) then
+    if (is_dir('app') .and. package%build%auto_executables) then
         call add_sources_from_dir(model%sources,'app', FPM_SCOPE_APP, &
                                    with_executables=.true., error=error)
 
@@ -199,7 +198,7 @@ subroutine build_model(model, settings, package, error)
         end if
 
     end if
-    if (is_dir('test') .and. package%build_config%auto_tests) then
+    if (is_dir('test') .and. package%build%auto_tests) then
         call add_sources_from_dir(model%sources,'test', FPM_SCOPE_TEST, &
                                    with_executables=.true., error=error)
 
@@ -210,7 +209,7 @@ subroutine build_model(model, settings, package, error)
     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, &
+                                     auto_discover=package%build%auto_executables, &
                                      error=error)
 
         if (allocated(error)) then
@@ -220,7 +219,7 @@ subroutine build_model(model, settings, package, 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, &
+                                     auto_discover=package%build%auto_tests, &
                                      error=error)
 
         if (allocated(error)) then
@@ -252,53 +251,21 @@ subroutine build_model(model, settings, package, error)
 
 end subroutine build_model
 
-!> Apply package defaults
-subroutine package_defaults(package)
-    type(package_t), intent(inout) :: package
-
-    ! 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
-
-    ! Populate test in case we find the default test directory
-    if (.not.allocated(package%test) .and. &
-         exists(join_path("test","main.f90"))) then
-        allocate(package%test(1))
-        call default_test(package%test(1), package%name)
-    endif
-
-    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
-
-end subroutine
 
 subroutine cmd_build(settings)
 type(fpm_build_settings), intent(in) :: settings
-type(package_t) :: package
+type(package_config_t) :: package
 type(fpm_model_t) :: model
 type(error_t), allocatable :: error
 
 integer :: i
 
-call get_package_data(package, "fpm.toml", error)
+call get_package_data(package, "fpm.toml", error, apply_defaults=.true.)
 if (allocated(error)) then
     print '(a)', error%message
     error stop 1
 end if
 
-call package_defaults(package)
-
 call build_model(model, settings, package, error)
 if (allocated(error)) then
     print '(a)', error%message
@@ -329,22 +296,19 @@ subroutine cmd_run(settings,test)
     integer :: i, j, col_width, nCol
     logical :: found(size(settings%name))
     type(error_t), allocatable :: error
-    type(package_t) :: package
+    type(package_config_t) :: package
     type(fpm_model_t) :: model
     type(string_t) :: exe_cmd
     type(string_t), allocatable :: executables(:)
     type(build_target_t), pointer :: exe_target
     type(srcfile_t), pointer :: exe_source
 
-    call get_package_data(package, "fpm.toml", error)
+    call get_package_data(package, "fpm.toml", error, apply_defaults=.true.)
     if (allocated(error)) then
         print '(a)', error%message
         error stop 1
     end if
 
-
-    call package_defaults(package)
-
     call build_model(model, settings%fpm_build_settings, package, error)
     if (allocated(error)) then
         print '(a)', error%message

fpm/src/fpm/manifest.f90

@@ -7,18 +7,19 @@
 !> 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
+    use fpm_manifest_build, only: build_config_t
+    use fpm_manifest_executable, only : executable_config_t
+    use fpm_manifest_library, only : library_config_t
+    use fpm_manifest_package, only : package_config_t, new_package
     use fpm_error, only : error_t, fatal_error, file_not_found_error
     use fpm_toml, only : toml_table, read_package_file
-    use fpm_manifest_test, only : test_t
+    use fpm_manifest_test, only : test_config_t
+    use fpm_filesystem, only: join_path, exists
     implicit none
     private
 
     public :: get_package_data, default_executable, default_library, default_test
-    public :: package_t
+    public :: package_config_t
 
 
 contains
@@ -28,7 +29,7 @@ module fpm_manifest
     subroutine default_library(self)
 
         !> Instance of the library meta data
-        type(library_t), intent(out) :: self
+        type(library_config_t), intent(out) :: self
 
         self%source_dir = "src"
 
@@ -39,7 +40,7 @@ end subroutine default_library
     subroutine default_executable(self, name)
 
         !> Instance of the executable meta data
-        type(executable_t), intent(out) :: self
+        type(executable_config_t), intent(out) :: self
 
         !> Name of the package
         character(len=*), intent(in) :: name
@@ -54,7 +55,7 @@ end subroutine default_executable
     subroutine default_test(self, name)
 
         !> Instance of the executable meta data
-        type(test_t), intent(out) :: self
+        type(test_config_t), intent(out) :: self
 
         !> Name of the package
         character(len=*), intent(in) :: name
@@ -67,17 +68,20 @@ end subroutine default_test
 
 
     !> Obtain package meta data from a configuation file
-    subroutine get_package_data(package, file, error)
+    subroutine get_package_data(package, file, error, apply_defaults)
 
         !> Parsed package meta data
-        type(package_t), intent(out) :: package
+        type(package_config_t), intent(out) :: package
 
         !> Name of the package configuration file
         character(len=*), intent(in) :: file
 
         !> Error status of the operation
         type(error_t), allocatable, intent(out) :: error
 
+        !> Apply package defaults (uses file system operations)
+        logical, intent(in), optional :: apply_defaults
+
         type(toml_table), allocatable :: table
 
         call read_package_file(table, file, error)
@@ -90,7 +94,51 @@ subroutine get_package_data(package, file, error)
 
         call new_package(package, table, error)
 
+        if (present(apply_defaults)) then
+            if (apply_defaults) then
+                call package_defaults(package, error)
+                if (allocated(error)) return
+            end if
+        end if
+
     end subroutine get_package_data
 
 
+    !> Apply package defaults
+    subroutine package_defaults(package, error)
+
+        !> Parsed package meta data
+        type(package_config_t), intent(inout) :: package
+
+        !> Error status of the operation
+        type(error_t), allocatable, intent(out) :: error
+
+        ! 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
+
+        ! Populate test in case we find the default test directory
+        if (.not.allocated(package%test) .and. &
+            exists(join_path("test","main.f90"))) then
+            allocate(package%test(1))
+            call default_test(package%test(1), package%name)
+        endif
+
+        if (.not.(allocated(package%library) .or. allocated(package%executable))) then
+            call fatal_error(error, "Neither library nor executable found, there is nothing to do")
+            return
+        end if
+
+    end subroutine package_defaults
+
+
 end module fpm_manifest

fpm/src/fpm/manifest/build_config.f90 renamed to fpm/src/fpm/manifest/build.f90

@@ -8,7 +8,7 @@
 !>auto-tests = bool
 !>link = ["lib"]
 !>```
-module fpm_manifest_build_config
+module fpm_manifest_build
     use fpm_error, only : error_t, syntax_error, fatal_error
     use fpm_strings, only : string_t
     use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
@@ -146,4 +146,4 @@ subroutine info(self, unit, verbosity)
 
     end subroutine info
 
-end module fpm_manifest_build_config
+end module fpm_manifest_build

fpm/src/fpm/manifest/dependency.f90

@@ -30,11 +30,11 @@ module fpm_manifest_dependency
     implicit none
     private
 
-    public :: dependency_t, new_dependency, new_dependencies
+    public :: dependency_config_t, new_dependency, new_dependencies
 
 
     !> Configuration meta data for a dependency
-    type :: dependency_t
+    type :: dependency_config_t
 
         !> Name of the dependency
         character(len=:), allocatable :: name
@@ -50,7 +50,7 @@ module fpm_manifest_dependency
         !> Print information on this instance
         procedure :: info
 
-    end type dependency_t
+    end type dependency_config_t
 
 
 contains
@@ -60,7 +60,7 @@ module fpm_manifest_dependency
     subroutine new_dependency(self, table, error)
 
         !> Instance of the dependency configuration
-        type(dependency_t), intent(out) :: self
+        type(dependency_config_t), intent(out) :: self
 
         !> Instance of the TOML data structure
         type(toml_table), intent(inout) :: table
@@ -176,7 +176,7 @@ end subroutine check
     subroutine new_dependencies(deps, table, error)
 
         !> Instance of the dependency configuration
-        type(dependency_t), allocatable, intent(out) :: deps(:)
+        type(dependency_config_t), allocatable, intent(out) :: deps(:)
 
         !> Instance of the TOML data structure
         type(toml_table), intent(inout) :: table
@@ -210,7 +210,7 @@ end subroutine new_dependencies
     subroutine info(self, unit, verbosity)
 
         !> Instance of the dependency configuration
-        class(dependency_t), intent(in) :: self
+        class(dependency_config_t), intent(in) :: self
 
         !> Unit for IO
         integer, intent(in) :: unit