7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-24 05:14:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions4

remove support for versions prefixed with "v"

Browse source
This commit is contained in:
HJfod 2022-11-09 18:01:22 +02:00
parent d20a77aeb1
commit 796a5103f6
4 changed files with 11 additions and 12 deletions
loader
resources
mod.json.in
src/utils
version.cpp
test
dependency
mod.json
main
mod.json

4
loader/resources/mod.json.in
View file

@ -1,7 +1,7 @@
{
"geode": "v@PROJECT_VERSION@",
"geode": "@PROJECT_VERSION@",
"id": "geode.loader",
"version": "v@PROJECT_VERSION@",
"version": "@PROJECT_VERSION@",
"name": "Geode",
"developer": "Geode Team",
"description": "The Geode mod loader",

9
loader/src/utils/version.cpp
View file

@ -15,14 +15,13 @@ USE_GEODE_NAMESPACE();
#endif
VersionInfo::VersionInfo(char const* versionString) {
if (!THE_SSCANF(versionString, "v%d.%d.%d", &this->m_major, &this->m_minor, &this->m_patch))
if (!THE_SSCANF(versionString, "%d.%d.%d", &this->m_major, &this->m_minor, &this->m_patch))
THE_SSCANF(versionString, "%d %d %d", &this->m_major, &this->m_minor, &this->m_patch);
if (!THE_SSCANF(versionString, "%d.%d.%d", &this->m_major, &this->m_minor, &this->m_patch)) {
THE_SSCANF(versionString, "%d %d %d", &this->m_major, &this->m_minor, &this->m_patch);
}
}
bool VersionInfo::validate(std::string const& string) {
int buf0, buf1, buf2;
if (THE_SSCANF(string.c_str(), "v%d.%d.%d", &buf0, &buf1, &buf2)) return true;
if (THE_SSCANF(string.c_str(), "%d.%d.%d", &buf0, &buf1, &buf2)) return true;
if (THE_SSCANF(string.c_str(), "%d %d %d", &buf0, &buf1, &buf2)) return true;
return false;
@ -107,6 +106,6 @@ bool VersionInfo::match(
}
std::string VersionInfo::toString() const {
return "v" + std::to_string(this->m_major) + "." + std::to_string(this->m_minor) + "." +
return std::to_string(this->m_major) + "." + std::to_string(this->m_minor) + "." +
std::to_string(this->m_patch);
}

4
loader/test/dependency/mod.json
View file

@ -1,6 +1,6 @@
{
"geode": "v0.4.1",
"version": "v1.0.0",
"geode": "0.4.1",
"version": "1.0.0",
"id": "geode.testdep",
"name": "Geode Test Dependency",
"developer": "Geode Team",

6
loader/test/main/mod.json
View file

@ -1,6 +1,6 @@
{
"geode": "v0.4.1",
"version": "v1.0.0",
"geode": "0.4.1",
"version": "1.0.0",
"id": "geode.test",
"name": "Geode Test",
"developer": "Geode Team",
@ -11,7 +11,7 @@
"dependencies": [
{
"id": "geode.testdep",
"version": "v1.0.*",
"version": "1.0.*",
"required": true
}
]