-
Notifications
You must be signed in to change notification settings - Fork 22
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
RSDK-8343 - create public version_metadata file #290
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ca8039b
public version_metadata file
stuqdog 17c8ebc
Merge branch 'main' into public-version-hpp
stuqdog fbb0c75
lia pr comments
stuqdog 95a1a2f
Merge branch 'public-version-hpp' of ssh://github.com/stuqdog/cpp-sdk…
stuqdog 215669e
const correctness
stuqdog c92afb8
Merge branch 'main' into public-version-hpp
lia-viam 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
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,53 @@ | ||
#include <viam/sdk/common/version_metadata.hpp> | ||
|
||
#include <array> | ||
#include <sstream> | ||
|
||
#include <viam/sdk/common/private/version_metadata.hpp> | ||
|
||
namespace viam { | ||
namespace sdk { | ||
|
||
std::string sdk_version() { | ||
static const std::string result = [] { | ||
std::string version_metadata(impl::k_version); | ||
version_metadata.erase(0, version_metadata.find(';') + 1); | ||
return version_metadata.substr(0, version_metadata.find(';')); | ||
}(); | ||
|
||
return result; | ||
} | ||
|
||
int get_sub_version(int which) { | ||
static const std::array<int, 3> components = [] { | ||
std::array<int, 3> result; | ||
auto version = sdk_version(); | ||
version.erase(0, version.find_first_not_of('v')); | ||
|
||
std::string substr; | ||
std::stringstream ss(version); | ||
|
||
for (int i = 0; i < 3; ++i) { | ||
getline(ss, substr, '.'); | ||
result[i] = std::stoi(substr); | ||
} | ||
|
||
return result; | ||
}(); | ||
|
||
return components[which]; | ||
} | ||
|
||
int sdk_major_version() { | ||
return get_sub_version(0); | ||
} | ||
|
||
int sdk_minor_version() { | ||
return get_sub_version(1); | ||
} | ||
|
||
int sdk_patch_version() { | ||
return get_sub_version(2); | ||
} | ||
} // namespace sdk | ||
} // namespace viam |
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,14 @@ | ||
#pragma once | ||
|
||
#include <string> | ||
|
||
namespace viam { | ||
namespace sdk { | ||
|
||
std::string sdk_version(); | ||
int sdk_major_version(); | ||
int sdk_minor_version(); | ||
int sdk_patch_version(); | ||
|
||
} // namespace sdk | ||
} // namespace viam |
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.
How about we get the
sdk_version()
string here, and then check that it matches