Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-22 16:07:49 +08:00
Code Issues Projects Releases Wiki Activity

cmSystemTools: Stdout(),Stderr() accept std::string argument

Browse Source
This commit is contained in:
Vitaly Stakhovsky
2019-01-20 00:03:35 -05:00
parent c902e775ec
commit 3132ea801c
9 changed files with 42 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmCTest.cxx
View File

@@ -2781,13 +2781,13 @@ bool cmCTest::RunCommand(std::vector<std::string> const& args,
if ((res == cmsysProcess_Pipe_STDOUT || res == cmsysProcess_Pipe_STDERR) && if ((res == cmsysProcess_Pipe_STDOUT || res == cmsysProcess_Pipe_STDERR) &&
this->ExtraVerbose) { this->ExtraVerbose) {
processOutput.DecodeText(data, length, strdata); processOutput.DecodeText(data, length, strdata);
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} }
} }
if (this->ExtraVerbose) { if (this->ExtraVerbose) {
processOutput.DecodeText(std::string(), strdata); processOutput.DecodeText(std::string(), strdata);
if (!strdata.empty()) { if (!strdata.empty()) {
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} }
} }

8
Source/cmDepends.cxx
View File

@@ -87,7 +87,7 @@ void cmDepends::Clear(const char* file)
if (this->Verbose) { if (this->Verbose) {
std::ostringstream msg; std::ostringstream msg;
msg << "Clearing dependencies in \"" << file << "\"." << std::endl; msg << "Clearing dependencies in \"" << file << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
// Write an empty dependency file. // Write an empty dependency file.
@@ -170,7 +170,7 @@ bool cmDepends::CheckDependencies(
std::ostringstream msg; std::ostringstream msg;
msg << "Dependee \"" << dependee << "\" does not exist for depender \"" msg << "Dependee \"" << dependee << "\" does not exist for depender \""
<< depender << "\"." << std::endl; << depender << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
} else { } else {
if (dependerExists) { if (dependerExists) {
@@ -187,7 +187,7 @@ bool cmDepends::CheckDependencies(
std::ostringstream msg; std::ostringstream msg;
msg << "Dependee \"" << dependee << "\" is newer than depender \"" msg << "Dependee \"" << dependee << "\" is newer than depender \""
<< depender << "\"." << std::endl; << depender << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
} }
} else { } else {
@@ -206,7 +206,7 @@ bool cmDepends::CheckDependencies(
msg << "Dependee \"" << dependee msg << "Dependee \"" << dependee
<< "\" is newer than depends file \"" << "\" is newer than depends file \""
<< internalDependsFileName << "\"." << std::endl; << internalDependsFileName << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
} }
} }

6
Source/cmExecProgramCommand.cxx
View File

@@ -221,7 +221,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output,
if (p == cmsysProcess_Pipe_STDOUT || p == cmsysProcess_Pipe_STDERR) { if (p == cmsysProcess_Pipe_STDOUT || p == cmsysProcess_Pipe_STDERR) {
if (verbose) { if (verbose) {
processOutput.DecodeText(data, length, strdata); processOutput.DecodeText(data, length, strdata);
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} }
output.append(data, length); output.append(data, length);
} }
@@ -230,7 +230,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output,
if (verbose) { if (verbose) {
processOutput.DecodeText(std::string(), strdata); processOutput.DecodeText(std::string(), strdata);
if (!strdata.empty()) { if (!strdata.empty()) {
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} }
} }
@@ -270,7 +270,7 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output,
} }
msg += "\n"; msg += "\n";
if (verbose) { if (verbose) {
cmSystemTools::Stdout(msg.c_str()); cmSystemTools::Stdout(msg);
} }
output += msg; output += msg;
#else #else

8
Source/cmExecuteProcessCommand.cxx
View File

