verify cached preprocessors

Author: perazz

src/fpm.f90

@@ -109,12 +109,31 @@ subroutine build_model(model, settings, package, error)
             end associate
             model%packages(i)%version = package%version%s()
 
+            !> Add this dependency's manifest macros
+            allocate(model%packages(i)%macros(0))
+
             if (allocated(dependency%preprocess)) then
                 do j = 1, size(dependency%preprocess)
                     if (dependency%preprocess(j)%name == "cpp") then
                         if (.not. has_cpp) has_cpp = .true.
                         if (allocated(dependency%preprocess(j)%macros)) then
-                            model%packages(i)%macros = dependency%preprocess(j)%macros
+                            model%packages(i)%macros = [model%packages(i)%macros, dependency%preprocess(j)%macros]
+                        end if
+                    else
+                        write(stderr, '(a)') 'Warning: Preprocessor ' // package%preprocess(i)%name // &
+                            ' is not supported; will ignore it'
+                    end if
+                end do
+            end if
+
+            !> Add this dependency's package-level macros
+            print *, 'dep preprocess? ',allocated(dep%preprocess),' nam,e=',dep%name
+            if (allocated(dep%preprocess)) then
+                do j = 1, size(dep%preprocess)
+                    if (dep%preprocess(j)%name == "cpp") then
+                        if (.not. has_cpp) has_cpp = .true.
+                        if (allocated(dep%preprocess(j)%macros)) then
+                            model%packages(i)%macros = [model%packages(i)%macros, dep%preprocess(j)%macros]
                         end if
                     else
                         write(stderr, '(a)') 'Warning: Preprocessor ' // package%preprocess(i)%name // &

src/fpm/dependency.f90

@@ -1187,6 +1187,8 @@ logical function dependency_has_changed(cached, manifest, verbosity, iunit) resu
     !> Log verbosity
     integer, intent(in) :: verbosity, iunit
 
+    integer :: ip
+
     has_changed = .true.
 
     !> All the following entities must be equal for the dependency to not have changed
@@ -1219,6 +1221,20 @@ logical function dependency_has_changed(cached, manifest, verbosity, iunit) resu
     else
       if (verbosity > 1) write (iunit, out_fmt) "PROJECT DIR has changed presence "
     end if
+    if (allocated(cached%preprocess) .eqv. allocated(manifest%preprocess)) then
+      if (size(cached%preprocess) /= size(manifest%preprocess)) then
+        if (verbosity > 1) write (iunit, out_fmt) "PREPROCESS has changed size"
+        return
+      end if
+      do ip=1,size(cached%preprocess)
+         if (cached%preprocess(ip) /= manifest%preprocess(ip)) then
+            if (verbosity > 1) write (iunit, out_fmt) "PREPROCESS config has changed"
+            return
+         end if
+      end do
+    else
+      if (verbosity > 1) write (iunit, out_fmt) "PREPROCESS has changed presence "
+    end if
 
     !> All checks passed: the two dependencies have no differences
     has_changed = .false.

src/fpm/manifest/dependency.f90

@@ -100,6 +100,22 @@ subroutine new_dependency(self, table, root, error)
         call table%get_key(self%name)
         call get_value(table, "namespace", self%namespace)
 
+        call get_value(table, "v", requested_version)
+        if (allocated(requested_version)) then
+            if (.not. allocated(self%requested_version)) allocate (self%requested_version)
+            call new_version(self%requested_version, requested_version, error)
+            if (allocated(error)) return
+        end if
+
+        !> Get optional preprocessor directives
+        call get_value(table, "preprocess", child, requested=.false.)
+        print *, 'has preprocess? ',associated(child)
+        if (associated(child)) then
+            call new_preprocessors(self%preprocess, child, error)
+            print *, 'size preprocess ',size(self%preprocess),' error? =',allocated(error)
+            if (allocated(error)) return
+        endif
+
         call get_value(table, "path", uri)
         if (allocated(uri)) then
             if (get_os_type() == OS_WINDOWS) uri = windows_path(uri)
@@ -135,21 +151,6 @@ subroutine new_dependency(self, table, root, error)
             return
         end if
 
-        call get_value(table, "v", requested_version)
-
-        if (allocated(requested_version)) then
-            if (.not. allocated(self%requested_version)) allocate (self%requested_version)
-            call new_version(self%requested_version, requested_version, error)
-            if (allocated(error)) return
-        end if
-
-        !> Get optional preprocessor directives
-        call get_value(table, "preprocess", child, requested=.false.)
-        if (associated(child)) then
-            call new_preprocessors(self%preprocess, child, error)
-            if (allocated(error)) return
-        end if
-
     end subroutine new_dependency
 
     !> Check local schema for allowed entries
@@ -163,6 +164,7 @@ subroutine check(table, error)
 
         character(len=:), allocatable :: name
         type(toml_key), allocatable :: list(:)
+        type(toml_table), pointer :: child
 
         !> List of valid keys for the dependency table.
         character(*), dimension(*), parameter :: valid_keys = [character(24) :: &
@@ -185,7 +187,6 @@ subroutine check(table, error)
         end if
 
         call check_keys(table, valid_keys, error)
-        print *, 'check keys ',allocated(error)
         if (allocated(error)) return
 
         if (table%has_key("path") .and. table%has_key("git")) then
@@ -218,6 +219,18 @@ subroutine check(table, error)
             return
         end if
 
+        ! Check preprocess key
+        if (table%has_key('preprocess')) then
+
+            call get_value(table, 'preprocess', child)
+
+            if (.not.associated(child)) then
+                call syntax_error(error, "Dependency '"//name//"' has invalid 'preprocess' entry")
+                return
+            end if
+
+        end if
+
     end subroutine check
 
     !> Construct new dependency array from a TOML data structure
@@ -279,6 +292,7 @@ subroutine new_dependencies(deps, table, root, meta, error)
                 ! Parse as a standard dependency
                 is_meta(idep) = .false.
 
+                print *, 'new dependency ',all_deps(idep)%name
                 call new_dependency(all_deps(idep), node, root, error)
                 if (allocated(error)) return