Skip to content

Implement version string validation and comparison #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2020
Merged

Implement version string validation and comparison #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions fpm/src/fpm/manifest/package.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module fpm_manifest_package
use fpm_error, only : error_t, fatal_error, syntax_error
use fpm_toml, only : toml_table, toml_array, toml_key, toml_stat, get_value, &
& len
use fpm_versioning, only : version_t, new_version
implicit none
private

Expand All @@ -47,6 +48,9 @@ module fpm_manifest_package
!> Name of the package
character(len=:), allocatable :: name

!> Package version
type(version_t) :: version

!> Library meta data
type(library_t), allocatable :: library

Expand Down Expand Up @@ -87,6 +91,7 @@ subroutine new_package(self, table, error)

type(toml_table), pointer :: child, node
type(toml_array), pointer :: children
character(len=:), allocatable :: version
integer :: ii, nn, stat

call check(table, error)
Expand All @@ -98,6 +103,10 @@ subroutine new_package(self, table, error)
return
end if

call get_value(table, "version", version, "0")
call new_version(self%version, version, error)
if (allocated(error)) return

call get_value(table, "dependencies", child, requested=.false.)
if (associated(child)) then
call new_dependencies(self%dependency, child, error)
Expand Down
Loading