Merge branch 'main' into fix_cached_dependency_update

Author: perazz

.gitignore

@@ -5,3 +5,4 @@ build/*
 
 # CodeBlocks
 project/
+

README.md

@@ -33,10 +33,10 @@ non-Fortran related package manager.
 
 **Website: <https://fpm.fortran-lang.org/>**
 
-## [Download](https://fpm.fortran-lang.org/en/how-to/installation.html)
+## [Download](https://fpm.fortran-lang.org/en/install/index.html)
 
 Fpm is available on many platforms and through multiple package managers, see our Documentation
-webpage for a list of **[All Supported Installations](https://fpm.fortran-lang.org/en/how-to/installation.html)**.
+webpage for a list of **[All Supported Installations](https://fpm.fortran-lang.org/en/install/index.html)**.
 
 The easiest installation routes are shown below.
 

install.sh

@@ -18,6 +18,28 @@ usage()
     echo ""
 }
 
+# Return a download command
+get_fetch_command()
+{
+    if command -v curl > /dev/null 2>&1; then
+        echo "curl -L"
+    elif command -v wget > /dev/null 2>&1; then
+        echo "wget -O -"
+    else
+        echo "No download mechanism found. Install curl or wget first."
+        return 1
+    fi
+}
+
+# Return value of the latest published release on GitHub, with no heading "v" (e.g., "0.7.0")
+get_latest_release()
+{
+     $2 "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api
+     grep '"tag_name":'        |                            # Get tag line
+     sed -E 's/.*"([^"]+)".*/\1/' |                         # Pluck JSON value
+     sed -E 's/^v//'                                        # Remove heading "v" if present
+}
+
 PREFIX="$HOME/.local"
 
 while [ "$1" != "" ]; do
@@ -42,8 +64,23 @@ done
 
 set -u # error on use of undefined variable
 
-SOURCE_URL="https://github.com/fortran-lang/fpm/releases/download/v0.6.0/fpm-0.6.0.F90"
+# Get download command
+FETCH=$(get_fetch_command)
+if [ $? -ne 0 ]; then
+  echo "No download mechanism found. Install curl or wget first."
+  exit 2
+fi
+
+LATEST_RELEASE=$(get_latest_release "fortran-lang/fpm" "$FETCH")
+
+if [ -z "$LATEST_RELEASE" ]; then
+  echo "Could not fetch the latest release from GitHub. Install curl or wget, and ensure network connectivity."
+  exit 3
+fi
+
+SOURCE_URL="https://github.com/fortran-lang/fpm/releases/download/v${LATEST_RELEASE}/fpm-${LATEST_RELEASE}.F90"
 BOOTSTRAP_DIR="build/bootstrap"
+
 if [ -z ${FC+x} ]; then
     FC="gfortran"
 fi
@@ -53,15 +90,6 @@ fi
 
 mkdir -p $BOOTSTRAP_DIR
 
-if command -v curl > /dev/null 2>&1; then
-    FETCH="curl -L"
-elif command -v wget > /dev/null 2>&1; then
-    FETCH="wget -O -"
-else
-    echo "No download mechanism found. Install curl or wget first."
-    exit 1
-fi
-
 $FETCH $SOURCE_URL > $BOOTSTRAP_DIR/fpm.F90
 
 SAVEDIR="$(pwd)"

src/filesystem_utilities.c

@@ -1,7 +1,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#if defined(__APPLE__) && !defined(__aarch64__)
+#if defined(__APPLE__) && !defined(__aarch64__) && !defined(__POWERPC__)
 DIR * opendir$INODE64( const char * dirName );
 struct dirent * readdir$INODE64( DIR * dir );
 #define opendir opendir$INODE64

src/fpm.f90

@@ -1,6 +1,7 @@
 module fpm
 use fpm_strings, only: string_t, operator(.in.), glob, join, string_cat, &
-                      lower, str_ends_with
+                      lower, str_ends_with, is_fortran_name, str_begins_with_str, &
+                      is_valid_module_name, len_trim
 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, &
@@ -96,6 +97,8 @@ subroutine build_model(model, settings, package, error)
     model%build_prefix = join_path("build", basename(model%compiler%fc))
 
     model%include_tests = settings%build_tests
+    model%enforce_module_names = package%build%module_naming
+    model%module_prefix = package%build%module_prefix
 
     allocate(model%packages(model%deps%ndep))
 
@@ -157,6 +160,11 @@ subroutine build_model(model, settings, package, error)
             if (allocated(dependency%build%external_modules)) then
                 model%external_modules = [model%external_modules, dependency%build%external_modules]
             end if
+
+            ! Copy naming conventions from this dependency's manifest
+            model%packages(i)%enforce_module_names = dependency%build%module_naming
+            model%packages(i)%module_prefix        = dependency%build%module_prefix
+
         end associate
     end do
     if (allocated(error)) return
