Skip to content

refactor ExcludedFromBuild to use Conditional properly #8794

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

Open
IOBYTE wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −15
Open

refactor ExcludedFromBuild to use Conditional properly #8794

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9526dd8
refactor ExcludedFromBuild to use Conditional
IOBYTE Aug 13, 2026
9e03197
remove unused constructor
IOBYTE Aug 13, 2026
db1b6ff
fix cppcheck warning
IOBYTE Aug 13, 2026
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
28 changes: 13 additions & 15 deletions lib/importproject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,6 @@ namespace {
if (condAttr)
mCondition = condAttr;
}
explicit Conditional(std::string condition) : mCondition(std::move(condition)) {}

static void replaceAll(std::string &c, const std::string &from, const std::string &to) {
std::string::size_type pos;
Expand Down Expand Up @@ -818,10 +817,14 @@ namespace {
bool useUnicode = false;
};

struct ExcludedFromBuild : Conditional {
explicit ExcludedFromBuild(const tinyxml2::XMLElement *efb) : Conditional(efb) {}
};

struct ItemGroupClCompile {
explicit ItemGroupClCompile(std::string filename) : mFilename(std::move(filename)) {}
ItemGroupClCompile(const tinyxml2::XMLElement *element, std::string file) : mFilename(std::move(file)) {
for (const tinyxml2::XMLElement* childElement = element->FirstChildElement(); childElement; childElement = childElement->NextSiblingElement()) {
for (const tinyxml2::XMLElement *childElement = element->FirstChildElement(); childElement; childElement = childElement->NextSiblingElement()) {
const char *name = childElement->Name();
if (!name)
continue;
Expand All @@ -830,23 +833,18 @@ namespace {
const char *text = childElement->GetText();
if (!condition || !text || std::strcmp(text, "true") != 0)
continue;
mConditions.emplace_back(condition);
mExcludedFromBuild.emplace_back(childElement);
}
// TODO: ForcedIncludeFiles and PrecompiledHeaderFile
// TODO: ForcedIncludeFiles and AdditionalIncludeDirectories
}
}
bool exclude(const ProjectConfiguration& p, std::vector<std::string>& errors) const {
if (mConditions.empty())
return false;
for (const std::string& condition : mConditions) {
Conditional conditional(condition);
if (conditional.conditionIsTrue(p, mFilename, errors))
return true;
}
return false;
bool excludedfromBuild(const ProjectConfiguration &pc, std::vector<std::string> &errors) const {
return std::any_of(mExcludedFromBuild.cbegin(), mExcludedFromBuild.cend(), [&](const ExcludedFromBuild &excluded) {
return excluded.conditionIsTrue(pc, mFilename, errors);
});
}
std::string mFilename;
std::list<std::string> mConditions;
std::list<ExcludedFromBuild> mExcludedFromBuild;
};
}

Expand Down Expand Up @@ -1074,7 +1072,7 @@ bool ImportProject::importVcxproj(const std::string &filename, const tinyxml2::X
}

// check if the file should be excluded for this configuration
if (compile.exclude(p, errors))
if (compile.excludedfromBuild(p, errors))
continue;

FileSettings fs{ compile.mFilename, Standards::Language::None, 0}; // file will be identified later on
Expand Down
Loading