@@ -249,14 +249,14 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
if (p == cmsysProcess_Pipe_STDOUT && !output_quiet) { if (p == cmsysProcess_Pipe_STDOUT && !output_quiet) {
if (output_variable.empty()) { if (output_variable.empty()) {
processOutput.DecodeText(data, length, strdata, 1); processOutput.DecodeText(data, length, strdata, 1);
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} else { } else {
cmExecuteProcessCommandAppend(tempOutput, data, length); cmExecuteProcessCommandAppend(tempOutput, data, length);
} }
} else if (p == cmsysProcess_Pipe_STDERR && !error_quiet) { } else if (p == cmsysProcess_Pipe_STDERR && !error_quiet) {
if (error_variable.empty()) { if (error_variable.empty()) {
processOutput.DecodeText(data, length, strdata, 2); processOutput.DecodeText(data, length, strdata, 2);
cmSystemTools::Stderr(strdata.c_str(), strdata.size()); cmSystemTools::Stderr(strdata);
} else { } else {
cmExecuteProcessCommandAppend(tempError, data, length); cmExecuteProcessCommandAppend(tempError, data, length);
} }
@@ -265,13 +265,13 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
if (!output_quiet && output_variable.empty()) { if (!output_quiet && output_variable.empty()) {
processOutput.DecodeText(std::string(), strdata, 1); processOutput.DecodeText(std::string(), strdata, 1);
if (!strdata.empty()) { if (!strdata.empty()) {
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} }
} }
if (!error_quiet && error_variable.empty()) { if (!error_quiet && error_variable.empty()) {
processOutput.DecodeText(std::string(), strdata, 2); processOutput.DecodeText(std::string(), strdata, 2);
if (!strdata.empty()) { if (!strdata.empty()) {
cmSystemTools::Stderr(strdata.c_str(), strdata.size()); cmSystemTools::Stderr(strdata);
} }
} }

6
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@@ -1286,7 +1286,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
std::ostringstream msg; std::ostringstream msg;
msg << "Dependee \"" << tgtInfo << "\" is newer than depender \"" msg << "Dependee \"" << tgtInfo << "\" is newer than depender \""
<< internalDependFile << "\"." << std::endl; << internalDependFile << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
needRescanDependInfo = true; needRescanDependInfo = true;
} }
@@ -1307,7 +1307,7 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo,
std::ostringstream msg; std::ostringstream msg;
msg << "Dependee \"" << dirInfoFile << "\" is newer than depender \"" msg << "Dependee \"" << dirInfoFile << "\" is newer than depender \""
<< internalDependFile << "\"." << std::endl; << internalDependFile << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
needRescanDirInfo = true; needRescanDirInfo = true;
} }
@@ -1489,7 +1489,7 @@ void cmLocalUnixMakefileGenerator3::CheckMultipleOutputs(bool verbose)
msg << "Deleting primary custom command output \"" << dependee msg << "Deleting primary custom command output \"" << dependee
<< "\" because another output \"" << depender << "\" because another output \"" << depender
<< "\" does not exist." << std::endl; << "\" does not exist." << std::endl;
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
cmSystemTools::RemoveFile(dependee); cmSystemTools::RemoveFile(dependee);
} }

8
Source/cmQtAutoGenerator.cxx
View File

@@ -54,7 +54,7 @@ void cmQtAutoGenerator::Logger::Info(GeneratorT genType,
} }
{ {
std::lock_guard<std::mutex> lock(Mutex_); std::lock_guard<std::mutex> lock(Mutex_);
cmSystemTools::Stdout(msg.c_str(), msg.size()); cmSystemTools::Stdout(msg);
} }
} }
@@ -78,7 +78,7 @@ void cmQtAutoGenerator::Logger::Warning(GeneratorT genType,
msg.push_back('\n'); msg.push_back('\n');
{ {
std::lock_guard<std::mutex> lock(Mutex_); std::lock_guard<std::mutex> lock(Mutex_);
cmSystemTools::Stdout(msg.c_str(), msg.size()); cmSystemTools::Stdout(msg);
} }
} }
@@ -107,7 +107,7 @@ void cmQtAutoGenerator::Logger::Error(GeneratorT genType,
msg.push_back('\n'); msg.push_back('\n');
{ {
std::lock_guard<std::mutex> lock(Mutex_); std::lock_guard<std::mutex> lock(Mutex_);
cmSystemTools::Stderr(msg.c_str(), msg.size()); cmSystemTools::Stderr(msg);
} }
} }
@@ -149,7 +149,7 @@ void cmQtAutoGenerator::Logger::ErrorCommand(
msg.push_back('\n'); msg.push_back('\n');
{ {
std::lock_guard<std::mutex> lock(Mutex_); std::lock_guard<std::mutex> lock(Mutex_);
cmSystemTools::Stderr(msg.c_str(), msg.size()); cmSystemTools::Stderr(msg);
} }
} }

