kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions 1 Packages Projects 9 Releases 2 Wiki Activity

[Build] output point release version

Browse Source 
- to Splashscreen, About, MainWindow and Console
This commit is contained in:
Uwe
2022-12-04 19:45:46 -03:00
parent 586ff73c99
commit aef629ece1
6 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/App/Metadata.cpp
View File

@@ -459,6 +459,7 @@ bool Metadata::satisfies(const Meta::Dependency &dep)
std::map<std::string, std::string> &config = App::Application::Config();
replacements.insert(std::make_pair("$BuildVersionMajor", config["BuildVersionMajor"]));
replacements.insert(std::make_pair("$BuildVersionMinor", config["BuildVersionMinor"]));
replacements.insert(std::make_pair("$BuildVersionMinor", config["BuildVersionPoint"]));
replacements.insert(std::make_pair("$BuildRevision", config["BuildRevision"]));
for (const auto &replacement : replacements) {
auto pos = injectedString.find(replacement.first);
@@ -497,8 +498,10 @@ bool Metadata::supportsCurrentFreeCAD() const
if (fcVersion == Meta::Version()) {
std::map<std::string, std::string> &config = App::Application::Config();
std::stringstream ss;
ss << config["BuildVersionMajor"] << "." << config["BuildVersionMinor"] << "."
<< (config["BuildRevision"].empty() ? "0" : config["BuildRevision"]);
ss << config["BuildVersionMajor"]
<< "." << config["BuildVersionMinor"]
<< "." << config["BuildVersionPoint"]
<< "." << (config["BuildRevision"].empty() ? "0" : config["BuildRevision"]);
fcVersion = Meta::Version(ss.str());
}