[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1087-g36f99ed
Brad King
brad.king at kitware.com
Fri Nov 11 09:07:44 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 36f99ed048cf700a8768162348f157ed67459ee1 (commit)
via 0be3e5c248049e896972fe7156df53fa8ac7223c (commit)
from 89e8dd3c8d9b5876378b4175487689b14073ea36 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36f99ed048cf700a8768162348f157ed67459ee1
commit 36f99ed048cf700a8768162348f157ed67459ee1
Merge: 89e8dd3 0be3e5c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 11 09:07:42 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 11 09:07:42 2016 -0500
Merge topic 'childEncoding' into next
0be3e5c2 Revert topic 'childEncoding'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0be3e5c248049e896972fe7156df53fa8ac7223c
commit 0be3e5c248049e896972fe7156df53fa8ac7223c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 11 09:07:25 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 11 09:07:25 2016 -0500
Revert topic 'childEncoding'
It will be revised and restored.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index fcda6f9..718b022 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -330,8 +330,6 @@ set(SRCS
cmOrderDirectories.h
cmPolicies.h
cmPolicies.cxx
- cmProcessOutput.cxx
- cmProcessOutput.h
cmProcessTools.cxx
cmProcessTools.h
cmProperty.cxx
@@ -634,9 +632,6 @@ set(SRCS
cm_codecvt.cxx
)
-SET_PROPERTY(SOURCE cmProcessOutput.cxx APPEND PROPERTY COMPILE_DEFINITIONS
- KWSYS_ENCODING_DEFAULT_CODEPAGE=${KWSYS_ENCODING_DEFAULT_CODEPAGE})
-
# Kdevelop only works on UNIX and not windows
if(UNIX)
set(SRCS ${SRCS} cmGlobalKdevelopGenerator.cxx)
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index a455908..7b4d994 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -7,7 +7,6 @@
#include "cmFileTimeComparison.h"
#include "cmGeneratedFileStream.h"
#include "cmMakefile.h"
-#include "cmProcessOutput.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
@@ -766,7 +765,7 @@ void cmCTestBuildHandler::LaunchHelper::WriteScrapeMatchers(
int cmCTestBuildHandler::RunMakeCommand(const char* command, int* retVal,
const char* dir, int timeout,
- std::ostream& ofs, Encoding encoding)
+ std::ostream& ofs)
{
// First generate the command and arguments
std::vector<std::string> args = cmSystemTools::ParseArguments(command);
@@ -810,8 +809,6 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command, int* retVal,
char* data;
int length;
- cmProcessOutput processOutput(encoding);
- std::string strdata;
cmCTestOptionalLog(
this->CTest, HANDLER_PROGRESS_OUTPUT, " Each symbol represents "
<< tick_len << " bytes of output." << std::endl
@@ -845,25 +842,13 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command, int* retVal,
// Process the chunk of data
if (res == cmsysProcess_Pipe_STDERR) {
- processOutput.DecodeText(data, length, strdata, 1);
- this->ProcessBuffer(strdata.c_str(), strdata.size(), tick, tick_len, ofs,
+ this->ProcessBuffer(data, length, tick, tick_len, ofs,
&this->BuildProcessingErrorQueue);
} else {
- processOutput.DecodeText(data, length, strdata, 2);
- this->ProcessBuffer(strdata.c_str(), strdata.size(), tick, tick_len, ofs,
+ this->ProcessBuffer(data, length, tick, tick_len, ofs,
&this->BuildProcessingQueue);
}
}
- processOutput.DecodeText(std::string(), strdata, 1);
- if (!strdata.empty()) {
- this->ProcessBuffer(strdata.c_str(), strdata.size(), tick, tick_len, ofs,
- &this->BuildProcessingErrorQueue);
- }
- processOutput.DecodeText(std::string(), strdata, 2);
- if (!strdata.empty()) {
- this->ProcessBuffer(strdata.c_str(), strdata.size(), tick, tick_len, ofs,
- &this->BuildProcessingQueue);
- }
this->ProcessBuffer(CM_NULLPTR, 0, tick, tick_len, ofs,
&this->BuildProcessingQueue);
@@ -935,7 +920,7 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command, int* retVal,
//######################################################################
//######################################################################
-void cmCTestBuildHandler::ProcessBuffer(const char* data, size_t length,
+void cmCTestBuildHandler::ProcessBuffer(const char* data, int length,
size_t& tick, size_t tick_len,
std::ostream& ofs,
t_BuildProcessingQueueType* queue)
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index a2f6112..5bd1157 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -7,7 +7,6 @@
#include "cmCTestGenericHandler.h"
-#include <cmProcessOutput.h>
#include <cmsys/RegularExpression.hxx>
#include <deque>
#include <iosfwd>
@@ -26,7 +25,6 @@ class cmCTestBuildHandler : public cmCTestGenericHandler
{
public:
typedef cmCTestGenericHandler Superclass;
- typedef cmProcessOutput::Encoding Encoding;
/*
* The main entry point for this class
@@ -51,8 +49,7 @@ private:
//! Run command specialized for make and configure. Returns process status
// and retVal is return value or exception.
int RunMakeCommand(const char* command, int* retVal, const char* dir,
- int timeout, std::ostream& ofs,
- Encoding encoding = cmProcessOutput::Auto);
+ int timeout, std::ostream& ofs);
enum
{
@@ -110,7 +107,7 @@ private:
typedef std::deque<char> t_BuildProcessingQueueType;
- void ProcessBuffer(const char* data, size_t length, size_t& tick,
+ void ProcessBuffer(const char* data, int length, size_t& tick,
size_t tick_len, std::ostream& ofs,
t_BuildProcessingQueueType* queue);
int ProcessSingleLine(const char* data);
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 1f43906..1bc1851 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -624,7 +624,7 @@ void cmCTestGIT::LoadRevisions()
CommitParser out(this, "dt-out> ");
OutputLogger err(this->Log, "dt-err> ");
- this->RunProcess(cp, &out, &err, cmProcessOutput::UTF8);
+ this->RunProcess(cp, &out, &err);
// Send one extra zero-byte to terminate the last record.
out.Process("", 1);
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 43c0fef..f7a6e0b 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -8,7 +8,6 @@
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
-#include "cmProcessOutput.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
@@ -226,31 +225,17 @@ void cmCTestLaunch::RunChild()
if (!this->Passthru) {
char* data = CM_NULLPTR;
int length = 0;
- cmProcessOutput processOutput;
- std::string strdata;
while (int p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR)) {
if (p == cmsysProcess_Pipe_STDOUT) {
- processOutput.DecodeText(data, length, strdata, 1);
- fout.write(strdata.c_str(), strdata.size());
- std::cout.write(strdata.c_str(), strdata.size());
+ fout.write(data, length);
+ std::cout.write(data, length);
this->HaveOut = true;
} else if (p == cmsysProcess_Pipe_STDERR) {
- processOutput.DecodeText(data, length, strdata, 2);
- ferr.write(strdata.c_str(), strdata.size());
- std::cerr.write(strdata.c_str(), strdata.size());
+ ferr.write(data, length);
+ std::cerr.write(data, length);
this->HaveErr = true;
}
}
- processOutput.DecodeText(std::string(), strdata, 1);
- if (!strdata.empty()) {
- fout.write(strdata.c_str(), strdata.size());
- std::cout.write(strdata.c_str(), strdata.size());
- }
- processOutput.DecodeText(std::string(), strdata, 2);
- if (!strdata.empty()) {
- ferr.write(strdata.c_str(), strdata.size());
- std::cerr.write(strdata.c_str(), strdata.size());
- }
}
// Wait for the real command to finish.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 94c9b59..d10f7ad 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -7,7 +7,6 @@
#include "cmCTestScriptHandler.h"
#include "cmCurl.h"
#include "cmGeneratedFileStream.h"
-#include "cmProcessOutput.h"
#include "cmState.h"
#include "cmStateTypes.h"
#include "cmSystemTools.h"
@@ -802,20 +801,10 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(const std::string& scp_command,
cmsysProcess_Execute(cp);
char* data;
int length;
- cmProcessOutput processOutput;
- std::string strdata;
while (cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR)) {
- processOutput.DecodeText(data, length, strdata);
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- cmCTestLogWrite(strdata.c_str(), strdata.size()),
- this->Quiet);
- }
- processOutput.DecodeText(std::string(), strdata);
- if (!strdata.empty()) {
- cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
- cmCTestLogWrite(strdata.c_str(), strdata.size()),
- this->Quiet);
+ cmCTestLogWrite(data, length), this->Quiet);
}
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx
index 444c43d..7a2fa69 100644
--- a/Source/CTest/cmCTestVC.cxx
+++ b/Source/CTest/cmCTestVC.cxx
@@ -76,8 +76,7 @@ bool cmCTestVC::InitialCheckout(const char* command)
}
bool cmCTestVC::RunChild(char const* const* cmd, OutputParser* out,
- OutputParser* err, const char* workDir,
- Encoding encoding)
+ OutputParser* err, const char* workDir)
{
this->Log << this->ComputeCommandLine(cmd) << "\n";
@@ -85,7 +84,7 @@ bool cmCTestVC::RunChild(char const* const* cmd, OutputParser* out,
cmsysProcess_SetCommand(cp, cmd);
workDir = workDir ? workDir : this->SourceDirectory.c_str();
cmsysProcess_SetWorkingDirectory(cp, workDir);
- this->RunProcess(cp, out, err, encoding);
+ this->RunProcess(cp, out, err);
int result = cmsysProcess_GetExitValue(cp);
cmsysProcess_Delete(cp);
return result == 0;
@@ -103,7 +102,7 @@ std::string cmCTestVC::ComputeCommandLine(char const* const* cmd)
}
bool cmCTestVC::RunUpdateCommand(char const* const* cmd, OutputParser* out,
- OutputParser* err, Encoding encoding)
+ OutputParser* err)
{
// Report the command line.
this->UpdateCommandLine = this->ComputeCommandLine(cmd);
@@ -113,7 +112,7 @@ bool cmCTestVC::RunUpdateCommand(char const* const* cmd, OutputParser* out,
}
// Run the command.
- return this->RunChild(cmd, out, err, CM_NULLPTR, encoding);
+ return this->RunChild(cmd, out, err);
}
std::string cmCTestVC::GetNightlyTime()
diff --git a/Source/CTest/cmCTestVC.h b/Source/CTest/cmCTestVC.h
index dd8b973..4f2bba0 100644
--- a/Source/CTest/cmCTestVC.h
+++ b/Source/CTest/cmCTestVC.h
@@ -116,13 +116,11 @@ protected:
/** Run a command line and send output to given parsers. */
bool RunChild(char const* const* cmd, OutputParser* out, OutputParser* err,
- const char* workDir = CM_NULLPTR,
- Encoding encoding = cmProcessOutput::Auto);
+ const char* workDir = CM_NULLPTR);
/** Run VC update command line and send output to given parsers. */
bool RunUpdateCommand(char const* const* cmd, OutputParser* out,
- OutputParser* err = CM_NULLPTR,
- Encoding encoding = cmProcessOutput::Auto);
+ OutputParser* err = CM_NULLPTR);
/** Write xml element for one file. */
void WriteXMLEntry(cmXMLWriter& xml, std::string const& path,
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx
index 98bd3bb..a24fe21 100644
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@@ -3,7 +3,6 @@
#include "cmProcess.h"
#include <cmConfigure.h>
-#include <cmProcessOutput.h>
#include <cmSystemTools.h>
#include <iostream>
@@ -105,8 +104,6 @@ bool cmProcess::Buffer::GetLast(std::string& line)
int cmProcess::GetNextOutputLine(std::string& line, double timeout)
{
- cmProcessOutput processOutput;
- std::string strdata;
for (;;) {
// Look for lines already buffered.
if (this->Output.GetLine(line)) {
@@ -121,17 +118,12 @@ int cmProcess::GetNextOutputLine(std::string& line, double timeout)
return cmsysProcess_Pipe_Timeout;
}
if (p == cmsysProcess_Pipe_STDOUT) {
- processOutput.DecodeText(data, length, strdata);
- this->Output.insert(this->Output.end(), strdata.begin(), strdata.end());
+ this->Output.insert(this->Output.end(), data, data + length);
} else { // p == cmsysProcess_Pipe_None
// The process will provide no more data.
break;
}
}
- processOutput.DecodeText(std::string(), strdata);
- if (!strdata.empty()) {
- this->Output.insert(this->Output.end(), strdata.begin(), strdata.end());
- }
// Look for partial last lines.
if (this->Output.GetLast(line)) {
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index de13725..010fc4e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -41,7 +41,6 @@
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
-#include "cmProcessOutput.h"
#include "cmState.h"
#include "cmStateSnapshot.h"
#include "cmStateTypes.h"
@@ -1008,7 +1007,7 @@ int cmCTest::GetTestModelFromString(const char* str)
int cmCTest::RunMakeCommand(const char* command, std::string& output,
int* retVal, const char* dir, int timeout,
- std::ostream& ofs, Encoding encoding)
+ std::ostream& ofs)
{
// First generate the command and arguments
std::vector<std::string> args = cmSystemTools::ParseArguments(command);
@@ -1047,19 +1046,16 @@ int cmCTest::RunMakeCommand(const char* command, std::string& output,
char* data;
int length;
- cmProcessOutput processOutput(encoding);
- std::string strdata;
cmCTestLog(this, HANDLER_PROGRESS_OUTPUT, " Each . represents "
<< tick_len << " bytes of output" << std::endl
<< " " << std::flush);
while (cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR)) {
- processOutput.DecodeText(data, length, strdata);
- for (size_t cc = 0; cc < strdata.size(); ++cc) {
- if (strdata[cc] == 0) {
- strdata[cc] = '\n';
+ for (int cc = 0; cc < length; ++cc) {
+ if (data[cc] == 0) {
+ data[cc] = '\n';
}
}
- output.append(strdata);
+ output.append(data, length);
while (output.size() > (tick * tick_len)) {
tick++;
cmCTestLog(this, HANDLER_PROGRESS_OUTPUT, "." << std::flush);
@@ -1070,19 +1066,9 @@ int cmCTest::RunMakeCommand(const char* command, std::string& output,
<< " " << std::flush);
}
}
- cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
- cmCTestLogWrite(strdata.c_str(), strdata.size()));
- if (ofs) {
- ofs << cmCTestLogWrite(strdata.c_str(), strdata.size());
- }
- }
- processOutput.DecodeText(std::string(), strdata);
- if (!strdata.empty()) {
- output.append(strdata);
- cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
- cmCTestLogWrite(strdata.c_str(), strdata.size()));
+ cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, cmCTestLogWrite(data, length));
if (ofs) {
- ofs << cmCTestLogWrite(strdata.c_str(), strdata.size());
+ ofs << cmCTestLogWrite(data, length);
}
}
cmCTestLog(this, HANDLER_PROGRESS_OUTPUT, " Size of output: "
@@ -1122,7 +1108,7 @@ int cmCTest::RunMakeCommand(const char* command, std::string& output,
int cmCTest::RunTest(std::vector<const char*> argv, std::string* output,
int* retVal, std::ostream* log, double testTimeOut,
- std::vector<std::string>* environment, Encoding encoding)
+ std::vector<std::string>* environment)
{
bool modifyEnv = (environment && !environment->empty());
@@ -1217,30 +1203,17 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output,
char* data;
int length;
- cmProcessOutput processOutput(encoding);
- std::string strdata;
while (cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR)) {
- processOutput.DecodeText(data, length, strdata);
if (output) {
tempOutput.insert(tempOutput.end(), data, data + length);
}
- cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
- cmCTestLogWrite(strdata.c_str(), strdata.size()));
- if (log) {
- log->write(strdata.c_str(), strdata.size());
- }
- }
- processOutput.DecodeText(std::string(), strdata);
- if (!strdata.empty()) {
- cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
- cmCTestLogWrite(strdata.c_str(), strdata.size()));
+ cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, cmCTestLogWrite(data, length));
if (log) {
- log->write(strdata.c_str(), strdata.size());
+ log->write(data, length);
}
}
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
- processOutput.DecodeText(tempOutput, tempOutput);
if (output && tempOutput.begin() != tempOutput.end()) {
output->append(&*tempOutput.begin(), tempOutput.size());
}
@@ -2571,7 +2544,7 @@ bool cmCTest::SetCTestConfigurationFromCMakeVariable(
bool cmCTest::RunCommand(const char* command, std::string* stdOut,
std::string* stdErr, int* retVal, const char* dir,
- double timeout, Encoding encoding)
+ double timeout)
{
std::vector<std::string> args = cmSystemTools::ParseArguments(command);
@@ -2602,8 +2575,6 @@ bool cmCTest::RunCommand(const char* command, std::string* stdOut,
std::vector<char> tempError;
char* data;
int length;
- cmProcessOutput processOutput(encoding);
- std::string strdata;
int res;
bool done = false;
while (!done) {
@@ -2620,24 +2591,15 @@ bool cmCTest::RunCommand(const char* command, std::string* stdOut,
}
if ((res == cmsysProcess_Pipe_STDOUT || res == cmsysProcess_Pipe_STDERR) &&
this->ExtraVerbose) {
- processOutput.DecodeText(data, length, strdata);
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
- }
- }
- if (this->ExtraVerbose) {
- processOutput.DecodeText(std::string(), strdata);
- if (!strdata.empty()) {
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
+ cmSystemTools::Stdout(data, length);
}
}
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
if (!tempOutput.empty()) {
- processOutput.DecodeText(tempOutput, tempOutput);
stdOut->append(&*tempOutput.begin(), tempOutput.size());
}
if (!tempError.empty()) {
- processOutput.DecodeText(tempError, tempError);
stdErr->append(&*tempError.begin(), tempError.size());
}
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 5509d74..8d3f8fb 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -5,7 +5,6 @@
#include <cmConfigure.h>
-#include <cmProcessOutput.h>
#include <cmsys/String.hxx>
#include <map>
#include <set>
@@ -49,7 +48,6 @@ class cmCTest
friend class cmCTestMultiProcessHandler;
public:
- typedef cmProcessOutput::Encoding Encoding;
/** Enumerate parts of the testing and submission process. */
enum Part
{
@@ -272,8 +270,7 @@ public:
*/
bool RunCommand(const char* command, std::string* stdOut,
std::string* stdErr, int* retVal = CM_NULLPTR,
- const char* dir = CM_NULLPTR, double timeout = 0.0,
- Encoding encoding = cmProcessOutput::Auto);
+ const char* dir = CM_NULLPTR, double timeout = 0.0);
/**
* Clean/make safe for xml the given value such that it may be used as
@@ -292,8 +289,7 @@ public:
* and retVal is return value or exception.
*/
int RunMakeCommand(const char* command, std::string& output, int* retVal,
- const char* dir, int timeout, std::ostream& ofs,
- Encoding encoding = cmProcessOutput::Auto);
+ const char* dir, int timeout, std::ostream& ofs);
/** Return the current tag */
std::string GetCurrentTag();
@@ -340,8 +336,7 @@ public:
*/
int RunTest(std::vector<const char*> args, std::string* output, int* retVal,
std::ostream* logfile, double testTimeOut,
- std::vector<std::string>* environment,
- Encoding encoding = cmProcessOutput::Auto);
+ std::vector<std::string>* environment);
/**
* Execute handler and return its result. If the handler fails, it returns
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx
index 6a7292d..df92592 100644
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@@ -6,7 +6,6 @@
#include <stdio.h>
#include "cmMakefile.h"
-#include "cmProcessOutput.h"
#include "cmSystemTools.h"
class cmExecutionStatus;
@@ -117,7 +116,7 @@ bool cmExecProgramCommand::InitialPass(std::vector<std::string> const& args,
bool cmExecProgramCommand::RunCommand(const char* command, std::string& output,
int& retVal, const char* dir,
- bool verbose, Encoding encoding)
+ bool verbose)
{
if (cmSystemTools::GetRunCommandOutput()) {
verbose = false;
@@ -215,28 +214,17 @@ bool cmExecProgramCommand::RunCommand(const char* command, std::string& output,
int length;
char* data;
int p;
- cmProcessOutput processOutput(encoding);
- std::string strdata;
while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
if (p == cmsysProcess_Pipe_STDOUT || p == cmsysProcess_Pipe_STDERR) {
if (verbose) {
- processOutput.DecodeText(data, length, strdata);
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
+ cmSystemTools::Stdout(data, length);
}
output.append(data, length);
}
}
- if (verbose) {
- processOutput.DecodeText(std::string(), strdata);
- if (!strdata.empty()) {
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
- }
- }
-
// All output has been read. Wait for the process to exit.
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
- processOutput.DecodeText(output, output);
// Check the result of running the process.
std::string msg;
diff --git a/Source/cmExecProgramCommand.h b/Source/cmExecProgramCommand.h
index 58e948e..7cdf777 100644
--- a/Source/cmExecProgramCommand.h
+++ b/Source/cmExecProgramCommand.h
@@ -8,7 +8,6 @@
#include <vector>
#include "cmCommand.h"
-#include "cmProcessOutput.h"
class cmExecutionStatus;
@@ -22,7 +21,6 @@ class cmExecutionStatus;
class cmExecProgramCommand : public cmCommand
{
public:
- typedef cmProcessOutput::Encoding Encoding;
/**
* This is a virtual constructor for the command.
*/
@@ -48,8 +46,7 @@ public:
private:
static bool RunCommand(const char* command, std::string& output, int& retVal,
const char* directory = CM_NULLPTR,
- bool verbose = true,
- Encoding encoding = cmProcessOutput::Auto);
+ bool verbose = true);
};
#endif
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index 1562223..c8a3a84 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -8,7 +8,6 @@
#include <stdio.h>
#include "cmMakefile.h"
-#include "cmProcessOutput.h"
#include "cmSystemTools.h"
class cmExecutionStatus;
@@ -223,43 +222,25 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
int length;
char* data;
int p;
- cmProcessOutput processOutput;
- std::string strdata;
while ((p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
// Put the output in the right place.
if (p == cmsysProcess_Pipe_STDOUT && !output_quiet) {
if (output_variable.empty()) {
- processOutput.DecodeText(data, length, strdata, 1);
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
+ cmSystemTools::Stdout(data, length);
} else {
cmExecuteProcessCommandAppend(tempOutput, data, length);
}
} else if (p == cmsysProcess_Pipe_STDERR && !error_quiet) {
if (error_variable.empty()) {
- processOutput.DecodeText(data, length, strdata, 2);
- cmSystemTools::Stderr(strdata.c_str(), strdata.size());
+ cmSystemTools::Stderr(data, length);
} else {
cmExecuteProcessCommandAppend(tempError, data, length);
}
}
}
- if (!output_quiet && output_variable.empty()) {
- processOutput.DecodeText(std::string(), strdata, 1);
- if (!strdata.empty()) {
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
- }
- }
- if (!error_quiet && error_variable.empty()) {
- processOutput.DecodeText(std::string(), strdata, 2);
- if (!strdata.empty()) {
- cmSystemTools::Stderr(strdata.c_str(), strdata.size());
- }
- }
// All output has been read. Wait for the process to exit.
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
- processOutput.DecodeText(tempOutput, tempOutput);
- processOutput.DecodeText(tempError, tempError);
// Fix the text in the output strings.
cmExecuteProcessCommandFixText(tempOutput, output_strip_trailing_whitespace);
diff --git a/Source/cmProcessOutput.cxx b/Source/cmProcessOutput.cxx
deleted file mode 100644
index 1440223..0000000
--- a/Source/cmProcessOutput.cxx
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
- file Copyright.txt or https://cmake.org/licensing for details. */
-
-#include "cmProcessOutput.h"
-
-#if defined(_WIN32)
-#include <windows.h>
-unsigned int cmProcessOutput::defaultCodepage =
- KWSYS_ENCODING_DEFAULT_CODEPAGE;
-#endif
-
-cmProcessOutput::cmProcessOutput(Encoding encoding, unsigned int maxSize)
-{
-#if defined(_WIN32)
- codepage = 0;
- bufferSize = maxSize;
- if (encoding == None) {
- codepage = defaultCodepage;
- } else if (encoding == Auto) {
- codepage = GetConsoleCP();
- } else if (encoding == UTF8) {
- codepage = CP_UTF8;
- } else if (encoding == OEM) {
- codepage = GetOEMCP();
- }
- if (!codepage || encoding == ANSI) {
- codepage = GetACP();
- }
-#else
- static_cast<void>(encoding);
- static_cast<void>(maxSize);
-#endif
-}
-
-cmProcessOutput::~cmProcessOutput()
-{
-}
-
-bool cmProcessOutput::DecodeText(std::string raw, std::string& decoded,
- size_t id)
-{
- bool success = true;
- decoded = raw;
-#if defined(_WIN32)
- if (id > 0) {
- if (rawparts.size() < id) {
- rawparts.reserve(id);
- while (rawparts.size() < id)
- rawparts.push_back(std::string());
- }
- raw = rawparts[id - 1] + raw;
- rawparts[id - 1].clear();
- decoded = raw;
- }
- if (raw.size() > 0 && codepage != defaultCodepage) {
- success = false;
- CPINFOEXW cpinfo;
- if (id > 0 && bufferSize > 0 && raw.size() == bufferSize &&
- GetCPInfoExW(codepage, 0, &cpinfo) == 1 && cpinfo.MaxCharSize > 1) {
- if (cpinfo.MaxCharSize == 2 && cpinfo.LeadByte[0] != 0) {
- LPSTR prevChar =
- CharPrevExA(codepage, raw.c_str(), raw.c_str() + raw.size(), 0);
- bool isLeadByte =
- (*(prevChar + 1) == 0) && IsDBCSLeadByteEx(codepage, *prevChar);
- if (isLeadByte) {
- rawparts[id - 1] += *(raw.end() - 1);
- raw.resize(raw.size() - 1);
- }
- success = DoDecodeText(raw, decoded, NULL);
- } else {
- bool restoreDecoded = false;
- std::string firstDecoded = decoded;
- wchar_t lastChar = 0;
- for (UINT i = 0; i < cpinfo.MaxCharSize; i++) {
- success = DoDecodeText(raw, decoded, &lastChar);
- if (success && lastChar != 0) {
- if (i == 0) {
- firstDecoded = decoded;
- }
- if (lastChar == cpinfo.UnicodeDefaultChar) {
- restoreDecoded = true;
- rawparts[id - 1] = *(raw.end() - 1) + rawparts[id - 1];
- raw.resize(raw.size() - 1);
- } else {
- restoreDecoded = false;
- break;
- }
- } else {
- break;
- }
- }
- if (restoreDecoded) {
- decoded = firstDecoded;
- rawparts[id - 1].clear();
- }
- }
- } else {
- success = DoDecodeText(raw, decoded, NULL);
- }
- }
-#else
- static_cast<void>(id);
-#endif
- return success;
-}
-
-bool cmProcessOutput::DecodeText(const char* data, size_t length,
- std::string& decoded, size_t id)
-{
- return DecodeText(std::string(data, length), decoded, id);
-}
-
-bool cmProcessOutput::DecodeText(std::vector<char> raw,
- std::vector<char>& decoded, size_t id)
-{
- std::string str;
- const bool success =
- DecodeText(std::string(raw.begin(), raw.end()), str, id);
- decoded.assign(str.begin(), str.end());
- return success;
-}
-
-#if defined(_WIN32)
-bool cmProcessOutput::DoDecodeText(std::string raw, std::string& decoded,
- wchar_t* lastChar)
-{
- bool success = false;
- const int wlength =
- MultiByteToWideChar(codepage, 0, raw.c_str(), int(raw.size()), NULL, 0);
- wchar_t* wdata = new wchar_t[wlength];
- int r = MultiByteToWideChar(codepage, 0, raw.c_str(), int(raw.size()), wdata,
- wlength);
- if (r > 0) {
- if (lastChar) {
- *lastChar = 0;
- if ((wlength >= 2 && wdata[wlength - 2] != wdata[wlength - 1]) ||
- wlength >= 1) {
- *lastChar = wdata[wlength - 1];
- }
- }
- int length = WideCharToMultiByte(defaultCodepage, 0, wdata, wlength, NULL,
- 0, NULL, NULL);
- char* data = new char[length];
- r = WideCharToMultiByte(defaultCodepage, 0, wdata, wlength, data, length,
- NULL, NULL);
- if (r > 0) {
- decoded = std::string(data, length);
- success = true;
- }
- delete[] data;
- }
- delete[] wdata;
- return success;
-}
-#endif
diff --git a/Source/cmProcessOutput.h b/Source/cmProcessOutput.h
deleted file mode 100644
index d7a5e98..0000000
--- a/Source/cmProcessOutput.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
- file Copyright.txt or https://cmake.org/licensing for details. */
-#ifndef cmProcessOutput_h
-#define cmProcessOutput_h
-
-#include <cmConfigure.h> // IWYU pragma: keep
-
-#include <string>
-#include <vector>
-
-/** \class cmProcessOutput
- * \brief Decode text data to internal encoding.
- *
- * cmProcessOutput is used to decode text output from external process
- * using external encoding to our internal encoding.
- */
-class cmProcessOutput
-{
-public:
- enum Encoding
- {
- None,
- Auto,
- UTF8,
- ANSI,
- OEM
- };
-
- /// The code page that is used as internal encoding to which we will encode.
- static unsigned int defaultCodepage;
-
- /**
- * A class constructor.
- * \param encoding external process encoding from which we will decode.
- * \param maxSize a maximal size for process output buffer. It should match
- * to KWSYSPE_PIPE_BUFFER_SIZE. If text we decode is same size as \a maxSize
- * then we will check for incomplete character at end of buffer and
- * we will not return last incomplete character. This character will be
- * returned with next DecodeText() call. To disable this behavior specify
- * 0 as \a maxSize.
- */
- cmProcessOutput(Encoding encoding = Auto, unsigned int maxSize = 1024);
- ~cmProcessOutput();
- /**
- * Decode \a raw string using external encoding to internal
- * encoding in \a decoded.
- * \a id specifies which internal buffer to use. This is important when we
- * are decoding both stdout and stderr from process output and we need to
- * keep incomplete characters in separate buffers for each stream.
- * \return true if successfully decoded \a raw to \a decoded or false if not.
- */
- bool DecodeText(std::string raw, std::string& decoded, size_t id = 0);
- /**
- * Decode \a data with \a length from external encoding to internal
- * encoding in \a decoded.
- * \param data a pointer to process output text data.
- * \param length a size of data buffer.
- * \param decoded a string which will contain decoded text.
- * \param id an internal buffer id to use.
- * \return true if successfully decoded \a data to \a decoded or false if
- * not.
- */
- bool DecodeText(const char* data, size_t length, std::string& decoded,
- size_t id = 0);
- /**
- * \overload
- */
- bool DecodeText(std::vector<char> raw, std::vector<char>& decoded,
- size_t id = 0);
-
-private:
-#if defined(_WIN32)
- unsigned int codepage;
- unsigned int bufferSize;
- std::vector<std::string> rawparts;
- bool DoDecodeText(std::string raw, std::string& decoded, wchar_t* lastChar);
-#endif
-};
-
-#endif
diff --git a/Source/cmProcessTools.cxx b/Source/cmProcessTools.cxx
index b756650..e7b6051 100644
--- a/Source/cmProcessTools.cxx
+++ b/Source/cmProcessTools.cxx
@@ -1,46 +1,29 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmProcessTools.h"
-#include "cmProcessOutput.h"
#include <cmsys/Process.h>
#include <ostream>
void cmProcessTools::RunProcess(struct cmsysProcess_s* cp, OutputParser* out,
- OutputParser* err, Encoding encoding)
+ OutputParser* err)
{
cmsysProcess_Execute(cp);
char* data = CM_NULLPTR;
int length = 0;
int p;
- cmProcessOutput processOutput(encoding);
- std::string strdata;
while ((out || err) &&
(p = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR), p)) {
if (out && p == cmsysProcess_Pipe_STDOUT) {
- processOutput.DecodeText(data, length, strdata, 1);
- if (!out->Process(strdata.c_str(), int(strdata.size()))) {
+ if (!out->Process(data, length)) {
out = CM_NULLPTR;
}
} else if (err && p == cmsysProcess_Pipe_STDERR) {
- processOutput.DecodeText(data, length, strdata, 2);
- if (!err->Process(strdata.c_str(), int(strdata.size()))) {
+ if (!err->Process(data, length)) {
err = CM_NULLPTR;
}
}
}
- if (out) {
- processOutput.DecodeText(std::string(), strdata, 1);
- if (!strdata.empty()) {
- out->Process(strdata.c_str(), int(strdata.size()));
- }
- }
- if (err) {
- processOutput.DecodeText(std::string(), strdata, 2);
- if (!strdata.empty()) {
- out->Process(strdata.c_str(), int(strdata.size()));
- }
- }
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
}
diff --git a/Source/cmProcessTools.h b/Source/cmProcessTools.h
index df131b9..e5a3fe9 100644
--- a/Source/cmProcessTools.h
+++ b/Source/cmProcessTools.h
@@ -3,7 +3,6 @@
#ifndef cmProcessTools_h
#define cmProcessTools_h
-#include "cmProcessOutput.h"
#include <cmConfigure.h>
#include <iosfwd>
@@ -17,7 +16,6 @@
class cmProcessTools
{
public:
- typedef cmProcessOutput::Encoding Encoding;
/** Abstract interface for process output parsers. */
class OutputParser
{
@@ -81,8 +79,7 @@ public:
/** Run a process and send output to given parsers. */
static void RunProcess(struct cmsysProcess_s* cp, OutputParser* out,
- OutputParser* err = CM_NULLPTR,
- Encoding encoding = cmProcessOutput::Auto);
+ OutputParser* err = CM_NULLPTR);
};
#endif
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 029594f..7738ab6 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -3,7 +3,6 @@
#include "cmSystemTools.h"
#include "cmAlgorithms.h"
-#include "cmProcessOutput.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmArchiveWrite.h"
@@ -574,7 +573,7 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
std::string* captureStdOut,
std::string* captureStdErr, int* retVal,
const char* dir, OutputOption outputflag,
- double timeout, Encoding encoding)
+ double timeout)
{
std::vector<const char*> argv;
for (std::vector<std::string>::const_iterator a = command.begin();
@@ -610,8 +609,6 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
char* data;
int length;
int pipe;
- cmProcessOutput processOutput(encoding);
- std::string strdata;
if (outputflag != OUTPUT_PASSTHROUGH &&
(captureStdOut || captureStdErr || outputflag != OUTPUT_NONE)) {
while ((pipe = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR)) >
@@ -627,44 +624,28 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
if (pipe == cmsysProcess_Pipe_STDOUT) {
if (outputflag != OUTPUT_NONE) {
- processOutput.DecodeText(data, length, strdata, 1);
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
+ cmSystemTools::Stdout(data, length);
}
if (captureStdOut) {
tempStdOut.insert(tempStdOut.end(), data, data + length);
}
} else if (pipe == cmsysProcess_Pipe_STDERR) {
if (outputflag != OUTPUT_NONE) {
- processOutput.DecodeText(data, length, strdata, 2);
- cmSystemTools::Stderr(strdata.c_str(), strdata.size());
+ cmSystemTools::Stderr(data, length);
}
if (captureStdErr) {
tempStdErr.insert(tempStdErr.end(), data, data + length);
}
}
}
-
- if (outputflag != OUTPUT_NONE) {
- processOutput.DecodeText(std::string(), strdata, 1);
- if (!strdata.empty()) {
- cmSystemTools::Stdout(strdata.c_str(), strdata.size());
- }
- processOutput.DecodeText(std::string(), strdata, 2);
- if (!strdata.empty()) {
- cmSystemTools::Stderr(strdata.c_str(), strdata.size());
- }
- }
}
cmsysProcess_WaitForExit(cp, CM_NULLPTR);
-
if (captureStdOut) {
captureStdOut->assign(tempStdOut.begin(), tempStdOut.end());
- processOutput.DecodeText(*captureStdOut, *captureStdOut);
}
if (captureStdErr) {
captureStdErr->assign(tempStdErr.begin(), tempStdErr.end());
- processOutput.DecodeText(*captureStdErr, *captureStdErr);
}
bool result = true;
@@ -1662,8 +1643,6 @@ int cmSystemTools::WaitForLine(cmsysProcess* process, std::string& line,
line = "";
std::vector<char>::iterator outiter = out.begin();
std::vector<char>::iterator erriter = err.begin();
- cmProcessOutput processOutput;
- std::string strdata;
while (1) {
// Check for a newline in stdout.
for (; outiter != out.end(); ++outiter) {
@@ -1708,31 +1687,17 @@ int cmSystemTools::WaitForLine(cmsysProcess* process, std::string& line,
return pipe;
}
if (pipe == cmsysProcess_Pipe_STDOUT) {
- processOutput.DecodeText(data, length, strdata, 1);
// Append to the stdout buffer.
std::vector<char>::size_type size = out.size();
- out.insert(out.end(), strdata.begin(), strdata.end());
+ out.insert(out.end(), data, data + length);
outiter = out.begin() + size;
} else if (pipe == cmsysProcess_Pipe_STDERR) {
- processOutput.DecodeText(data, length, strdata, 2);
// Append to the stderr buffer.
std::vector<char>::size_type size = err.size();
- err.insert(err.end(), strdata.begin(), strdata.end());
+ err.insert(err.end(), data, data + length);
erriter = err.begin() + size;
} else if (pipe == cmsysProcess_Pipe_None) {
// Both stdout and stderr pipes have broken. Return leftover data.
- processOutput.DecodeText(std::string(), strdata, 1);
- if (!strdata.empty()) {
- std::vector<char>::size_type size = out.size();
- out.insert(out.end(), strdata.begin(), strdata.end());
- outiter = out.begin() + size;
- }
- processOutput.DecodeText(std::string(), strdata, 2);
- if (!strdata.empty()) {
- std::vector<char>::size_type size = err.size();
- err.insert(err.end(), strdata.begin(), strdata.end());
- erriter = err.begin() + size;
- }
if (!out.empty()) {
line.append(&out[0], outiter - out.begin());
out.erase(out.begin(), out.end());
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 10e8280..0801f26 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -5,7 +5,6 @@
#include <cmConfigure.h> // IWYU pragma: keep
-#include <cmProcessOutput.h>
#include <cmsys/Process.h>
#include <cmsys/SystemTools.hxx>
#include <stddef.h>
@@ -30,7 +29,6 @@ class cmSystemTools : public cmsys::SystemTools
{
public:
typedef cmsys::SystemTools Superclass;
- typedef cmProcessOutput::Encoding Encoding;
/** Expand out any arguments in the vector that have ; separated
* strings into multiple arguments. A new vector is created
@@ -241,8 +239,7 @@ public:
int* retVal = CM_NULLPTR,
const char* dir = CM_NULLPTR,
OutputOption outputflag = OUTPUT_MERGE,
- double timeout = 0.0,
- Encoding encoding = cmProcessOutput::Auto);
+ double timeout = 0.0);
static std::string PrintSingleCommand(std::vector<std::string> const&);
diff --git a/bootstrap b/bootstrap
index ec081fa..d54380a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -372,7 +372,6 @@ CMAKE_CXX_SOURCES="\
cmParseArgumentsCommand \
cmPathLabel \
cmPolicies \
- cmProcessOutput \
cmProjectCommand \
cmProperty \
cmPropertyDefinition \
@@ -1424,7 +1423,6 @@ fi
cmake_c_flags_String="-DKWSYS_STRING_C"
if ${cmake_system_mingw}; then
cmake_c_flags_EncodingC="-DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP"
- cmake_cxx_flags_cmProcessOutput="${cmake_c_flags_EncodingC}"
fi
cmake_cxx_flags_SystemTools="
-DKWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV}
@@ -1441,9 +1439,8 @@ echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile"
echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile"
for a in ${CMAKE_CXX_SOURCES}; do
src=`cmake_escape "${cmake_source_dir}/Source/${a}.cxx"`
- src_flags=`eval echo \\${cmake_cxx_flags_\${a}}`
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
- echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} ${src_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
+ echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
done
echo "cmBootstrapCommands1.o : $cmBootstrapCommands1Deps" >> "${cmake_bootstrap_dir}/Makefile"
echo "cmBootstrapCommands2.o : $cmBootstrapCommands2Deps" >> "${cmake_bootstrap_dir}/Makefile"
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 5 --
Source/CTest/cmCTestBuildHandler.cxx | 23 +----
Source/CTest/cmCTestBuildHandler.h | 7 +-
Source/CTest/cmCTestGIT.cxx | 2 +-
Source/CTest/cmCTestLaunch.cxx | 23 +----
Source/CTest/cmCTestSubmitHandler.cxx | 13 +--
Source/CTest/cmCTestVC.cxx | 9 +-
Source/CTest/cmCTestVC.h | 6 +-
Source/CTest/cmProcess.cxx | 10 +--
Source/cmCTest.cxx | 62 +++----------
Source/cmCTest.h | 11 +--
Source/cmExecProgramCommand.cxx | 16 +---
Source/cmExecProgramCommand.h | 5 +-
Source/cmExecuteProcessCommand.cxx | 23 +----
Source/cmProcessOutput.cxx | 155 ---------------------------------
Source/cmProcessOutput.h | 80 -----------------
Source/cmProcessTools.cxx | 23 +----
Source/cmProcessTools.h | 5 +-
Source/cmSystemTools.cxx | 45 ++--------
Source/cmSystemTools.h | 5 +-
bootstrap | 5 +-
21 files changed, 50 insertions(+), 483 deletions(-)
delete mode 100644 Source/cmProcessOutput.cxx
delete mode 100644 Source/cmProcessOutput.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list