[Cmake-commits] CMake branch, master, updated. v3.2.1-714-g10859b9
Brad King
brad.king at kitware.com
Fri Apr 10 08:33:01 EDT 2015
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 10859b97ebbe610a829e3981958d7b4c0149f95a (commit)
via 6c4781baa9ea4cfb7b4de9ef91e58888286fab44 (commit)
via fd04d87323749c15969982d9aa9b72059f33463b (commit)
via d2cc580704fa4e608eae104ce5be211a229b2d64 (commit)
from 1264c5b2c485416128466510c42ab40a03eb0ca3 (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=10859b97ebbe610a829e3981958d7b4c0149f95a
commit 10859b97ebbe610a829e3981958d7b4c0149f95a
Merge: 1264c5b 6c4781b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 10 08:33:00 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 10 08:33:00 2015 -0400
Merge topic 'tar-write-format'
6c4781ba Tests: Consolidate, refactor and extend -E tar tests
fd04d873 CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar format
d2cc5807 cmake: Teach "-E tar" command a "--format=" option
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake.1.rst | 4 +
Help/release/dev/tar-write-format.rst | 6 ++
Modules/CTestCoverageCollectGCOV.cmake | 1 +
Source/CPack/cmCPack7zGenerator.cxx | 2 +-
Source/CPack/cmCPackArchiveGenerator.cxx | 6 +-
Source/CPack/cmCPackArchiveGenerator.h | 4 +-
Source/CPack/cmCPackTGZGenerator.cxx | 2 +-
Source/CPack/cmCPackTXZGenerator.cxx | 2 +-
Source/CPack/cmCPackTarBZip2Generator.cxx | 2 +-
Source/CPack/cmCPackTarCompressGenerator.cxx | 2 +-
Source/CPack/cmCPackZIPGenerator.cxx | 2 +-
Source/cmArchiveWrite.cxx | 44 ++++-------
Source/cmArchiveWrite.h | 12 +--
Source/cmSystemTools.cxx | 7 +-
Source/cmSystemTools.h | 3 +-
Source/cmcmd.cxx | 33 +++++++-
Tests/CMakeLists.txt | 1 -
Tests/RunCMake/CMakeLists.txt | 1 +
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 11 ---
.../7zip-gz-result.txt} | 0
Tests/RunCMake/CommandLineTar/7zip-gz-stderr.txt | 1 +
Tests/RunCMake/CommandLineTar/7zip.cmake | 10 +++
.../{CMP0054 => CommandLineTar}/CMakeLists.txt | 0
Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake | 28 +++++++
.../bad-format-result.txt} | 0
.../RunCMake/CommandLineTar/bad-format-stderr.txt | 3 +-
.../bad-from1-result.txt} | 0
.../bad-from1-stderr.txt} | 0
.../bad-from2-result.txt} | 0
.../bad-from2-stderr.txt} | 0
.../bad-from3-result.txt} | 0
.../bad-from3-stderr.txt} | 2 +-
.../bad-from3.txt} | 0
.../bad-from4-result.txt} | 0
.../bad-from4-stderr.txt} | 0
.../bad-from4.txt} | 0
.../bad-from5-result.txt} | 0
.../bad-from5-stderr.txt} | 0
.../bad-from5.txt} | 0
.../bad-mtime1-result.txt} | 0
.../bad-mtime1-stderr.txt} | 0
.../bad-opt1-result.txt} | 0
.../bad-opt1-stderr.txt} | 0
.../end-opt1-result.txt} | 0
.../end-opt1-stderr.txt} | 0
Tests/RunCMake/CommandLineTar/gnutar-gz.cmake | 10 +++
Tests/RunCMake/CommandLineTar/gnutar.cmake | 10 +++
Tests/RunCMake/CommandLineTar/pax-xz.cmake | 10 +++
Tests/RunCMake/CommandLineTar/pax.cmake | 10 +++
Tests/RunCMake/CommandLineTar/paxr-bz2.cmake | 10 +++
Tests/RunCMake/CommandLineTar/paxr.cmake | 10 +++
Tests/RunCMake/CommandLineTar/roundtrip.cmake | 81 ++++++++++++++++++++
.../zip-bz2-result.txt} | 0
Tests/RunCMake/CommandLineTar/zip-bz2-stderr.txt | 1 +
Tests/RunCMake/CommandLineTar/zip.cmake | 10 +++
Tests/TarTest/CMakeLists.txt | 69 -----------------
Tests/TarTest/TestTarExec.cxx | 5 --
57 files changed, 270 insertions(+), 145 deletions(-)
create mode 100644 Help/release/dev/tar-write-format.rst
rename Tests/RunCMake/{CommandLine/E_tar-bad-from1-result.txt => CommandLineTar/7zip-gz-result.txt} (100%)
create mode 100644 Tests/RunCMake/CommandLineTar/7zip-gz-stderr.txt
create mode 100644 Tests/RunCMake/CommandLineTar/7zip.cmake
copy Tests/RunCMake/{CMP0054 => CommandLineTar}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/CommandLineTar/RunCMakeTest.cmake
rename Tests/RunCMake/{CommandLine/E_tar-bad-from2-result.txt => CommandLineTar/bad-format-result.txt} (100%)
copy Modules/Platform/Linux-PGI-Fortran.cmake => Tests/RunCMake/CommandLineTar/bad-format-stderr.txt (50%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from3-result.txt => CommandLineTar/bad-from1-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from1-stderr.txt => CommandLineTar/bad-from1-stderr.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from4-result.txt => CommandLineTar/bad-from2-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from2-stderr.txt => CommandLineTar/bad-from2-stderr.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from5-result.txt => CommandLineTar/bad-from3-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from3-stderr.txt => CommandLineTar/bad-from3-stderr.txt} (67%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from3.txt => CommandLineTar/bad-from3.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-mtime1-result.txt => CommandLineTar/bad-from4-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from4-stderr.txt => CommandLineTar/bad-from4-stderr.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from4.txt => CommandLineTar/bad-from4.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-opt1-result.txt => CommandLineTar/bad-from5-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from5-stderr.txt => CommandLineTar/bad-from5-stderr.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-from5.txt => CommandLineTar/bad-from5.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-end-opt1-result.txt => CommandLineTar/bad-mtime1-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-mtime1-stderr.txt => CommandLineTar/bad-mtime1-stderr.txt} (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLineTar/bad-opt1-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-bad-opt1-stderr.txt => CommandLineTar/bad-opt1-stderr.txt} (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLineTar/end-opt1-result.txt} (100%)
rename Tests/RunCMake/{CommandLine/E_tar-end-opt1-stderr.txt => CommandLineTar/end-opt1-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/CommandLineTar/gnutar-gz.cmake
create mode 100644 Tests/RunCMake/CommandLineTar/gnutar.cmake
create mode 100644 Tests/RunCMake/CommandLineTar/pax-xz.cmake
create mode 100644 Tests/RunCMake/CommandLineTar/pax.cmake
create mode 100644 Tests/RunCMake/CommandLineTar/paxr-bz2.cmake
create mode 100644 Tests/RunCMake/CommandLineTar/paxr.cmake
create mode 100644 Tests/RunCMake/CommandLineTar/roundtrip.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLineTar/zip-bz2-result.txt} (100%)
create mode 100644 Tests/RunCMake/CommandLineTar/zip-bz2-stderr.txt
create mode 100644 Tests/RunCMake/CommandLineTar/zip.cmake
delete mode 100644 Tests/TarTest/CMakeLists.txt
delete mode 100644 Tests/TarTest/TestTarExec.cxx
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list