[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-110-gd8aec3f

[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, next has been updated
       via  d8aec3f2d5478ffb7235b638d33d08e944093916 (commit)
       via  07c3380a6e2a09b7e5976ddbacf385b8b4cde2cd (commit)
       via  4168bc184e3e15ee76485e49d3bc5852b90f27de (commit)
      from  f8c5b31f33becfba9f25ca29cc4caee6b343f93c (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=d8aec3f2d5478ffb7235b638d33d08e944093916
commit d8aec3f2d5478ffb7235b638d33d08e944093916
Merge: f8c5b31 07c3380
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 13 14:02:33 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 13 14:02:33 2017 -0500

    Merge topic 'execute_process-default-encoding' into next
    
    07c3380a execute_process: Restore no-decoding default behavior
    4168bc18 Help: Improve execute_process ENCODING option documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07c3380a6e2a09b7e5976ddbacf385b8b4cde2cd
commit 07c3380a6e2a09b7e5976ddbacf385b8b4cde2cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 13 13:49:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 13 13:53:17 2017 -0500

    execute_process: Restore no-decoding default behavior
    
    Since commit v3.8.0-rc1~232^2 (execute_process: Add ENCODING option for
    Windows child process output, 2016-11-23) we decode child process output
    using the console's active codepage by default.  This differs from
    previous versions of CMake and is therefore incompatible.  Changing this
    default will require a policy, so for now revert the default behavior
    back to performing no decoding.
    
    Reported-by: Nils Gladitz <nilsgladitz at gmail.com>

diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index 5a77735..d617243 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -75,10 +75,10 @@ Options:
  ``NONE``
    Perform no decoding.  This assumes that the process output is encoded
    in the same way as CMake's internal encoding (UTF-8).
+   This is the default.
  ``AUTO``
    Use the current active console's codepage or if that isn't
    available then use ANSI.
-   This is the default.
  ``ANSI``
    Use the ANSI codepage.
  ``OEM``
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index eb26a50..92cdf64 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -47,7 +47,7 @@ bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
   std::string error_variable;
   std::string result_variable;
   std::string working_directory;
-  cmProcessOutput::Encoding encoding = cmProcessOutput::Auto;
+  cmProcessOutput::Encoding encoding = cmProcessOutput::None;
   for (size_t i = 0; i < args.size(); ++i) {
     if (args[i] == "COMMAND") {
       doing_command = true;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4168bc184e3e15ee76485e49d3bc5852b90f27de
commit 4168bc184e3e15ee76485e49d3bc5852b90f27de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 13 13:43:01 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 13 13:53:17 2017 -0500

    Help: Improve execute_process ENCODING option documentation
    
    Spell out the options in a definition list and document each one.

diff --git a/Help/command/execute_process.rst b/Help/command/execute_process.rst
index 71233d9..5a77735 100644
--- a/Help/command/execute_process.rst
+++ b/Help/command/execute_process.rst
@@ -70,10 +70,21 @@ Options:
 ``ENCODING <name>``
  On Windows, the encoding that is used to decode output from the process.
  Ignored on other platforms.
- Valid encoding names are: ``AUTO`` (the default), ``NONE``, ``UTF8``,
- ``ANSI`` and ``OEM``.
- ``AUTO`` encoding means current active console's codepage will be used
- or if that isn't available then ``ANSI`` codepage will be used.
+ Valid encoding names are:
+
+ ``NONE``
+   Perform no decoding.  This assumes that the process output is encoded
+   in the same way as CMake's internal encoding (UTF-8).
+ ``AUTO``
+   Use the current active console's codepage or if that isn't
+   available then use ANSI.
+   This is the default.
+ ``ANSI``
+   Use the ANSI codepage.
+ ``OEM``
+   Use the original equipment manufacturer (OEM) code page.
+ ``UTF8``
+   Use the UTF-8 codepage.
 
 If more than one ``OUTPUT_*`` or ``ERROR_*`` option is given for the
 same pipe the precedence is not specified.

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

Summary of changes:
 Help/command/execute_process.rst   |   19 +++++++++++++++----
 Source/cmExecuteProcessCommand.cxx |    2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake