diff options
| -rw-r--r-- | src/fpm.f90 | 13 | ||||
| -rw-r--r-- | src/fpm/cmd/install.f90 | 43 | ||||
| -rw-r--r-- | src/fpm_backend.f90 | 21 | ||||
| -rw-r--r-- | src/fpm_compiler.f90 | 1 | ||||
| -rw-r--r-- | src/fpm_model.f90 | 5 | ||||
| -rw-r--r-- | src/fpm_targets.f90 | 159 | ||||
| -rw-r--r-- | test/fpm_test/test_backend.f90 | 5 | ||||
| -rw-r--r-- | test/fpm_test/test_module_dependencies.f90 | 18 |
8 files changed, 196 insertions, 69 deletions
diff --git a/src/fpm.f90 b/src/fpm.f90 index d8381ae..3347e21 100644 --- a/src/fpm.f90 +++ b/src/fpm.f90 @@ -43,7 +43,6 @@ subroutine build_model(model, settings, package, error) logical :: duplicates_found = .false. type(string_t) :: include_dir - character(len=16) :: build_name model%package_name = package%name @@ -72,21 +71,19 @@ subroutine build_model(model, settings, package, error) flags = flags // model%compiler%get_default_flags(settings%profile == "release") end select end if - cflags = trim(settings%cflag) ldflags = trim(settings%ldflag) - write(build_name, '(z16.16)') fnv_1a(flags//cflags//ldflags) - if (model%compiler%is_unknown()) then write(*, '(*(a:,1x))') & "<WARN>", "Unknown compiler", model%compiler%fc, "requested!", & "Defaults for this compiler might be incorrect" end if - model%output_directory = join_path('build',basename(model%compiler%fc)//'_'//build_name) + model%build_prefix = join_path("build", basename(model%compiler%fc)) - model%fortran_compile_flags = flags // " " // & - & model%compiler%get_module_flag(join_path(model%output_directory, model%package_name)) + model%fortran_compile_flags = flags + model%c_compile_flags = cflags + model%link_flags = ldflags model%include_tests = settings%build_tests @@ -196,7 +193,7 @@ subroutine build_model(model, settings, package, error) if (allocated(error)) return if (settings%verbose) then - write(*,*)'<INFO> BUILD_NAME: ',build_name + write(*,*)'<INFO> BUILD_NAME: ',model%build_prefix write(*,*)'<INFO> COMPILER: ',model%compiler%fc write(*,*)'<INFO> C COMPILER: ',model%compiler%cc write(*,*)'<INFO> COMPILER OPTIONS: ', model%fortran_compile_flags diff --git a/src/fpm/cmd/install.f90 b/src/fpm/cmd/install.f90 index 22e451f..b4a5608 100644 --- a/src/fpm/cmd/install.f90 +++ b/src/fpm/cmd/install.f90 @@ -9,7 +9,8 @@ module fpm_cmd_install use fpm_manifest, only : package_config_t, get_package_data use fpm_model, only : fpm_model_t, FPM_SCOPE_APP use fpm_targets, only: targets_from_sources, build_target_t, & - build_target_ptr, FPM_TARGET_EXECUTABLE + build_target_ptr, FPM_TARGET_EXECUTABLE, & + filter_library_targets, filter_executable_targets use fpm_strings, only : string_t, resize implicit none private @@ -28,6 +29,7 @@ contains type(build_target_ptr), allocatable :: targets(:) type(installer_t) :: installer character(len=:), allocatable :: lib, dir + type(string_t), allocatable :: list(:) logical :: installable call get_package_data(package, "fpm.toml", error, apply_defaults=.true.) @@ -61,13 +63,15 @@ contains verbosity=merge(2, 1, settings%verbose)) if (allocated(package%library) .and. package%install%library) then - dir = join_path(model%output_directory, model%package_name) - lib = "lib"//model%package_name//".a" - call installer%install_library(join_path(dir, lib), error) - call handle_error(error) + call filter_library_targets(targets, list) - call install_module_files(installer, dir, error) - call handle_error(error) + if (size(list) > 0) then + call installer%install_library(list(1)%s, error) + call handle_error(error) + + call install_module_files(installer, dir, error) + call handle_error(error) + end if end if if (allocated(package%executable)) then @@ -85,24 +89,17 @@ contains integer :: ii, ntargets character(len=:), allocatable :: lib - type(string_t), allocatable :: install_target(:) + type(string_t), allocatable :: install_target(:), temp(:) - call resize(install_target) + allocate(install_target(0)) - ntargets = 0 - if (allocated(package%library) .and. package%install%library) then - ntargets = ntargets + 1 - lib = join_path(model%output_directory, model%package_name, & - "lib"//model%package_name//".a") - install_target(ntargets)%s = lib - end if - do ii = 1, size(targets) - if (is_executable_target(targets(ii)%ptr)) then - if (ntargets >= size(install_target)) call resize(install_target) - ntargets = ntargets + 1 - install_target(ntargets)%s = targets(ii)%ptr%output_file - end if - end do + call filter_library_targets(targets, temp) + install_target = [install_target, temp] + + call filter_executable_targets(targets, FPM_SCOPE_APP, temp) + install_target = [install_target, temp] + + ntargets = size(install_target) write(unit, '("#", *(1x, g0))') & "total number of installable targets:", ntargets diff --git a/src/fpm_backend.f90 b/src/fpm_backend.f90 index b559343..1838c3a 100644 --- a/src/fpm_backend.f90 +++ b/src/fpm_backend.f90 @@ -32,6 +32,7 @@ use fpm_error, only : fpm_stop use fpm_environment, only: run, get_os_type, OS_WINDOWS use fpm_filesystem, only: basename, dirname, join_path, exists, mkdir use fpm_model, only: fpm_model_t +use fpm_strings, only: string_t, operator(.in.) use fpm_targets, only: build_target_t, build_target_ptr, FPM_TARGET_OBJECT, & FPM_TARGET_C_OBJECT, FPM_TARGET_ARCHIVE, FPM_TARGET_EXECUTABLE implicit none @@ -50,11 +51,25 @@ subroutine build_package(targets,model) type(build_target_ptr), allocatable :: queue(:) integer, allocatable :: schedule_ptr(:), stat(:) logical :: build_failed, skip_current + type(string_t), allocatable :: build_dirs(:) + type(string_t) :: temp ! Need to make output directory for include (mod) files - if (.not.exists(join_path(model%output_directory,model%package_name))) then - call mkdir(join_path(model%output_directory,model%package_name)) - end if + !if (.not.exists(join_path(model%output_directory,model%package_name))) then + !call mkdir(join_path(model%output_directory,model%package_name)) + !end if + allocate(build_dirs(0)) + do i = 1, size(targets) + associate(target => targets(i)%ptr) + if (target%output_dir .in. build_dirs) cycle + temp%s = target%output_dir + build_dirs = [build_dirs, temp] + end associate + end do + + do i = 1, size(build_dirs) + call mkdir(build_dirs(i)%s) + end do ! Perform depth-first topological sort of targets do i=1,size(targets) diff --git a/src/fpm_compiler.f90 b/src/fpm_compiler.f90 index 34ac941..4b9fb85 100644 --- a/src/fpm_compiler.f90 +++ b/src/fpm_compiler.f90 @@ -417,7 +417,6 @@ function get_module_flag(self, path) result(flags) flags = "-qmoddir "//path end select - flags = flags//" "//self%get_include_flag(path) end function get_module_flag diff --git a/src/fpm_model.f90 b/src/fpm_model.f90 index 38625be..d3ff038 100644 --- a/src/fpm_model.f90 +++ b/src/fpm_model.f90 @@ -131,7 +131,7 @@ type :: fpm_model_t character(:), allocatable :: link_flags !> Base directory for build - character(:), allocatable :: output_directory + character(:), allocatable :: build_prefix !> Include directories type(string_t), allocatable :: include_dirs(:) @@ -284,8 +284,7 @@ function info_model(model) result(s) s = s // ', fortran_compile_flags="' // model%fortran_compile_flags // '"' s = s // ', c_compile_flags="' // model%c_compile_flags // '"' s = s // ', link_flags="' // model%link_flags // '"' - ! character(:), allocatable :: output_directory - s = s // ', output_directory="' // model%output_directory // '"' + s = s // ', build_prefix="' // model%build_prefix // '"' ! type(string_t), allocatable :: link_libraries(:) s = s // ", link_libraries=[" do i = 1, size(model%link_libraries) diff --git a/src/fpm_targets.f90 b/src/fpm_targets.f90 index 23f9447..c7ac8bb 100644 --- a/src/fpm_targets.f90 +++ b/src/fpm_targets.f90 @@ -29,7 +29,7 @@ use fpm_error, only: error_t, fatal_error, fpm_stop use fpm_model use fpm_environment, only: get_os_type, OS_WINDOWS use fpm_filesystem, only: dirname, join_path, canon_path -use fpm_strings, only: string_t, operator(.in.), string_cat +use fpm_strings, only: string_t, operator(.in.), string_cat, fnv_1a, resize implicit none private @@ -40,6 +40,7 @@ public FPM_TARGET_UNKNOWN, FPM_TARGET_EXECUTABLE, & public build_target_t, build_target_ptr public targets_from_sources, resolve_module_dependencies public resolve_target_linking, add_target, add_dependency +public filter_library_targets, filter_executable_targets @@ -68,6 +69,12 @@ type build_target_t !> File path of build target object relative to cwd character(:), allocatable :: output_file + !> File path of build target object relative to cwd + character(:), allocatable :: output_name + + !> File path of build target object relative to cwd + character(:), allocatable :: output_dir + !> Primary source for this build target type(srcfile_t), allocatable :: source @@ -182,7 +189,7 @@ subroutine build_target_list(targets,model) j=1,size(model%packages))]) if (with_lib) call add_target(targets,type = FPM_TARGET_ARCHIVE,& - output_file = join_path(model%output_directory,& + output_name = join_path(& model%package_name,'lib'//model%package_name//'.a')) do j=1,size(model%packages) @@ -201,7 +208,7 @@ subroutine build_target_list(targets,model) call add_target(targets,source = sources(i), & type = merge(FPM_TARGET_C_OBJECT,FPM_TARGET_OBJECT,& sources(i)%unit_type==FPM_UNIT_CSOURCE), & - output_file = get_object_name(sources(i))) + output_name = get_object_name(sources(i))) if (with_lib .and. sources(i)%unit_scope == FPM_SCOPE_LIB) then ! Archive depends on object @@ -211,7 +218,7 @@ subroutine build_target_list(targets,model) case (FPM_UNIT_PROGRAM) call add_target(targets,type = FPM_TARGET_OBJECT,& - output_file = get_object_name(sources(i)), & + output_name = get_object_name(sources(i)), & source = sources(i) & ) @@ -231,7 +238,7 @@ subroutine build_target_list(targets,model) call add_target(targets,type = FPM_TARGET_EXECUTABLE,& link_libraries = sources(i)%link_libraries, & - output_file = join_path(model%output_directory,exe_dir, & + output_name = join_path(exe_dir, & sources(i)%exe_name//xsuffix)) ! Executable depends on object @@ -271,7 +278,7 @@ subroutine build_target_list(targets,model) i = index(object_file,filesep) end do - object_file = join_path(model%output_directory,model%package_name,object_file)//'.o' + object_file = join_path(model%package_name,object_file)//'.o' end function get_object_name @@ -279,10 +286,10 @@ end subroutine build_target_list !> Allocate a new target and append to target list -subroutine add_target(targets,type,output_file,source,link_libraries) +subroutine add_target(targets,type,output_name,source,link_libraries) type(build_target_ptr), allocatable, intent(inout) :: targets(:) integer, intent(in) :: type - character(*), intent(in) :: output_file + character(*), intent(in) :: output_name type(srcfile_t), intent(in), optional :: source type(string_t), intent(in), optional :: link_libraries(:) @@ -294,10 +301,10 @@ subroutine add_target(targets,type,output_file,source,link_libraries) ! Check for duplicate outputs do i=1,size(targets) - if (targets(i)%ptr%output_file == output_file) then + if (targets(i)%ptr%output_name == output_name) then write(*,*) 'Error while building target list: duplicate output object "',& - output_file,'"' + output_name,'"' if (present(source)) write(*,*) ' Source file: "',source%file_name,'"' call fpm_stop(1,' ') @@ -307,7 +314,7 @@ subroutine add_target(targets,type,output_file,source,link_libraries) allocate(new_target) new_target%target_type = type - new_target%output_file = output_file + new_target%output_name = output_name if (present(source)) new_target%source = source if (present(link_libraries)) new_target%link_libraries = link_libraries allocate(new_target%dependencies(0)) @@ -451,17 +458,12 @@ subroutine resolve_target_linking(targets, model) type(fpm_model_t), intent(in) :: model integer :: i - character(:), allocatable :: global_link_flags + character(:), allocatable :: global_link_flags, local_link_flags character(:), allocatable :: global_include_flags if (size(targets) == 0) return - if (targets(1)%ptr%target_type == FPM_TARGET_ARCHIVE) then - global_link_flags = targets(1)%ptr%output_file - else - allocate(character(0) :: global_link_flags) - end if - + global_link_flags = "" if (allocated(model%link_libraries)) then if (size(model%link_libraries) > 0) then global_link_flags = global_link_flags // " -l" // string_cat(model%link_libraries," -l") @@ -479,16 +481,29 @@ subroutine resolve_target_linking(targets, model) do i=1,size(targets) associate(target => targets(i)%ptr) - if (target%target_type /= FPM_TARGET_C_OBJECT) then - target%compile_flags = model%fortran_compile_flags//" "//global_include_flags + target%compile_flags = model%fortran_compile_flags else - target%compile_flags = model%c_compile_flags//" "//global_include_flags + target%compile_flags = model%c_compile_flags + end if + if (len(global_include_flags) > 0) then + target%compile_flags = target%compile_flags//global_include_flags end if + target%output_dir = get_output_dir(model%build_prefix, target%compile_flags) + target%output_file = join_path(target%output_dir, target%output_name) + end associate + + end do + call add_include_build_dirs(model, targets) + + do i=1,size(targets) + + associate(target => targets(i)%ptr) allocate(target%link_objects(0)) if (target%target_type == FPM_TARGET_ARCHIVE) then + global_link_flags = target%output_file // global_link_flags call get_link_objects(target%link_objects,target,is_exe=.false.) @@ -498,16 +513,23 @@ subroutine resolve_target_linking(targets, model) call get_link_objects(target%link_objects,target,is_exe=.true.) + local_link_flags = model%link_flags target%link_flags = model%link_flags//" "//string_cat(target%link_objects," ") if (allocated(target%link_libraries)) then if (size(target%link_libraries) > 0) then - target%link_flags = target%link_flags // " -l" // string_cat(target%link_libraries," -l") + target%link_flags = target%link_flags & + & // " -l" // string_cat(target%link_libraries," -l") + local_link_flags = local_link_flags & + & // " -l" // string_cat(target%link_libraries," -l") end if end if target%link_flags = target%link_flags//" "//global_link_flags + target%output_dir = get_output_dir(model%build_prefix, & + & target%compile_flags//local_link_flags) + target%output_file = join_path(target%output_dir, target%output_name) end if end associate @@ -563,4 +585,97 @@ contains end subroutine resolve_target_linking +subroutine add_include_build_dirs(model, targets) + type(fpm_model_t), intent(in) :: model + type(build_target_ptr), intent(inout), target :: targets(:) + + integer :: i + type(string_t), allocatable :: build_dirs(:) + type(string_t) :: temp + + allocate(build_dirs(0)) + do i = 1, size(targets) + associate(target => targets(i)%ptr) + if (target%target_type /= FPM_TARGET_OBJECT) cycle + if (target%output_dir .in. build_dirs) cycle + temp%s = target%output_dir + build_dirs = [build_dirs, temp] + end associate + end do + + do i = 1, size(targets) + associate(target => targets(i)%ptr) + if (target%target_type /= FPM_TARGET_OBJECT) cycle + + target%compile_flags = target%compile_flags // & + " " // model%compiler%get_module_flag(target%output_dir) // & + " -I" // string_cat(build_dirs, " -I") + end associate + end do + +end subroutine add_include_build_dirs + + +function get_output_dir(build_prefix, args) result(path) + character(len=*), intent(in) :: build_prefix + character(len=*), intent(in) :: args + character(len=:), allocatable :: path + + character(len=16) :: build_hash + + write(build_hash, '(z16.16)') fnv_1a(args) + path = build_prefix//"_"//build_hash +end function get_output_dir + + +subroutine filter_library_targets(targets, list) + type(build_target_ptr), intent(in) :: targets(:) + type(string_t), allocatable, intent(out) :: list(:) + + integer :: i, n + + n = 0 + call resize(list) + do i = 1, size(targets) + if (targets(i)%ptr%target_type == FPM_TARGET_ARCHIVE) then + if (n >= size(list)) call resize(list) + n = n + 1 + list(n)%s = targets(i)%ptr%output_file + end if + end do + call resize(list, n) +end subroutine filter_library_targets + +subroutine filter_executable_targets(targets, scope, list) + type(build_target_ptr), intent(in) :: targets(:) + integer, intent(in) :: scope + type(string_t), allocatable, intent(out) :: list(:) + + integer :: i, n + + n = 0 + call resize(list) + do i = 1, size(targets) + if (is_executable_target(targets(i)%ptr, scope)) then + if (n >= size(list)) call resize(list) + n = n + 1 + list(n)%s = targets(i)%ptr%output_file + end if + end do + call resize(list, n) +end subroutine filter_executable_targets + + +elemental function is_executable_target(target_ptr, scope) result(is_exe) + type(build_target_t), intent(in) :: target_ptr + integer, intent(in) :: scope + logical :: is_exe + is_exe = target_ptr%target_type == FPM_TARGET_EXECUTABLE .and. & + allocated(target_ptr%dependencies) + if (is_exe) then + is_exe = target_ptr%dependencies(1)%ptr%source%unit_scope == scope + end if +end function is_executable_target + + end module fpm_targets diff --git a/test/fpm_test/test_backend.f90 b/test/fpm_test/test_backend.f90 index eea0460..cb8d6c8 100644 --- a/test/fpm_test/test_backend.f90 +++ b/test/fpm_test/test_backend.f90 @@ -328,6 +328,7 @@ contains function new_test_package() result(targets) type(build_target_ptr), allocatable :: targets(:) + integer :: i call add_target(targets,FPM_TARGET_ARCHIVE,get_temp_filename()) @@ -347,6 +348,10 @@ contains call add_dependency(targets(2)%ptr,targets(4)%ptr) call add_dependency(targets(3)%ptr,targets(4)%ptr) + do i = 1, size(targets) + targets(i)%ptr%output_file = targets(i)%ptr%output_name + end do + end function new_test_package diff --git a/test/fpm_test/test_module_dependencies.f90 b/test/fpm_test/test_module_dependencies.f90 index 8600bf0..8dcf86d 100644 --- a/test/fpm_test/test_module_dependencies.f90 +++ b/test/fpm_test/test_module_dependencies.f90 @@ -66,7 +66,7 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -136,7 +136,7 @@ contains type(build_target_ptr), allocatable :: targets(:) character(:), allocatable :: scope_str - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -195,7 +195,7 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(1)) @@ -249,7 +249,7 @@ contains type(build_target_ptr), allocatable :: targets(:) character(:), allocatable :: scope_str - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(3)) @@ -309,7 +309,7 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -337,7 +337,7 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -364,7 +364,7 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -392,7 +392,7 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) @@ -512,7 +512,7 @@ contains type(fpm_model_t) :: model type(build_target_ptr), allocatable :: targets(:) - model%output_directory = '' + !model%output_directory = '' allocate(model%external_modules(0)) allocate(model%packages(1)) allocate(model%packages(1)%sources(2)) |