-
Notifications
You must be signed in to change notification settings - Fork 99
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.
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
feat: ability to read project major, minor & patch macros #766
Open
arteevraina
wants to merge
2
commits into
fortran-lang:main
Choose a base branch
from
arteevraina:read-version-macros
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
name = "version_test" | ||
version = "0.1.2" | ||
|
||
[preprocess] | ||
[preprocess.cpp] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
module version_test | ||
implicit none | ||
private | ||
|
||
public :: say_hello | ||
contains | ||
subroutine say_hello | ||
print *, "Hello, version_test!" | ||
#if PROJECT_VERSION_MAJOR != 0 | ||
This breaks the build. | ||
#endif | ||
|
||
#if PROJECT_VERSION_MINOR != 1 | ||
This breaks the build. | ||
#endif | ||
|
||
#if PROJECT_VERSION_PATCH != 2 | ||
This breaks the build. | ||
#endif | ||
|
||
end subroutine say_hello | ||
end module version_test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -43,8 +43,10 @@ module fpm_compiler | |||||
use fpm_strings, only: split, string_cat, string_t, str_ends_with, str_begins_with_str | ||||||
use fpm_manifest, only : package_config_t | ||||||
use fpm_error, only: error_t | ||||||
use fpm_versioning, only: version_t, new_version | ||||||
|
||||||
implicit none | ||||||
public :: compiler_t, new_compiler, archiver_t, new_archiver, get_macros | ||||||
public :: compiler_t, new_compiler, archiver_t, new_archiver, get_macros, get_version_macros | ||||||
public :: debug | ||||||
|
||||||
enum, bind(C) | ||||||
|
@@ -432,6 +434,34 @@ subroutine set_preprocessor_flags (id, flags, package) | |||||
|
||||||
end subroutine set_preprocessor_flags | ||||||
|
||||||
!> Extracts the PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR & PROJECT_VERSION_PATCH macros. | ||||||
function get_version_macros(id, version) result(version_macros) | ||||||
!> Compiler id. | ||||||
integer(compiler_enum), intent(in) :: id | ||||||
|
||||||
!> Version number of the target. | ||||||
character(len=:), allocatable, intent(in) :: version | ||||||
|
||||||
character(len=:), allocatable :: version_macros | ||||||
character(len=:), allocatable :: macro_definition_symbol | ||||||
character(:), allocatable :: version_parts(:) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
integer :: i | ||||||
|
||||||
!> Set macro defintion symbol on the basis of compiler used | ||||||
select case(id) | ||||||
case default | ||||||
macro_definition_symbol = "-D" | ||||||
case (id_intel_classic_windows, id_intel_llvm_windows) | ||||||
macro_definition_symbol = "/D" | ||||||
end select | ||||||
|
||||||
!> Check if version macros are not allocated. | ||||||
if (.not.allocated(version_macros)) then | ||||||
version_macros = " " | ||||||
end if | ||||||
|
||||||
end function get_version_macros | ||||||
|
||||||
!> This function will parse and read the macros list and | ||||||
!> return them as defined flags. | ||||||
function get_macros(id, macros_list, version) result(macros) | ||||||
|
@@ -442,7 +472,10 @@ function get_macros(id, macros_list, version) result(macros) | |||||
character(len=:), allocatable :: macros | ||||||
character(len=:), allocatable :: macro_definition_symbol | ||||||
character(:), allocatable :: valued_macros(:) | ||||||
|
||||||
|
||||||
type(version_t) :: version_object | ||||||
|
||||||
call new_version(version_object, version) | ||||||
|
||||||
integer :: i | ||||||
|
||||||
|
@@ -476,6 +509,36 @@ function get_macros(id, macros_list, version) result(macros) | |||||
!> Check if the value of macro ends with '}' character. | ||||||
if (str_ends_with(trim(valued_macros(size(valued_macros))), "}")) then | ||||||
|
||||||
!> Check if the string contains "version%major as substring. | ||||||
if (index(valued_macros(size(valued_macros)), "version%major") /= 0) then | ||||||
if (len(macros) == 0) then | ||||||
macros = macros//macro_definition_symbol//trim(valued_macros(1))//'='//version_object%num(1) | ||||||
else | ||||||
macros = macros//' '//macro_definition_symbol//trim(valued_macros(1))//'='//version_object%num(1) | ||||||
end if | ||||||
cycle | ||||||
end if | ||||||
|
||||||
!> Check if the string contains "version%minor" as substring. | ||||||
if (index(valued_macros(size(valued_macros)), "version%minor") /= 0) then | ||||||
if (len(macros) == 0) then | ||||||
macros = macros//macro_definition_symbol//trim(valued_macros(1))//'='//version_object%num(2) | ||||||
else | ||||||
macros = macros//' '//macro_definition_symbol//trim(valued_macros(1))//'='//version_object%num(2) | ||||||
end if | ||||||
cycle | ||||||
end if | ||||||
|
||||||
!> Check if the string contains "version%patch" as substring. | ||||||
if (index(valued_macros(size(valued_macros)), "version%patch") /= 0) then | ||||||
if (len(macros) == 0) then | ||||||
macros = macros//macro_definition_symbol//trim(valued_macros(1))//'='//version_object%num(3) | ||||||
else | ||||||
macros = macros//' '//macro_definition_symbol//trim(valued_macros(1))//'='//version_object%num(3) | ||||||
end if | ||||||
cycle | ||||||
end if | ||||||
|
||||||
!> Check if the string contains "version" as substring. | ||||||
if (index(valued_macros(size(valued_macros)), "version") /= 0) then | ||||||
|
||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is
version
allocatable
in the same time asintent(in)
?