@@ -237,7 +245,11 @@ subroutine build_model(model, settings, package, error)
         write(*,*)'<INFO> CXX COMPILER OPTIONS: ', model%cxx_compile_flags
         write(*,*)'<INFO> LINKER OPTIONS:  ', model%link_flags
         write(*,*)'<INFO> INCLUDE DIRECTORIES:  [', string_cat(model%include_dirs,','),']'
-     end if
+    end if
+
+    ! Check for invalid module names
+    call check_module_names(model, error)
+    if (allocated(error)) return
 
     ! Check for duplicate modules
     call check_modules_for_duplicates(model, duplicates_found)
@@ -290,6 +302,99 @@ subroutine check_modules_for_duplicates(model, duplicates_found)
     end do
 end subroutine check_modules_for_duplicates
 
+! Check names of all modules in this package and its dependencies
+subroutine check_module_names(model, error)
+    type(fpm_model_t), intent(in) :: model
+    type(error_t), allocatable, intent(out) :: error
+    integer :: i,j,k,l,m
+    logical :: valid,errors_found,enforce_this_file
+    type(string_t) :: package_name,module_name,package_prefix
+
+    errors_found = .false.
+
+    ! Loop through modules provided by each source file of every package
+    ! Add it to the array if it is not already there
+    ! Otherwise print out warning about duplicates
+    do k=1,size(model%packages)
+
+        package_name = string_t(model%packages(k)%name)
+
+        ! Custom prefix is taken from each dependency's manifest
+        if (model%packages(k)%enforce_module_names) then
+            package_prefix = model%packages(k)%module_prefix
+        else
+            package_prefix = string_t("")
+        end if
+
+        ! Warn the user if some of the dependencies have loose naming
+        if (model%enforce_module_names .and. .not.model%packages(k)%enforce_module_names) then
+           write(stderr, *) "Warning: Dependency ",package_name%s // &
+                            " does not enforce module naming, but project does. "
+        end if
+
+        do l=1,size(model%packages(k)%sources)
+
+            ! Module naming is not enforced in test modules
+            enforce_this_file =  model%enforce_module_names .and. &
+                                 model%packages(k)%sources(l)%unit_scope/=FPM_SCOPE_TEST
+
+            if (allocated(model%packages(k)%sources(l)%modules_provided)) then
+
+                do m=1,size(model%packages(k)%sources(l)%modules_provided)
+
+                    module_name = model%packages(k)%sources(l)%modules_provided(m)
+
+                    valid = is_valid_module_name(module_name, &
+                                                 package_name, &
+                                                 package_prefix, &
+                                                 enforce_this_file)
+
+                    if (.not.valid) then
+
+                        if (enforce_this_file) then
+
+                            if (len_trim(package_prefix)>0) then
+
+                            write(stderr, *) "ERROR: Module ",module_name%s, &
+                                             " in ",model%packages(k)%sources(l)%file_name, &
+                                             " does not match its package name ("//package_name%s// &
+                                             ") or custom prefix ("//package_prefix%s//")."
+                            else
+
+                            write(stderr, *) "ERROR: Module ",module_name%s, &
+                                             " in ",model%packages(k)%sources(l)%file_name, &
+                                             " does not match its package name ("//package_name%s//")."
+
+                            endif
+
+                        else
+
+                            write(stderr, *) "ERROR: Module ",module_name%s, &
+                                             " in ",model%packages(k)%sources(l)%file_name, &
+                                             " has an invalid Fortran name. "
+
+                        end if
+
+                        errors_found = .true.
+
+                    end if
+                end do
+            end if
+        end do
+    end do
+
+    if (errors_found) then
+
+        if (model%enforce_module_names) &
+            write(stderr, *) "       Hint: Try disabling module naming in the manifest: [build] module-naming=false . "
+
+        call fatal_error(error,"The package contains invalid module names. "// &
+                               "Naming conventions "//merge('are','not',model%enforce_module_names)// &
+                               " being requested.")
+    end if
+
+end subroutine check_module_names
+
 subroutine cmd_build(settings)
 type(fpm_build_settings), intent(in) :: settings
 type(package_config_t) :: package

src/fpm/error.f90

@@ -166,12 +166,16 @@ subroutine fpm_stop(value,message)
         integer, intent(in) :: value
         !> Error message
         character(len=*), intent(in) :: message
+        integer :: iostat
         if(message/='')then
+           flush(unit=stderr,iostat=iostat)
+           flush(unit=stdout,iostat=iostat)
            if(value>0)then
               write(stderr,'("<ERROR>",a)')trim(message)
            else
               write(stderr,'("<INFO> ",a)')trim(message)
            endif
+           flush(unit=stderr,iostat=iostat)
         endif
         stop value
     end subroutine fpm_stop

src/fpm/manifest/build.f90

