Skip to content
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.

Sign up for GitHub

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

WIP: Patches for clean Fedora RPM builds that pass unit tests #123

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

WIP: Patches for clean Fedora RPM builds that pass unit tests #123

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e9eae56
Don't fail silently in VersionInfo(), print useful message
xiphmont May 15, 2022
b82796e
CMake enhancements for automated external package building
xiphmont May 15, 2022
5d0e69c
Alter name use of 'netgen' and 'netgen-mesher'
xiphmont May 15, 2022
97d3c1c
Adjust python module path in __init__, add checks to pytest
xiphmont May 15, 2022
5ee4e43
Fix nullptr deref in archive
xiphmont May 15, 2022
6ba4a6e
Correct deletion of non-allocated memory in ngarray
xiphmont May 15, 2022
ae87c70
Two nullptr deref fixes in table
xiphmont May 15, 2022
6f5eae8
Type corrections in rw_cgns
xiphmont May 15, 2022
2da94c3
Export additional classes to provide typeinfo visibility
xiphmont May 15, 2022
6159d89
Numerous changes to python bindings for clean stub generation
xiphmont May 15, 2022
da386ea
Add a fedora package spec and setup
xiphmont May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 40 additions & 32 deletions libsrc/core/version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#ifndef NETGEN_CORE_VERSION_HPP
#define NETGEN_CORE_VERSION_HPP

#include <ostream>
#include <iostream>
#include <string>
#include <tuple>
#include "exception.hpp"

#include "ngcore_api.hpp"

Expand All @@ -18,37 +19,44 @@ namespace ngcore
VersionInfo() = default;
VersionInfo(std::string vstring)
{
minor_ = release = patch = 0;
git_hash = "";
if(vstring.substr(0,1) == "v")
vstring = vstring.substr(1,vstring.size()-1);
auto dot = vstring.find('.');
mayor_ = std::stoi(vstring.substr(0,dot));
if(dot == size_t(-1)) vstring = "";
else vstring = vstring.substr(dot+1, vstring.size()-dot-1);
if(!vstring.empty())
{
dot = vstring.find('.');
minor_ = std::stoi(vstring.substr(0,dot));
if (dot == size_t(-1)) vstring = "";
else vstring = vstring.substr(dot+1, vstring.size()-dot-1);
if(!vstring.empty())
{
dot = vstring.find('-');
release = std::stoi(vstring.substr(0,dot));
if(dot == size_t(-1)) vstring = "";
else vstring = vstring.substr(dot+1,vstring.size()-dot-1);
if(!vstring.empty())
{
dot = vstring.find('-');
patch = std::stoi(vstring.substr(0,dot));
if(dot == size_t(-1)) vstring = "";
else vstring = vstring.substr(dot+1, vstring.size()-dot-1);
if(!vstring.empty())
git_hash = vstring;
}
}
}
std::string save = vstring;
try {
minor_ = release = patch = 0;
git_hash = "";
if(vstring.substr(0,1) == "v")
vstring = vstring.substr(1,vstring.size()-1);
auto dot = vstring.find('.');
mayor_ = std::stoi(vstring.substr(0,dot));
if(dot == size_t(-1)) vstring = "";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Compare with std::string::npos, instead of type-casting.

else vstring = vstring.substr(dot+1, vstring.size()-dot-1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

substr() returns up to the end when the second argument is omitted (i.e. uses the std::string::npos default argument).

if(!vstring.empty())
{
dot = vstring.find('.');
minor_ = std::stoi(vstring.substr(0,dot));
if (dot == size_t(-1)) vstring = "";
else vstring = vstring.substr(dot+1, vstring.size()-dot-1);
if(!vstring.empty())
{
dot = vstring.find('-');
release = std::stoi(vstring.substr(0,dot));
if(dot == size_t(-1)) vstring = "";
else vstring = vstring.substr(dot+1,vstring.size()-dot-1);
if(!vstring.empty())
{
dot = vstring.find('-');
patch = std::stoi(vstring.substr(0,dot));
if(dot == size_t(-1)) vstring = "";
else vstring = vstring.substr(dot+1, vstring.size()-dot-1);
if(!vstring.empty())
git_hash = vstring;
}
}
}
} catch(...) {
std::cerr << "Malformed NETGEN_VERSION (" << save <<"\n";
std::cerr << "Micompiled/mispackaged Netgen library\n";
abort();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO this goes into the totally wrong direction. netgen is (also) a library, and libraries should not abort if possible. VersionInfo is also e.g. used by netgens Archive class, i.e. on user provided data, i.e. the error message would be incorrect and misleading.

If you want to catch these errors:

  • Make the VersionInfo(string) constructor constexpr
  • add a static_assert(VersionInfo(NETGEN_VERSION) > VersionInfo("0"));

}
}
VersionInfo(const char* cstr) : VersionInfo(std::string(cstr)) { }

Expand Down