Close issue #605:

1. The dependency path is no longer relative to the top-level project, but relative to the fpm.toml path that contains it;
2. Update `new_dependency`, `new_dependencies` interface and usage, add `root` argument.

Author: zoziha

src/fpm/manifest/dependency.f90

@@ -57,14 +57,17 @@ module fpm_manifest_dependency
 
 
     !> Construct a new dependency configuration from a TOML data structure
-    subroutine new_dependency(self, table, error)
+    subroutine new_dependency(self, table, root, error)
 
         !> Instance of the dependency configuration
         type(dependency_config_t), intent(out) :: self
 
         !> Instance of the TOML data structure
         type(toml_table), intent(inout) :: table
 
+        !> Root directory of the manifest
+        character(*), intent(in), optional :: root
+
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
@@ -77,6 +80,7 @@ subroutine new_dependency(self, table, error)
 
         call get_value(table, "path", url)
         if (allocated(url)) then
+            if (present(root)) url = root//url  ! Relative to the fpm.toml it’s written in
             call move_alloc(url, self%path)
         else
             call get_value(table, "git", url)
@@ -173,14 +177,17 @@ end subroutine check
 
 
     !> Construct new dependency array from a TOML data structure
-    subroutine new_dependencies(deps, table, error)
+    subroutine new_dependencies(deps, table, root, error)
 
         !> Instance of the dependency configuration
         type(dependency_config_t), allocatable, intent(out) :: deps(:)
 
         !> Instance of the TOML data structure
         type(toml_table), intent(inout) :: table
 
+        !> Root directory of the manifest
+        character(*), intent(in), optional :: root
+
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
@@ -199,7 +206,7 @@ subroutine new_dependencies(deps, table, error)
                 call syntax_error(error, "Dependency "//list(idep)%key//" must be a table entry")
                 exit
             end if
-            call new_dependency(deps(idep), node, error)
+            call new_dependency(deps(idep), node, root, error)
             if (allocated(error)) exit
         end do
 

src/fpm/manifest/example.f90

@@ -69,7 +69,7 @@ subroutine new_example(self, table, error)
 
         call get_value(table, "dependencies", child, requested=.false.)
         if (associated(child)) then
-            call new_dependencies(self%dependency, child, error)
+            call new_dependencies(self%dependency, child, error=error)
             if (allocated(error)) return
         end if
 

src/fpm/manifest/executable.f90

@@ -80,7 +80,7 @@ subroutine new_executable(self, table, error)
 
         call get_value(table, "dependencies", child, requested=.false.)
         if (associated(child)) then
-            call new_dependencies(self%dependency, child, error)
+            call new_dependencies(self%dependency, child, error=error)
             if (allocated(error)) return
         end if
 

src/fpm/manifest/package.f90

@@ -192,13 +192,13 @@ subroutine new_package(self, table, root, error)
 
         call get_value(table, "dependencies", child, requested=.false.)
         if (associated(child)) then
-            call new_dependencies(self%dependency, child, error)
+            call new_dependencies(self%dependency, child, root, error)
             if (allocated(error)) return
         end if
 
         call get_value(table, "dev-dependencies", child, requested=.false.)
         if (associated(child)) then
-            call new_dependencies(self%dev_dependency, child, error)
+            call new_dependencies(self%dev_dependency, child, root, error)
             if (allocated(error)) return
         end if
 

src/fpm/manifest/test.f90

@@ -69,7 +69,7 @@ subroutine new_test(self, table, error)
 
         call get_value(table, "dependencies", child, requested=.false.)
         if (associated(child)) then
-            call new_dependencies(self%dependency, child, error)
+            call new_dependencies(self%dependency, child, error=error)
             if (allocated(error)) return
         end if
 

test/fpm_test/test_manifest.f90

@@ -252,7 +252,7 @@ subroutine test_dependency_empty(error)
         call new_table(table)
         table%key = "example"
 
-        call new_dependency(dependency, table, error)
+        call new_dependency(dependency, table, error=error)
 
     end subroutine test_dependency_empty
 
@@ -274,7 +274,7 @@ subroutine test_dependency_pathtag(error)
         call set_value(table, 'path', '"package"', stat)
         call set_value(table, 'tag', '"v20.1"', stat)
 
-        call new_dependency(dependency, table, error)
+        call new_dependency(dependency, table, error=error)
 
     end subroutine test_dependency_pathtag
 
@@ -295,7 +295,7 @@ subroutine test_dependency_nourl(error)
         table%key = 'example'
         call set_value(table, 'tag', '"v20.1"', stat)
 
-        call new_dependency(dependency, table, error)
+        call new_dependency(dependency, table, error=error)
 
     end subroutine test_dependency_nourl
 
@@ -317,7 +317,7 @@ subroutine test_dependency_gitpath(error)
         call set_value(table, 'path', '"package"', stat)
         call set_value(table, 'git', '"https://gitea.com/fortran-lang/pack"', stat)
 
-        call new_dependency(dependency, table, error)
+        call new_dependency(dependency, table, error=error)
 
     end subroutine test_dependency_gitpath
 
@@ -340,7 +340,7 @@ subroutine test_dependency_gitconflict(error)
         call set_value(table, 'branch', '"latest"', stat)
         call set_value(table, 'tag', '"v20.1"', stat)
 
-        call new_dependency(dependency, table, error)
+        call new_dependency(dependency, table, error=error)
 
     end subroutine test_dependency_gitconflict
 
@@ -361,7 +361,7 @@ subroutine test_dependency_wrongkey(error)
         table%key = 'example'
         call set_value(table, 'not-available', '"anywhere"', stat)
 
-        call new_dependency(dependency, table, error)
+        call new_dependency(dependency, table, error=error)
 
     end subroutine test_dependency_wrongkey
 
@@ -379,7 +379,7 @@ subroutine test_dependencies_empty(error)
 
         call new_table(table)
 
-        call new_dependencies(dependencies, table, error)
+        call new_dependencies(dependencies, table, error=error)
         if (allocated(error)) return
 
         if (allocated(dependencies)) then
@@ -405,7 +405,7 @@ subroutine test_dependencies_typeerror(error)
         call new_table(table)
         call add_array(table, 'dep1', children, stat)
 
-        call new_dependencies(dependencies, table, error)
+        call new_dependencies(dependencies, table, error=error)
 
     end subroutine test_dependencies_typeerror
 

test/fpm_test/test_package_dependencies.f90

@@ -183,7 +183,7 @@ subroutine test_add_dependencies(error)
         call add_table(table, "proj4", ptr)
         call set_value(ptr, "path", "vendor")
 
-        call new_dependencies(nodes, table, error)
+        call new_dependencies(nodes, table, error=error)
         if (allocated(error)) return
 
         call new_dependency_tree(deps%dependency_tree_t)