Merge pull request #2890
83b0f9e6
version: add -master to master version (moneromooo-monero)493f7d09
util: allow non numeric version parts (moneromooo-monero)
This commit is contained in:
commit
2f09828ea8
|
@ -635,13 +635,13 @@ std::string get_nix_version_display_string()
|
||||||
int vercmp(const char *v0, const char *v1)
|
int vercmp(const char *v0, const char *v1)
|
||||||
{
|
{
|
||||||
std::vector<std::string> f0, f1;
|
std::vector<std::string> f0, f1;
|
||||||
boost::split(f0, v0, boost::is_any_of("."));
|
boost::split(f0, v0, boost::is_any_of(".-"));
|
||||||
boost::split(f1, v1, boost::is_any_of("."));
|
boost::split(f1, v1, boost::is_any_of(".-"));
|
||||||
while (f0.size() < f1.size())
|
for (size_t i = 0; i < std::max(f0.size(), f1.size()); ++i) {
|
||||||
f0.push_back("0");
|
if (i >= f0.size())
|
||||||
while (f1.size() < f0.size())
|
return -1;
|
||||||
f1.push_back("0");
|
if (i >= f1.size())
|
||||||
for (size_t i = 0; i < f0.size(); ++i) {
|
return 1;
|
||||||
int f0i = atoi(f0[i].c_str()), f1i = atoi(f1[i].c_str());
|
int f0i = atoi(f0[i].c_str()), f1i = atoi(f1[i].c_str());
|
||||||
int n = f0i - f1i;
|
int n = f0i - f1i;
|
||||||
if (n)
|
if (n)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
|
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
|
||||||
#define DEF_MONERO_VERSION "0.11.0.0"
|
#define DEF_MONERO_VERSION "0.11.1.0-master"
|
||||||
#define DEF_MONERO_RELEASE_NAME "Helium Hydra"
|
#define DEF_MONERO_RELEASE_NAME "Helium Hydra"
|
||||||
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
|
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
|
||||||
|
|
||||||
|
|
|
@ -40,4 +40,6 @@ TEST(vercmp, two_one) { ASSERT_TRUE(tools::vercmp("2", "1") > 0); }
|
||||||
TEST(vercmp, ten_nine) { ASSERT_TRUE(tools::vercmp("10", "9") > 0); }
|
TEST(vercmp, ten_nine) { ASSERT_TRUE(tools::vercmp("10", "9") > 0); }
|
||||||
TEST(vercmp, one_dot_ten_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1.10", "1.9") > 0); }
|
TEST(vercmp, one_dot_ten_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1.10", "1.9") > 0); }
|
||||||
TEST(vercmp, one_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1", "1.9") < 0); }
|
TEST(vercmp, one_one_dot_nine) { ASSERT_TRUE(tools::vercmp("1", "1.9") < 0); }
|
||||||
|
TEST(vercmp, to_master) { ASSERT_TRUE(tools::vercmp("1.0", "1.0-master") < 0); }
|
||||||
|
TEST(vercmp, from_master) { ASSERT_TRUE(tools::vercmp("1.0-master", "1.1") < 0); }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue