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 e7b7cdb9420db5eb8ef8a2339bfdc7d8714b30dc (commit)
via 00861415f3476cd5691d9f2017bda9ceb15940c7 (commit)
via bb490ae62c46afc265a227e5d08e92ed572537ce (commit)
from 819979a11ae840c52e553227417b1ea7212e7667 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7b7cdb9420db5eb8ef8a2339bfdc7d8714b30dc
commit e7b7cdb9420db5eb8ef8a2339bfdc7d8714b30dc
Merge: 819979a 0086141
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 28 10:21:10 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jul 28 10:21:10 2011 -0400
Merge topic 'split-stdout-stderr' into next
0086141 Revert "RunSingleCommand: Replace verbose boolean with enum"
bb490ae Revert "RunSingleCommand: Add a OUTPUT_NORMAL flag."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00861415f3476cd5691d9f2017bda9ceb15940c7
commit 00861415f3476cd5691d9f2017bda9ceb15940c7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 28 10:16:30 2011 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jul 28 10:17:58 2011 -0400
Revert "RunSingleCommand: Replace verbose boolean with enum"
This reverts commit f5ac6fa5b740d7f50bc5f93fadb5b06732b886fa.
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 0e4acd5..7e5b26d 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -33,7 +33,7 @@
//----------------------------------------------------------------------
cmCPackGenerator::cmCPackGenerator()
{
- this->GeneratorVerbose = cmSystemTools::OUTPUT_NONE;
+ this->GeneratorVerbose = false;
this->MakefileMap = 0;
this->Logger = 0;
this->componentPackageMethod = ONE_PACKAGE_PER_GROUP;
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index 52def9d..05d95b8 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -14,7 +14,6 @@
#define cmCPackGenerator_h
#include "cmObject.h"
-#include "cmSystemTools.h"
#include <map>
#include <vector>
@@ -58,9 +57,7 @@ public:
/**
* If verbose then more information is printed out
*/
- void SetVerbose(bool val)
- { this->GeneratorVerbose = val ?
- cmSystemTools::OUTPUT_MERGE : cmSystemTools::OUTPUT_NONE; }
+ void SetVerbose(bool val) { this->GeneratorVerbose = val; }
/**
* Do the actual whole package processing.
@@ -197,7 +194,7 @@ protected:
virtual cmCPackComponentGroup* GetComponentGroup(const char *projectName,
const char* name);
- cmSystemTools::OutputOption GeneratorVerbose;
+ bool GeneratorVerbose;
std::string Name;
std::string InstallPath;
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx
b/Source/CPack/cmCPackNSISGenerator.cxx
index a1f4f2e..e5fe575 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -786,8 +786,7 @@ CreateComponentDescription(cmCPackComponent *component,
std::string output;
int retVal = -1;
int res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, &retVal,
- dirName.c_str(),
- cmSystemTools::OUTPUT_NONE, 0);
+ dirName.c_str(), false, 0);
if ( !res || retVal )
{
std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
diff --git a/Source/CTest/cmCTestGenericHandler.cxx
b/Source/CTest/cmCTestGenericHandler.cxx
index fd75e45..8c3c22a 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -18,7 +18,7 @@
//----------------------------------------------------------------------
cmCTestGenericHandler::cmCTestGenericHandler()
{
- this->HandlerVerbose = cmSystemTools::OUTPUT_NONE;
+ this->HandlerVerbose = false;
this->CTest = 0;
this->SubmitIndex = 0;
this->AppendXML = false;
diff --git a/Source/CTest/cmCTestGenericHandler.h
b/Source/CTest/cmCTestGenericHandler.h
index 18189ec..7393145 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -16,7 +16,6 @@
#include "cmObject.h"
#include "cmCTest.h"
-#include "cmSystemTools.h" //OutputOption
class cmMakefile;
class cmCTestCommand;
@@ -32,9 +31,7 @@ public:
/**
* If verbose then more informaiton is printed out
*/
- void SetVerbose(bool val)
- { this->HandlerVerbose = val ?
- cmSystemTools::OUTPUT_MERGE : cmSystemTools::OUTPUT_NONE; }
+ void SetVerbose(bool val) { this->HandlerVerbose = val; }
/**
* Populate internals from CTest custom scripts
@@ -94,7 +91,7 @@ protected:
bool StartLogFile(const char* name, cmGeneratedFileStream& xofs);
bool AppendXML;
- cmSystemTools::OutputOption HandlerVerbose;
+ bool HandlerVerbose;
cmCTest *CTest;
t_StringToString Options;
t_StringToString PersistentOptions;
diff --git a/Source/CTest/cmCTestTestHandler.cxx
b/Source/CTest/cmCTestTestHandler.cxx
index b824e47..e3b81df 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1301,8 +1301,7 @@ int
cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec)
int retVal = 0;
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it
<< std::endl);
- if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0,
- cmSystemTools::OUTPUT_MERGE
+ if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0, true
/*this->Verbose*/) || retVal != 0 )
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Problem running command: "
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2eae01e..6c8938e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1136,7 +1136,7 @@ int cmGlobalGenerator::Build(
const char *config,
bool clean, bool fast,
double timeout,
- cmSystemTools::OutputOption outputflag,
+ bool verbose,
const char* extraOptions,
std::vector<std::string> const& nativeOptions)
{
@@ -1176,7 +1176,7 @@ int cmGlobalGenerator::Build(
}
if (!cmSystemTools::RunSingleCommand(cleanCommand.c_str(), outputPtr,
- &retVal, 0, outputflag, timeout))
+ &retVal, 0, verbose, timeout))
{
cmSystemTools::SetRunCommandHideConsole(hideconsole);
cmSystemTools::Error("Generator: execution of make clean failed.");
@@ -1217,7 +1217,7 @@ int cmGlobalGenerator::Build(
}
if (!cmSystemTools::RunSingleCommand(command, outputPtr,
- &retVal, 0, outputflag, timeout))
+ &retVal, 0, verbose, timeout))
{
cmSystemTools::SetRunCommandHideConsole(hideconsole);
cmSystemTools::Error
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b7b1bff..5268731 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -17,7 +17,7 @@
#include "cmTarget.h" // For cmTargets
#include "cmTargetDepend.h" // For cmTargetDependSet
-#include "cmSystemTools.h" // for cmSystemTools::OutputOption
+
class cmake;
class cmMakefile;
class cmLocalGenerator;
@@ -102,8 +102,7 @@ public:
std::string *output,
const char *makeProgram, const char *config,
bool clean, bool fast,
- double timeout,
- cmSystemTools::OutputOption outputflag=cmSystemTools::OUTPUT_NONE,
+ double timeout, bool verbose=false,
const char* extraOptions = 0,
std::vector<std::string> const& nativeOptions =
std::vector<std::string>());
diff --git a/Source/cmSiteNameCommand.cxx b/Source/cmSiteNameCommand.cxx
index 04e357c..7b80c5c 100644
--- a/Source/cmSiteNameCommand.cxx
+++ b/Source/cmSiteNameCommand.cxx
@@ -63,7 +63,7 @@ bool cmSiteNameCommand
{
std::string host;
cmSystemTools::RunSingleCommand(hostname_cmd.c_str(),
- &host, 0, 0, cmSystemTools::OUTPUT_NONE);
+ &host, 0, 0, false);
// got the hostname
if (host.length())
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 0b024a6..28f8044 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -577,7 +577,7 @@ std::vector<cmStdString>
cmSystemTools::ParseArguments(const char* command)
bool cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
std::string* output ,
int* retVal , const char* dir ,
- OutputOption outputflag ,
+ bool verbose ,
double timeout )
{
std::vector<const char*> argv;
@@ -599,19 +599,17 @@ bool
cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
{
cmsysProcess_SetOption(cp, cmsysProcess_Option_HideWindow, 1);
}
-
cmsysProcess_SetTimeout(cp, timeout);
cmsysProcess_Execute(cp);
std::vector<char> tempOutput;
char* data;
int length;
- int pipe;
- if ( output || outputflag >= OUTPUT_NONE )
+ if ( output || verbose )
{
- while((pipe = cmsysProcess_WaitForData(cp, &data, &length, 0)))
+ while(cmsysProcess_WaitForData(cp, &data, &length, 0))
{
- if(output || outputflag >= OUTPUT_NONE)
+ if(output || verbose)
{
// Translate NULL characters in the output into valid text.
// Visual Studio 7 puts these characters in the output of its
@@ -628,15 +626,13 @@ bool
cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
{
tempOutput.insert(tempOutput.end(), data, data+length);
}
- if(outputflag >= OUTPUT_NONE)
+ if(verbose)
{
- if(outputflag == OUTPUT_MERGE)
- {
- cmSystemTools::Stdout(data, length);
- }
+ cmSystemTools::Stdout(data, length);
}
}
- }
+ }
+
cmsysProcess_WaitForExit(cp, 0);
if ( output && tempOutput.begin() != tempOutput.end())
{
@@ -661,7 +657,7 @@ bool
cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
else if(cmsysProcess_GetState(cp) == cmsysProcess_State_Exception)
{
const char* exception_str = cmsysProcess_GetExceptionString(cp);
- if ( outputflag >= OUTPUT_NONE )
+ if ( verbose )
{
std::cerr << exception_str << std::endl;
}
@@ -674,7 +670,7 @@ bool
cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
else if(cmsysProcess_GetState(cp) == cmsysProcess_State_Error)
{
const char* error_str = cmsysProcess_GetErrorString(cp);
- if ( outputflag >= OUTPUT_NONE )
+ if ( verbose )
{
std::cerr << error_str << std::endl;
}
@@ -687,7 +683,7 @@ bool
cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
else if(cmsysProcess_GetState(cp) == cmsysProcess_State_Expired)
{
const char* error_str = "Process terminated due to timeout\n";
- if ( outputflag >= OUTPUT_NONE )
+ if ( verbose )
{
std::cerr << error_str << std::endl;
}
@@ -707,12 +703,12 @@ bool cmSystemTools::RunSingleCommand(
std::string* output,
int *retVal,
const char* dir,
- OutputOption outputflag,
+ bool verbose,
double timeout)
{
if(s_DisableRunCommandOutput)
{
- outputflag = OUTPUT_NONE;
+ verbose = false;
}
std::vector<cmStdString> args = cmSystemTools::ParseArguments(command);
@@ -722,7 +718,7 @@ bool cmSystemTools::RunSingleCommand(
return false;
}
return cmSystemTools::RunSingleCommand(args, output,retVal,
- dir, outputflag, timeout);
+ dir, verbose, timeout);
}
bool cmSystemTools::RunCommand(const char* command,
std::string& output,
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index b64d7ae..fca7496 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -191,12 +191,11 @@ public:
int &retVal, const char* directory = 0,
bool verbose = true, int timeout = 0);
/**
- * Run a single executable command
+ * Run a single executable command and put the stdout and stderr
+ * in output.
*
- * Output is controlled with outputflag. If outputflag is OUTPUT_NONE, no
- * user-viewable output from the program being run will be generated.
- * OUTPUT_MERGE is the legacy behaviour where stdout and stderr are merged
- * into stdout.
+ * If verbose is false, no user-viewable output from the program
+ * being run will be generated.
*
* If timeout is specified, the command will be terminated after
* timeout expires. Timeout is specified in seconds.
@@ -211,15 +210,9 @@ public:
* it into this function or it will not work. The command must be correctly
* escaped for this to with spaces.
*/
- enum OutputOption
- {
- OUTPUT_NONE = 0,
- OUTPUT_MERGE,
- OUTPUT_NORMAL
- };
static bool RunSingleCommand(const char* command, std::string* output = 0,
int* retVal = 0, const char* dir = 0,
- OutputOption outputflag = OUTPUT_MERGE,
+ bool verbose = true,
double timeout = 0.0);
/**
* In this version of RunSingleCommand, command[0] should be
@@ -229,7 +222,7 @@ public:
static bool RunSingleCommand(std::vector<cmStdString> const& command,
std::string* output = 0,
int* retVal = 0, const char* dir = 0,
- OutputOption outputflag = OUTPUT_MERGE,
+ bool verbose = true,
double timeout = 0.0);
/**
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index c9c4ed5..4d31a14 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -194,7 +194,7 @@ void cmTryRunCommand::RunExecutable(const std::string&
runArgs,
int timeout = 0;
bool worked = cmSystemTools::RunSingleCommand(finalCommand.c_str(),
out, &retVal,
- 0, cmSystemTools::OUTPUT_NONE, timeout);
+ 0, false, timeout);
// set the run var
char retChar[1000];
if (worked)
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 3473d91..45927cb 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1297,7 +1297,7 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>&
args)
int retval = 0;
int timeout = 0;
if ( cmSystemTools::RunSingleCommand(command.c_str(), 0, &retval,
- directory.c_str(), cmSystemTools::OUTPUT_MERGE, timeout) )
+ directory.c_str(), true, timeout) )
{
return retval;
}
@@ -3978,7 +3978,7 @@ bool cmake::RunCommand(const char* comment,
// use rc command to create .res file
cmSystemTools::RunSingleCommand(command,
&output,
- &retCode, 0, cmSystemTools::OUTPUT_NONE);
+ &retCode, 0, false);
// always print the output of the command, unless
// it is the dumb rc command banner, but if the command
// returned an error code then print the output anyway as
@@ -4338,8 +4338,7 @@ int cmake::Build(const std::string& dir,
projName.c_str(), target.c_str(),
&output,
makeProgram.c_str(),
- config.c_str(), clean, false, 0,
- cmSystemTools::OUTPUT_MERGE,
+ config.c_str(), clean, false, 0, true,
0, nativeOptions);
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb490ae62c46afc265a227e5d08e92ed572537ce
commit bb490ae62c46afc265a227e5d08e92ed572537ce
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 28 10:16:23 2011 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jul 28 10:16:23 2011 -0400
Revert "RunSingleCommand: Add a OUTPUT_NORMAL flag."
This reverts commit ea1696e9ab941cf74e9df8ce25de7c771af03adb.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 0f0e1b2..0b024a6 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -247,12 +247,6 @@ void cmSystemTools::Stdout(const char* s)
}
}
-void cmSystemTools::Stderr(const char* s, int length)
-{
- std::cerr.write(s, length);
- std::cerr.flush();
-}
-
void cmSystemTools::Stdout(const char* s, int length)
{
if(s_StdoutCallback)
@@ -640,20 +634,9 @@ bool
cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
{
cmSystemTools::Stdout(data, length);
}
- else
- {
- if(pipe == cmsysProcess_Pipe_STDERR)
- {
- cmSystemTools::Stderr(data, length);
- }
- else if(pipe == cmsysProcess_Pipe_STDOUT)
- {
- cmSystemTools::Stdout(data, length);
- }
- }
- }
}
}
+ }
cmsysProcess_WaitForExit(cp, 0);
if ( output && tempOutput.begin() != tempOutput.end())
{
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index e95e1ba..b64d7ae 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -75,9 +75,6 @@ public:
typedef void (*StdoutCallback)(const char*, int length, void*);
static void SetStdoutCallback(StdoutCallback, void* clientData=0);
- ///! Send a string to stderr. Stdout callbacks will not be invoced.
- static void Stderr(const char* s, int length);
-
///! Return true if there was an error at any point.
static bool GetErrorOccuredFlag()
{
@@ -199,8 +196,7 @@ public:
* Output is controlled with outputflag. If outputflag is OUTPUT_NONE, no
* user-viewable output from the program being run will be generated.
* OUTPUT_MERGE is the legacy behaviour where stdout and stderr are merged
- * into stdout. OUTPUT_NORMAL passes through the output to stdout/stderr as
- * it was received.
+ * into stdout.
*
* If timeout is specified, the command will be terminated after
* timeout expires. Timeout is specified in seconds.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 137665d..3473d91 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4296,8 +4296,7 @@ int cmake::Build(const std::string& dir,
const std::string& target,
const std::string& config,
const std::vector<std::string>& nativeOptions,
- bool clean,
- cmSystemTools::OutputOption outputflag)
+ bool clean)
{
if(!cmSystemTools::FileIsDirectory(dir.c_str()))
{
@@ -4339,7 +4338,8 @@ int cmake::Build(const std::string& dir,
projName.c_str(), target.c_str(),
&output,
makeProgram.c_str(),
- config.c_str(), clean, false, 0, outputflag,
+ config.c_str(), clean, false, 0,
+ cmSystemTools::OUTPUT_MERGE,
0, nativeOptions);
}
diff --git a/Source/cmake.h b/Source/cmake.h
index 88847cf..fac86c1 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -364,8 +364,7 @@ class cmake
const std::string& target,
const std::string& config,
const std::vector<std::string>& nativeOptions,
- bool clean,
- cmSystemTools::OutputOption outputflag);
+ bool clean);
void UnwatchUnusedCli(const char* var);
void WatchUnusedCli(const char* var);
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 1fe9e82..663ce8f 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -62,7 +62,6 @@ static const char * cmDocumentationDescription[][3] =
" --config <cfg> = For multi-configuration tools, choose <cfg>.\n" \
" --clean-first = Build target 'clean' first, then build.\n" \
" (To clean only, use --target 'clean'.)\n" \
- " --use-stderr = Don't merge stdout/stderr.\n" \
" -- = Pass remaining options to the native tool.\n"
//----------------------------------------------------------------------------
@@ -569,7 +568,6 @@ static int do_build(int ac, char** av)
std::string dir;
std::vector<std::string> nativeOptions;
bool clean = false;
- cmSystemTools::OutputOption outputflag = cmSystemTools::OUTPUT_MERGE;
enum Doing { DoingNone, DoingDir, DoingTarget, DoingConfig, DoingNative};
Doing doing = DoingDir;
@@ -592,10 +590,6 @@ static int do_build(int ac, char** av)
clean = true;
doing = DoingNone;
}
- else if(strcmp(av[i], "--use-stderr") == 0)
- {
- outputflag = cmSystemTools::OUTPUT_NORMAL;
- }
else if(strcmp(av[i], "--") == 0)
{
doing = DoingNative;
@@ -641,6 +635,6 @@ static int do_build(int ac, char** av)
}
cmake cm;
- return cm.Build(dir, target, config, nativeOptions, clean, outputflag);
+ return cm.Build(dir, target, config, nativeOptions, clean);
#endif
}
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackGenerator.cxx | 2 +-
Source/CPack/cmCPackGenerator.h | 7 +---
Source/CPack/cmCPackNSISGenerator.cxx | 3 +-
Source/CTest/cmCTestGenericHandler.cxx | 2 +-
Source/CTest/cmCTestGenericHandler.h | 7 +---
Source/CTest/cmCTestTestHandler.cxx | 3 +-
Source/cmGlobalGenerator.cxx | 6 ++--
Source/cmGlobalGenerator.h | 5 +--
Source/cmSiteNameCommand.cxx | 2 +-
Source/cmSystemTools.cxx | 49 +++++++++----------------------
Source/cmSystemTools.h | 23 ++++-----------
Source/cmTryRunCommand.cxx | 2 +-
Source/cmake.cxx | 9 ++---
Source/cmake.h | 3 +-
Source/cmakemain.cxx | 8 +----
15 files changed, 41 insertions(+), 90 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
