dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 06:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmSystemTools: Remove EnvDiff class

Browse Source
This commit is contained in:
Daniel Pfeifer
2026-03-08 22:18:13 +01:00
parent 508a72fc1c
commit 79c90b7afc
2 changed files with 3 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
Source/cmSystemTools.cxx
View File

@@ -2117,151 +2117,6 @@ std::vector<std::string> cmSystemTools::GetEnvironmentVariables()
return env;
}
void cmSystemTools::AppendEnv(std::vector<std::string> const& env)
{
for (std::string const& var : env) {
cmSystemTools::PutEnv(var);
}
}
void cmSystemTools::EnvDiff::AppendEnv(std::vector<std::string> const& env)
{
for (std::string const& var : env) {
this->PutEnv(var);
}
}
void cmSystemTools::EnvDiff::PutEnv(std::string const& env)
{
auto const eq_loc = env.find('=');
if (eq_loc != std::string::npos) {
std::string name = env.substr(0, eq_loc);
diff[name] = env.substr(eq_loc + 1);
} else {
this->UnPutEnv(env);
}
}
void cmSystemTools::EnvDiff::UnPutEnv(std::string const& env)
{
diff[env] = cm::nullopt;
}
bool cmSystemTools::EnvDiff::ParseOperation(std::string const& envmod)
{
char path_sep = GetSystemPathlistSeparator();
auto apply_diff = [this](std::string const& name,
std::function<void(std::string&)> const& apply) {
cm::optional<std::string> old_value = diff[name];
std::string output;
if (old_value) {
output = *old_value;
} else {
char const* curval = cmSystemTools::GetEnv(name);
if (curval) {
output = curval;
}
}
apply(output);
diff[name] = output;
};
// Split on `=`
auto const eq_loc = envmod.find_first_of('=');
if (eq_loc == std::string::npos) {
cmSystemTools::Error(cmStrCat(
"Error: Missing `=` after the variable name in: ", envmod, '\n'));
return false;
}
auto const name = envmod.substr(0, eq_loc);
// Split value on `:`
auto const op_value_start = eq_loc + 1;
auto const colon_loc = envmod.find_first_of(':', op_value_start);
if (colon_loc == std::string::npos) {
cmSystemTools::Error(
cmStrCat("Error: Missing `:` after the operation in: ", envmod, '\n'));
return false;
}
auto const op = envmod.substr(op_value_start, colon_loc - op_value_start);
auto const value_start = colon_loc + 1;
auto const value = envmod.substr(value_start);
// Determine what to do with the operation.
if (op == "reset"_s) {
auto entry = diff.find(name);
if (entry != diff.end()) {
diff.erase(entry);
}
} else if (op == "set"_s) {
diff[name] = value;
} else if (op == "unset"_s) {
diff[name] = cm::nullopt;
} else if (op == "string_append"_s) {
apply_diff(name, [&value](std::string& output) { output += value; });
} else if (op == "string_prepend"_s) {
apply_diff(name,
[&value](std::string& output) { output.insert(0, value); });
} else if (op == "path_list_append"_s) {
apply_diff(name, [&value, path_sep](std::string& output) {
if (!output.empty()) {
output += path_sep;
}
output += value;
});
} else if (op == "path_list_prepend"_s) {
apply_diff(name, [&value, path_sep](std::string& output) {
if (!output.empty()) {
output.insert(output.begin(), path_sep);
}
output.insert(0, value);
});
} else if (op == "cmake_list_append"_s) {
apply_diff(name, [&value](std::string& output) {
if (!output.empty()) {
output += ';';
}
output += value;
});
} else if (op == "cmake_list_prepend"_s) {
apply_diff(name, [&value](std::string& output) {
if (!output.empty()) {
output.insert(output.begin(), ';');
}
output.insert(0, value);
});
} else {
cmSystemTools::Error(cmStrCat(
"Error: Unrecognized environment manipulation argument: ", op, '\n'));
return false;
}
return true;
}
void cmSystemTools::EnvDiff::ApplyToCurrentEnv(std::ostringstream* measurement)
{
for (auto const& env_apply : diff) {
if (env_apply.second) {
auto const env_update =
cmStrCat(env_apply.first, '=', *env_apply.second);
cmSystemTools::PutEnv(env_update);
if (measurement) {
*measurement << env_update << std::endl;
}
} else {
cmSystemTools::UnsetEnv(env_apply.first.c_str());
if (measurement) {
// Signify that this variable is being actively unset
*measurement << '#' << env_apply.first << "=\n";
}
}
}
}
cmSystemTools::SaveRestoreEnvironment::SaveRestoreEnvironment()
{
this->Env = cmSystemTools::GetEnvironmentVariables();
@@ -2281,7 +2136,9 @@ cmSystemTools::SaveRestoreEnvironment::~SaveRestoreEnvironment()
}
// Then put back each entry from the original environment:
cmSystemTools::AppendEnv(this->Env);
for (std::string const& var : this->Env) {
cmSystemTools::PutEnv(var);
}
}
#endif

41
Source/cmSystemTools.h
View File

@@ -10,8 +10,6 @@
#include <cstddef>
#include <functional>
#include <map>
#include <sstream>
#include <string>
#include <vector>
@@ -451,45 +449,6 @@ public:
/** Get the list of all environment variables */
static std::vector<std::string> GetEnvironmentVariables();
/** Append multiple variables to the current environment. */
static void AppendEnv(std::vector<std::string> const& env);
/**
* Helper class to represent an environment diff directly. This is to avoid
* repeated in-place environment modification (i.e. via setenv/putenv), which
* could be slow.
*/
class EnvDiff
{
public:
/** Append multiple variables to the current environment diff */
void AppendEnv(std::vector<std::string> const& env);
/**
* Add a single variable (or remove if no = sign) to the current
* environment diff.
*/
void PutEnv(std::string const& env);
/** Remove a single variable from the current environment diff. */
void UnPutEnv(std::string const& env);
/**
* Apply an ENVIRONMENT_MODIFICATION operation to this diff. Returns
* false and issues an error on parse failure.
*/
bool ParseOperation(std::string const& envmod);
/**
* Apply this diff to the actual environment, optionally writing out the
* modifications to a CTest-compatible measurement stream.
*/
void ApplyToCurrentEnv(std::ostringstream* measurement = nullptr);
private:
std::map<std::string, cm::optional<std::string>> diff;
};
/** Helper class to save and restore the environment.
Instantiate this class as an automatic variable on
the stack. Its constructor saves a copy of the current