36
Source/cmSystemTools.cxx
View File

@@ -302,33 +302,21 @@ void cmSystemTools::SetStderrCallback(OutputCallback f, void* clientData)
s_StderrCallbackClientData = clientData; s_StderrCallbackClientData = clientData;
} }
void cmSystemTools::Stdout(const char* s) void cmSystemTools::Stderr(const std::string& s)
{
cmSystemTools::Stdout(s, strlen(s));
}
void cmSystemTools::Stderr(const char* s)
{
cmSystemTools::Stderr(s, strlen(s));
}
void cmSystemTools::Stderr(const char* s, size_t length)
{ {
if (s_StderrCallback) { if (s_StderrCallback) {
(*s_StderrCallback)(s, length, s_StderrCallbackClientData); (*s_StderrCallback)(s.c_str(), s.length(), s_StderrCallbackClientData);
} else { } else {
std::cerr.write(s, length); std::cerr << s << std::flush;
std::cerr.flush();
} }
} }
void cmSystemTools::Stdout(const char* s, size_t length) void cmSystemTools::Stdout(const std::string& s)
{ {
if (s_StdoutCallback) { if (s_StdoutCallback) {
(*s_StdoutCallback)(s, length, s_StdoutCallbackClientData); (*s_StdoutCallback)(s.c_str(), s.length(), s_StdoutCallbackClientData);
} else { } else {
std::cout.write(s, length); std::cout << s << std::flush;
std::cout.flush();
} }
} }
@@ -792,7 +780,7 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
if (pipe == cmsysProcess_Pipe_STDOUT) { if (pipe == cmsysProcess_Pipe_STDOUT) {
if (outputflag != OUTPUT_NONE) { if (outputflag != OUTPUT_NONE) {
processOutput.DecodeText(data, length, strdata, 1); processOutput.DecodeText(data, length, strdata, 1);
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} }
if (captureStdOut) { if (captureStdOut) {
tempStdOut.insert(tempStdOut.end(), data, data + length); tempStdOut.insert(tempStdOut.end(), data, data + length);
@@ -800,7 +788,7 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
} else if (pipe == cmsysProcess_Pipe_STDERR) { } else if (pipe == cmsysProcess_Pipe_STDERR) {
if (outputflag != OUTPUT_NONE) { if (outputflag != OUTPUT_NONE) {
processOutput.DecodeText(data, length, strdata, 2); processOutput.DecodeText(data, length, strdata, 2);
cmSystemTools::Stderr(strdata.c_str(), strdata.size()); cmSystemTools::Stderr(strdata);
} }
if (captureStdErr) { if (captureStdErr) {
tempStdErr.insert(tempStdErr.end(), data, data + length); tempStdErr.insert(tempStdErr.end(), data, data + length);
@@ -811,11 +799,11 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
if (outputflag != OUTPUT_NONE) { if (outputflag != OUTPUT_NONE) {
processOutput.DecodeText(std::string(), strdata, 1); processOutput.DecodeText(std::string(), strdata, 1);
if (!strdata.empty()) { if (!strdata.empty()) {
cmSystemTools::Stdout(strdata.c_str(), strdata.size()); cmSystemTools::Stdout(strdata);
} }
processOutput.DecodeText(std::string(), strdata, 2); processOutput.DecodeText(std::string(), strdata, 2);
if (!strdata.empty()) { if (!strdata.empty()) {
cmSystemTools::Stderr(strdata.c_str(), strdata.size()); cmSystemTools::Stderr(strdata);
} }
} }
} }
@@ -1899,13 +1887,13 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
if (verbose) { if (verbose) {
if (extract) { if (extract) {
cmSystemTools::Stdout("x "); cmSystemTools::Stdout("x ");
cmSystemTools::Stdout(cm_archive_entry_pathname(entry).c_str()); cmSystemTools::Stdout(cm_archive_entry_pathname(entry));
} else { } else {
list_item_verbose(stdout, entry); list_item_verbose(stdout, entry);
} }
cmSystemTools::Stdout("\n"); cmSystemTools::Stdout("\n");
} else if (!extract) { } else if (!extract) {
cmSystemTools::Stdout(cm_archive_entry_pathname(entry).c_str()); cmSystemTools::Stdout(cm_archive_entry_pathname(entry));
cmSystemTools::Stdout("\n"); cmSystemTools::Stdout("\n");
} }
if (extract) { if (extract) {

6
Source/cmSystemTools.h
View File

@@ -79,13 +79,11 @@ public:
typedef void (*OutputCallback)(const char*, size_t length, void*); typedef void (*OutputCallback)(const char*, size_t length, void*);
///! Send a string to stdout ///! Send a string to stdout
static void Stdout(const char* s); static void Stdout(const std::string& s);
static void Stdout(const char* s, size_t length);
static void SetStdoutCallback(OutputCallback, void* clientData = nullptr); static void SetStdoutCallback(OutputCallback, void* clientData = nullptr);
///! Send a string to stderr ///! Send a string to stderr
static void Stderr(const char* s); static void Stderr(const std::string& s);
static void Stderr(const char* s, size_t length);
static void SetStderrCallback(OutputCallback, void* clientData = nullptr); static void SetStderrCallback(OutputCallback, void* clientData = nullptr);
typedef bool (*InterruptCallback)(void*); typedef bool (*InterruptCallback)(void*);

16
Source/cmake.cxx
View File

@@ -2006,7 +2006,7 @@ int cmake::CheckBuildSystem()
if (verbose) { if (verbose) {
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake no build system arguments\n"; msg << "Re-run cmake no build system arguments\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
return 1; return 1;
} }
@@ -2017,7 +2017,7 @@ int cmake::CheckBuildSystem()
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake missing file: " << this->CheckBuildSystemArgument msg << "Re-run cmake missing file: " << this->CheckBuildSystemArgument
<< "\n"; << "\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
return 1; return 1;
} }
@@ -2037,7 +2037,7 @@ int cmake::CheckBuildSystem()
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake error reading : " << this->CheckBuildSystemArgument msg << "Re-run cmake error reading : " << this->CheckBuildSystemArgument
<< "\n"; << "\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
// There was an error reading the file. Just rerun. // There was an error reading the file. Just rerun.
return 1; return 1;
@@ -2071,7 +2071,7 @@ int cmake::CheckBuildSystem()
if (verbose) { if (verbose) {
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake, missing byproduct: " << p << "\n"; msg << "Re-run cmake, missing byproduct: " << p << "\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
return 1; return 1;
} }
@@ -2092,7 +2092,7 @@ int cmake::CheckBuildSystem()
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake no CMAKE_MAKEFILE_DEPENDS " msg << "Re-run cmake no CMAKE_MAKEFILE_DEPENDS "
"or CMAKE_MAKEFILE_OUTPUTS :\n"; "or CMAKE_MAKEFILE_OUTPUTS :\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
return 1; return 1;
} }
@@ -2111,7 +2111,7 @@ int cmake::CheckBuildSystem()
if (verbose) { if (verbose) {
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake: build system dependency is missing\n"; msg << "Re-run cmake: build system dependency is missing\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
return 1; return 1;
} }
@@ -2131,7 +2131,7 @@ int cmake::CheckBuildSystem()
if (verbose) { if (verbose) {
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake: build system output is missing\n"; msg << "Re-run cmake: build system output is missing\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
return 1; return 1;
} }
@@ -2147,7 +2147,7 @@ int cmake::CheckBuildSystem()
std::ostringstream msg; std::ostringstream msg;
msg << "Re-run cmake file: " << out_oldest msg << "Re-run cmake file: " << out_oldest
<< " older than: " << dep_newest << "\n"; << " older than: " << dep_newest << "\n";
cmSystemTools::Stdout(msg.str().c_str()); cmSystemTools::Stdout(msg.str());
} }
return 1; return 1;
} }