[Cmake-commits] CMake branch, master, updated. v2.8.3-312-g533f5a2

[Brad King]

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, master has been updated
       via  533f5a20372829aa41a71ed4698cac2a50820a7e (commit)
       via  53ea8b32045ce4c8045b904407e7e57d8d9fd4ab (commit)
       via  1a29ccaf9a2604ad405035a4a6f51413f74a1145 (commit)
       via  542b517449e8c7101ac6fbd316749bd461b48588 (commit)
       via  6fe5b3db0b2ca3f9203a54589de0d744d59744c0 (commit)
      from  ea38628366634189502b57c53d866bc436eb7c7f (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=533f5a20372829aa41a71ed4698cac2a50820a7e
commit 533f5a20372829aa41a71ed4698cac2a50820a7e
Merge: ea38628 53ea8b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 21 14:03:02 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 21 14:03:02 2010 -0500

    Merge topic 'custom-command-refactor'
    
    53ea8b3 Merge branch 'imported-target-dependencies' into custom-command-refactor
    1a29cca Remove cmLocalGenerator::GetRealLocation
    542b517 Factor out common custom command generator
    6fe5b3d Simplify VS generator ConstructScript interface

diff --cc Source/cmLocalVisualStudioGenerator.cxx
index 8eddc43,6d43dc4..9a8cbc7
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@@ -149,27 -150,17 +150,29 @@@ void cmLocalVisualStudioGenerator::Comp
  }
  
  //----------------------------------------------------------------------------
 +std::string cmLocalVisualStudioGenerator::CheckForErrorLine()
 +{
 +  return "if errorlevel 1 goto :VCReportError";
 +}
 +
 +//----------------------------------------------------------------------------
 +std::string cmLocalVisualStudioGenerator::GetCheckForErrorLine()
 +{
 +  return this->CheckForErrorLine();
 +}
 +
 +//----------------------------------------------------------------------------
  std::string
  cmLocalVisualStudioGenerator
- ::ConstructScript(const cmCustomCommandLines& commandLines,
-                   const char* workingDirectory,
+ ::ConstructScript(cmCustomCommand const& cc,
                    const char* configName,
-                   bool escapeOldStyle,
-                   bool escapeAllowMakeVars,
                    const char* newline_text)
  {
+   const cmCustomCommandLines& commandLines = cc.GetCommandLines();
+   const char* workingDirectory = cc.GetWorkingDirectory();
+   cmCustomCommandGenerator ccg(cc, configName, this->Makefile);
+   RelativeRoot relativeRoot = workingDirectory? NONE : START_OUTPUT;
+ 
    // Avoid leading or trailing newlines.
    const char* newline = "";
  
diff --cc Source/cmLocalVisualStudioGenerator.h
index 0019bfb,551b01c..1954ac5
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@@ -30,22 -31,12 +31,19 @@@ class cmLocalVisualStudioGenerator : pu
  public:
    cmLocalVisualStudioGenerator();
    virtual ~cmLocalVisualStudioGenerator();
 +
    /** Construct a script from the given list of command lines.  */
-   std::string ConstructScript(const cmCustomCommandLines& commandLines,
-                               const char* workingDirectory,
+   std::string ConstructScript(cmCustomCommand const& cc,
                                const char* configName,
-                               bool escapeOldStyle,
-                               bool escapeAllowMakeVars,
                                const char* newline = "\n");
  
 +  /** Line of batch file text that skips to the end after
 +    * a failed step in a sequence of custom commands.
 +    */
 +  std::string GetCheckForErrorLine();
 +
  protected:
 +  virtual std::string CheckForErrorLine();
  
    /** Construct a custom command to make exe import lib dir.  */
    cmsys::auto_ptr<cmCustomCommand>

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeLists.txt                      |    2 +
 Source/cmCustomCommandGenerator.cxx        |   64 ++++++++++++++++++++++++++++
 Source/cmCustomCommandGenerator.h          |   37 ++++++++++++++++
 Source/cmGlobalXCodeGenerator.cxx          |   31 +++-----------
 Source/cmLocalGenerator.cxx                |   18 --------
 Source/cmLocalGenerator.h                  |    5 --
 Source/cmLocalUnixMakefileGenerator3.cxx   |   27 +++---------
 Source/cmLocalVisualStudio6Generator.cxx   |   15 +------
 Source/cmLocalVisualStudio7Generator.cxx   |   14 +-----
 Source/cmLocalVisualStudioGenerator.cxx    |   45 +++++--------------
 Source/cmLocalVisualStudioGenerator.h      |    6 +--
 Source/cmVisualStudio10TargetGenerator.cxx |   16 +------
 bootstrap                                  |    1 +
 13 files changed, 137 insertions(+), 144 deletions(-)
 create mode 100644 Source/cmCustomCommandGenerator.cxx
 create mode 100644 Source/cmCustomCommandGenerator.h


hooks/post-receive
-- 
CMake