@@ -11,14 +11,13 @@
 !>```
 module fpm_manifest_build
     use fpm_error, only : error_t, syntax_error, fatal_error
-    use fpm_strings, only : string_t
+    use fpm_strings, only : string_t, len_trim, is_valid_module_prefix
     use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
     implicit none
     private
 
     public :: build_config_t, new_build_config
 
-
     !> Configuration data for build
     type :: build_config_t
 
@@ -31,6 +30,10 @@ module fpm_manifest_build
         !> Automatic discovery of tests
         logical :: auto_tests
 
+        !> Enforcing of package module names
+        logical :: module_naming = .false.
+        type(string_t) :: module_prefix
+
         !> Libraries to link against
         type(string_t), allocatable :: link(:)
 
@@ -86,6 +89,35 @@ subroutine new_build_config(self, table, error)
             return
         end if
 
+        !> Module naming: fist, attempt boolean value first
+        call get_value(table, "module-naming", self%module_naming, .false., stat=stat)
+
+        if (stat == toml_stat%success) then
+
+            ! Boolean value found. Set no custom prefix. This also falls back to
+            ! key not provided
+            self%module_prefix = string_t("")
+
+        else
+
+            !> Value found, but not a boolean. Attempt to read a prefix string
+            call get_value(table, "module-naming", self%module_prefix%s)
+
+            if (.not.allocated(self%module_prefix%s)) then
+               call syntax_error(error,"Could not read value for 'module-naming' in fpm.toml, expecting logical or a string")
+               return
+            end if
+
+            if (.not.is_valid_module_prefix(self%module_prefix)) then
+               call syntax_error(error,"Invalid custom module name prefix for in fpm.toml: <"//self%module_prefix%s// &
+                            ">, expecting a valid alphanumeric string")
+               return
+            end if
+
+            ! Set module naming to ON
+            self%module_naming = .true.
+
+        end if
 
         call get_list(table, "link", self%link, error)
         if (allocated(error)) return
@@ -95,7 +127,6 @@ subroutine new_build_config(self, table, error)
 
     end subroutine new_build_config
 
-
     !> Check local schema for allowed entries
     subroutine check(table, error)
 
@@ -119,6 +150,9 @@ subroutine check(table, error)
             case("auto-executables", "auto-examples", "auto-tests", "link", "external-modules")
                 continue
 
+            case ("module-naming")
+                continue
+
             case default
                 call syntax_error(error, "Key "//list(ikey)%key//" is not allowed in [build]")
                 exit
@@ -156,6 +190,7 @@ subroutine info(self, unit, verbosity)
         write(unit, fmt) " - auto-discovery (apps) ", merge("enabled ", "disabled", self%auto_executables)
         write(unit, fmt) " - auto-discovery (examples) ", merge("enabled ", "disabled", self%auto_examples)
         write(unit, fmt) " - auto-discovery (tests) ", merge("enabled ", "disabled", self%auto_tests)
+        write(unit, fmt) " - enforce module naming ", merge("enabled ", "disabled", self%module_naming)
         if (allocated(self%link)) then
             write(unit, fmt) " - link against"
             do ilink = 1, size(self%link)

src/fpm_compiler.f90 renamed to src/fpm_compiler.F90

@@ -937,9 +937,9 @@ end subroutine link
 
 
 !> Create an archive
-!> @todo An OMP critical section is added for Windows OS,
-!> which may be related to a bug in Mingw64-openmp and is expected to be resolved in the future,
-!> see issue #707 and #708.
+!> @todo For Windows OS, use the local `delete_file_win32` in stead of `delete_file`.
+!> This may be related to a bug in Mingw64-openmp and is expected to be resolved in the future,
+!> see issue #707, #708 and #808.
 subroutine make_archive(self, output, args, log_file, stat)
     !> Instance of the archiver object
     class(archiver_t), intent(in) :: self
@@ -953,16 +953,27 @@ subroutine make_archive(self, output, args, log_file, stat)
     integer, intent(out) :: stat
 
     if (self%use_response_file) then
-        !$omp critical
         call write_response_file(output//".resp" , args)
         call run(self%ar // output // " @" // output//".resp", echo=self%echo, &
             &  verbose=self%verbose, redirect=log_file, exitstat=stat)
-        call delete_file(output//".resp")
-        !$omp end critical
+        call delete_file_win32(output//".resp")
+
     else
         call run(self%ar // output // " " // string_cat(args, " "), &
             & echo=self%echo, verbose=self%verbose, redirect=log_file, exitstat=stat)
     end if
+
+    contains
+        subroutine delete_file_win32(file)
+            character(len=*), intent(in) :: file
+            logical :: exist
+            integer :: unit, iostat
+            inquire(file=file, exist=exist)
+            if (exist) then
+                open(file=file, newunit=unit)
+                close(unit, status='delete', iostat=iostat)
+            end if
+        end subroutine delete_file_win32
 end subroutine make_archive
 
 
@@ -976,7 +987,7 @@ subroutine write_response_file(name, argv)
 
     integer :: iarg, io
 
-    open(file=name, newunit=io)
+    open(file=name, newunit=io, status='replace')
     do iarg = 1, size(argv)
         write(io, '(a)') unix_path(argv(iarg)%s)
     end do