testing

Author: perazz

.gitignore

@@ -2,3 +2,6 @@ build/*
 
 # Visual Studio Code
 .vscode/
+
+# CodeBlocks
+project/

fpm.toml

@@ -1,5 +1,5 @@
 name = "fpm"
-version = "0.7.0"
+version = "0.7.1"
 license = "MIT"
 author = "fpm maintainers"
 maintainer = ""

src/fpm.f90

@@ -60,6 +60,16 @@ subroutine build_model(model, settings, package, error)
     call model%deps%add(package, error)
     if (allocated(error)) return
 
+    do i = 1, model%deps%ndep
+
+       if (model%deps%dep(i)%update) then
+            print *, ' Updating model dependency ',model%deps%dep(i)%name,' ...'
+            call model%deps%update(model%deps%dep(i)%name,error)
+            if (allocated(error)) return
+       end if
+
+    end do
+
     ! build/ directory should now exist
     if (.not.exists("build/.gitignore")) then
       call filewrite(join_path("build", ".gitignore"),["*"])
@@ -107,7 +117,7 @@ subroutine build_model(model, settings, package, error)
             model%packages(i)%name = dependency%name
             call package%version%to_string(version)
             model%packages(i)%version = version
-            
+
             if (allocated(dependency%preprocess)) then
                 do j = 1, size(dependency%preprocess)
                     if (dependency%preprocess(j)%name == "cpp") then

src/fpm/dependency.f90

@@ -191,7 +191,7 @@ subroutine new_dependency_tree(self, verbosity, cache)
   end subroutine new_dependency_tree
 
   !> Create a new dependency node from a configuration
-  pure subroutine new_dependency_node(self, dependency, version, proj_dir, update)
+   subroutine new_dependency_node(self, dependency, version, proj_dir, update)
     !> Instance of the dependency node
     type(dependency_node_t), intent(out) :: self
     !> Dependency configuration data
@@ -217,6 +217,8 @@ pure subroutine new_dependency_node(self, dependency, version, proj_dir, update)
       self%update = update
     end if
 
+    print *, 'new node from self=',self%name,' dep=',dependency%name, 'update=',update
+
   end subroutine new_dependency_node
 
   !> Add project dependencies, each depth level after each other.
@@ -357,7 +359,7 @@ subroutine add_dependencies(self, dependency, error)
   end subroutine add_dependencies
 
   !> Add a single dependency to the dependency tree
-  pure subroutine add_dependency(self, dependency, error)
+   subroutine add_dependency(self, dependency, error)
     !> Instance of the dependency tree
     class(dependency_tree_t), intent(inout) :: self
     !> Dependency configuration to add
@@ -400,6 +402,7 @@ subroutine update_dependency(self, name, error)
         if (self%verbosity > 1) then
           write(self%unit, out_fmt) "Update:", dep%name
         end if
+        write(self%unit, out_fmt) "Update:", dep%name
         proj_dir = join_path(self%dep_dir, dep%name)
         call dep%git%checkout(proj_dir, error)
         if (allocated(error)) return
@@ -454,6 +457,8 @@ subroutine resolve_dependency(self, dependency, root, error)
     character(len=:), allocatable :: manifest, proj_dir, revision
     logical :: fetch
 
+    print *, 'resolving dependency ',dependency%name,': done=',dependency%done,' update=',dependency%update
+
     if (dependency%done) return
 
     fetch = .false.
@@ -557,17 +562,34 @@ subroutine register(self, package, root, fetch, revision, error)
     type(error_t), allocatable, intent(out) :: error
 
     logical :: update
+    character(:), allocatable :: sver,pver
 
     update = .false.
     if (self%name /= package%name) then
       call fatal_error(error, "Dependency name '"//package%name// &
         & "' found, but expected '"//self%name//"' instead")
     end if
 
+    ! If this is the package node, always request an update of
+    ! the cache whenever its version changes
+    is_package: if (self%name==package%name .and. self%path==".") then
+
+       if (self%version/=package%version) update = .true.
+
+    end if is_package
+
+    call self%version%to_string(sver)
+    call package%version%to_string(pver)
+    print *, 'self%version=',sver,' package version = ',pver
+
     self%version = package%version
+
+    print *, 'self%proj_dir=',self%proj_dir,' package dir = ',root
+
     self%proj_dir = root
 
     if (allocated(self%git).and.present(revision)) then
+      print *, 'self revision = ',self%revision,' revision = ',revision,' fetch = ',fetch
       self%revision = revision
       if (.not.fetch) then
         ! git object is HEAD always allows an update
@@ -582,6 +604,8 @@ subroutine register(self, package, root, fetch, revision, error)
     self%update = update
     self%done = .true.
 
+    print *, 'dep = ',self%name,' update=',update
+
   end subroutine register
 
   !> Read dependency tree from file