summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2019-03-19 17:37:48 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-03-19 17:37:59 (GMT)
commitf1e53266e9ce7e8a9568bde23f865136be958887 (patch)
treebb036d8514e430f4d6df415c73b7664dbcd5aab9 /Help
parentd2101e944a03056dc2180dd790ba85175e04d653 (diff)
parent8634576dcb03087fc507b8012a47f1ecc852f65f (diff)
downloadCMake-f1e53266e9ce7e8a9568bde23f865136be958887.zip
CMake-f1e53266e9ce7e8a9568bde23f865136be958887.tar.gz
CMake-f1e53266e9ce7e8a9568bde23f865136be958887.tar.bz2
Merge topic 'improve-tar-command'
8634576dcb cmake: Don't interrupt archive creation if unable to read a file. c7c6a4a2cc Help: Update 'tar' documentation with supported arguments 7c47fd8cd1 cmake: tar: Display warning when no files provided during archive creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3080
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake.1.rst15
-rw-r--r--Help/release/dev/cmake-e-tar-creating-archive.rst6
2 files changed, 21 insertions, 0 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index a3c7834..db035c2 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -483,6 +483,21 @@ Available commands are:
``tar [cxt][vf][zjJ] file.tar [<options>] [--] [<file>...]``
Create or extract a tar or zip archive. Options are:
+ ``c``
+ Create a new archive containing the specified files.
+ If used, the <file> argument is mandatory.
+ ``x``
+ Extract to disk from the archive.
+ ``t``
+ List archive contents to stdout.
+ ``v``
+ Produce verbose output.
+ ``z``
+ Compress the resulting archive with gzip.
+ ``j``
+ Compress the resulting archive with bzip2.
+ ``J``
+ Compress the resulting archive with XZ.
``--``
Stop interpreting options and treat all remaining arguments
as file names even if they start in ``-``.
diff --git a/Help/release/dev/cmake-e-tar-creating-archive.rst b/Help/release/dev/cmake-e-tar-creating-archive.rst
new file mode 100644
index 0000000..717855c
--- /dev/null
+++ b/Help/release/dev/cmake-e-tar-creating-archive.rst
@@ -0,0 +1,6 @@
+cmake-e-tar-creating-archive
+----------------------------
+
+* The :manual:`cmake(1)` ``-E tar`` tool now continues adding files to an
+ archive, even if some of the files aren't readable. This behavior is more
+ consistent with the classic ``tar`` tool.