Merge branch 'main' into custom_module_path

Author: perazz

ci/run_tests.sh

@@ -358,5 +358,13 @@ test -f ./test_custom_install/lib/libcustom-module-dir.a
 rm -rf ./test_custom_install
 popd
 
+# Test both shared and static library types
+pushd both_lib_types
+"$fpm" build
+"$fpm" install --prefix=.
+# Check that exactly 2 libboth_lib_types library files were installed
+test $(ls lib/libboth_lib_types* | wc -l) -eq 2
+popd
+
 # Cleanup
 rm -rf ./*/build

example_packages/both_lib_types/fpm.toml

@@ -0,0 +1,3 @@
+name = "both_lib_types"
+library.type=["shared", "static"]
+install.library=true

example_packages/both_lib_types/src/both_lib_types.f90

@@ -0,0 +1,15 @@
+module both_lib_types
+  implicit none
+  private
+
+  public :: say_hello
+  public :: get_number
+contains
+  subroutine say_hello
+    print *, "Hello from both_lib_types!"
+  end subroutine say_hello
+  
+  integer function get_number()
+     get_number = 42
+  end function get_number
+end module both_lib_types

src/fpm.f90

@@ -9,7 +9,7 @@ module fpm
 use fpm_dependency, only : new_dependency_tree
 use fpm_filesystem, only: is_dir, join_path, list_files, exists, &
                    basename, filewrite, mkdir, run, os_delete_dir
-use fpm_model, only: fpm_model_t, srcfile_t, show_model, fortran_features_t, &
+use fpm_model, only: fpm_model_t, srcfile_t, show_model, &
                     FPM_SCOPE_UNKNOWN, FPM_SCOPE_LIB, FPM_SCOPE_DEP, &
                     FPM_SCOPE_APP, FPM_SCOPE_EXAMPLE, FPM_SCOPE_TEST
 use fpm_compiler, only: new_compiler, new_archiver, set_cpp_preprocessor_flags

src/fpm/manifest.f90

@@ -40,6 +40,7 @@ subroutine default_library(self)
 
         self%source_dir = "src"
         self%include_dir = [string_t("include")]
+        self%lib_type = [string_t("monolithic")]
 
     end subroutine default_library
 

src/fpm/manifest/library.f90

@@ -32,8 +32,8 @@ module fpm_manifest_library
         !> Alternative build script to be invoked
         character(len=:), allocatable :: build_script
 
-        !> Shared / Static / Monolithic library 
-        character(:), allocatable :: lib_type
+        !> Shared / Static / Monolithic library types (can be multiple)
+        type(string_t), allocatable :: lib_type(:)
 
     contains
 
@@ -63,10 +63,16 @@ elemental logical function shared(self)
         !> Instance of the library configuration
         class(library_config_t), intent(in) :: self
 
+        integer :: i
+        
+        shared = .false.
         if (allocated(self%lib_type)) then 
-           shared = self%lib_type == "shared"
-        else
-           shared = .false.
+           do i = 1, size(self%lib_type)
+               if (self%lib_type(i)%s == "shared") then
+                   shared = .true.
+                   return
+               end if
+           end do
         endif
 
     end function shared
@@ -78,10 +84,16 @@ elemental logical function static(self)
         !> Instance of the library configuration
         class(library_config_t), intent(in) :: self
 
+        integer :: i
+        
+        static = .false.
         if (allocated(self%lib_type)) then 
-           static = self%lib_type == "static"
-        else
-           static = .false.
+           do i = 1, size(self%lib_type)
+               if (self%lib_type(i)%s == "static") then
+                   static = .true.
+                   return
+               end if
+           end do
         endif
     end function static
 
@@ -92,7 +104,20 @@ elemental logical function monolithic(self)
         !> Instance of the library configuration
         class(library_config_t), intent(in) :: self
 
-        monolithic = .not.(static(self) .or. shared(self))
+        integer :: i
+                
+        if (allocated(self%lib_type)) then 
+           monolithic = .false. 
+           do i = 1, size(self%lib_type)
+               if (self%lib_type(i)%s == "monolithic") then
+                   monolithic = .true.
+                   return
+               end if
+           end do
+        else
+            ! Default: monolithic
+            monolithic = .true.
+        endif
     end function monolithic
 
 
@@ -108,7 +133,8 @@ subroutine new_library(self, table, error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        integer :: stat
+        integer :: stat, i
+        character(len=:), allocatable :: single_type
 
         call check(table, error)
         if (allocated(error)) return
@@ -118,36 +144,52 @@ subroutine new_library(self, table, error)
             return
         end if
 
-        if (has_list(table, "type")) then
-            call syntax_error(error, "Manifest key [library.type] does not allow list input")
-            return
-        end if
+        ! library.type can now be either a single value or a list
 
         call get_value(table, "source-dir", self%source_dir, "src")
         call get_value(table, "build-script", self%build_script)
 
         call get_list(table, "include-dir", self%include_dir, error)
         if (allocated(error)) return
 
-        call get_value(table, "type", self%lib_type, "monolithic")
+        ! Parse library type - can be single value or array
+        if (has_list(table, "type")) then
+            ! Array of types
+            call get_list(table, "type", self%lib_type, error)
+            if (allocated(error)) return
+        else
+            ! Single type - convert to array for consistency
+            call get_value(table, "type", single_type, "monolithic")
+            self%lib_type = [string_t(single_type)]
+        end if
+        
+        if (.not.allocated(self%lib_type)) then 
+            self%lib_type = [string_t("monolithic")]
+        end if        
 
-        select case(self%lib_type)
-        case("shared","static","monolithic")
-            ! OK
-        case default
-            call fatal_error(error,"Value of library.type cannot be '"//self%lib_type &
-                                 //"', choose shared/static/monolithic (default)")
+        ! Validate all types in the array
+        do i = 1, size(self%lib_type)
+            select case(self%lib_type(i)%s)
+            case("shared","static","monolithic")
+                ! OK
+            case default
+                call fatal_error(error,"Value of library.type cannot be '"//self%lib_type(i)%s &
+                                     //"', choose shared/static/monolithic (default)")
+                return
+            end select
+        end do
+        
+        ! Check that monolithic is not specified together with static or shared
+        if (monolithic(self) .and. (static(self) .or. shared(self))) then
+            call fatal_error(error,"library.type 'monolithic' cannot be specified together with 'static' or 'shared'")
             return
-        end select        
+        end if
 
         ! Set default value of include-dir if not found in manifest
         if (.not.allocated(self%include_dir)) then
             self%include_dir = [string_t("include")]
         end if
 
-        if (.not.allocated(self%lib_type)) then 
-            self%lib_type = "monolithic"
-        end if
 
     end subroutine new_library
 
@@ -215,7 +257,7 @@ subroutine info(self, unit, verbosity)
             write(unit, fmt) "- include directory", string_cat(self%include_dir,",")
         end if
 
-        write(unit, fmt) "- library type", self%lib_type
+        write(unit, fmt) "- library type", string_cat(self%lib_type,",")
 
         if (allocated(self%build_script)) then
             write(unit, fmt) "- custom build", self%build_script
@@ -272,7 +314,7 @@ subroutine dump_to_toml(self, table, error)
         if (allocated(error)) return
         call set_list(table, "include-dir", self%include_dir, error)
         if (allocated(error)) return
-        call set_string(table, "type", self%lib_type, error, class_name)
+        call set_list(table, "type", self%lib_type, error)
         if (allocated(error)) return
 
     end subroutine dump_to_toml
@@ -295,7 +337,7 @@ subroutine load_from_toml(self, table, error)
         if (allocated(error)) return
         call get_list(table, "include-dir", self%include_dir, error)
         if (allocated(error)) return
-        call get_value(table, "type", self%lib_type)
+        call get_list(table, "type", self%lib_type, error)
         if (allocated(error)) return
 
     end subroutine load_from_toml