Merge topic 'cli-tar-compress-algo'

94ae247d44 cli tar: support different algorithms for zip & 7z
1ba3444fd8 libarchive: Limit 7zip and zstd compression level to 6 on AIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11488

Help/command/file.rst

@@ -934,6 +934,12 @@ Archiving
     ``7zip``, ``gnutar``, ``pax``, ``paxr``, ``raw`` and ``zip``.
     If ``FORMAT`` is not given, the default format is ``paxr``.
 
+    The default compression method depends on the format:
+
+    * ``7zip`` uses ``LZMA`` compression
+    * ``zip`` uses ``Deflate`` compression
+    * others uses no compression by default
+
   ``COMPRESSION <compression>``
     Some archive formats allow the type of compression to be specified.
     The ``7zip`` and ``zip`` archive formats already imply a specific type of
@@ -943,6 +949,12 @@ Archiving
 
     * ``None``
     * ``BZip2``
+    * ``Deflate``
+
+      .. versionadded:: 4.3
+
+      This is an alias for ``GZip``.
+
     * ``GZip``
     * ``LZMA``
 

Help/cpack_gen/archive.rst

@@ -4,29 +4,29 @@ CPack Archive Generator
 CPack generator for packaging files into an archive, which can have
 any of the following formats:
 
-- 7Z - 7zip - (``.7z``)
+- 7Z - 7zip - (``.7z``) - LZMA compressed
 
   .. versionadded:: 3.1
 
-- TAR (``.tar``)
+- TAR (``.tar``) - no compression is used
 
   .. versionadded:: 4.0
 
-- TBZ2 (``.tar.bz2``)
+- TBZ2 (``.tar.bz2``) - BZip2 compressed
 
-- TGZ (``.tar.gz``)
+- TGZ (``.tar.gz``) - Deflate compressed
 
-- TXZ (``.tar.xz``)
+- TXZ (``.tar.xz``) - LZMA2 compressed
 
   .. versionadded:: 3.1
 
-- TZ (``.tar.Z``)
+- TZ (``.tar.Z``) - LZW compressed
 
-- TZST (``.tar.zst``)
+- TZST (``.tar.zst``) - Zstandard compressed
 
   .. versionadded:: 3.16
 
-- ZIP (``.zip``)
+- ZIP (``.zip``) - Deflate compressed
 
 When this generator is called from ``CPackSourceConfig.cmake`` (or through
 the ``package_source`` target), then the generated archive will contain all

Help/cpack_gen/deb.rst

@@ -299,7 +299,7 @@ List of CPack DEB generator specific variables:
     bzip2 Burrows–Wheeler algorithm
 
   ``gzip``
-    GNU Gzip compression
+    GNU Gzip Deflate compression
 
   ``zstd``
     .. versionadded:: 3.22

Help/cpack_gen/rpm.rst

@@ -261,7 +261,7 @@ List of CPack RPM generator specific variables:
     bzip2 Burrows–Wheeler algorithm
 
   ``gzip``
-    GNU Gzip compression
+    GNU Gzip Deflate compression
 
   ``zstd``
     .. versionadded:: 3.31

Help/manual/cmake.1.rst

@@ -1450,7 +1450,7 @@ Available commands are:
 
   .. option:: z
 
-    Compress the resulting archive with gzip.
+    Compress the resulting archive with gzip (Deflate).
 
   .. option:: j
 
@@ -1491,6 +1491,18 @@ Available commands are:
     Supported formats are: ``7zip``, ``gnutar``, ``pax``,
     ``paxr`` (restricted pax, default), and ``zip``.
 
+    If the compression method is not specified, the compression method
+    depends on the format:
+
+    * ``7zip`` uses ``LZMA`` compression
+    * ``zip`` uses ``Deflate`` compression
+    * others uses no compression by default
+
+    .. versionadded:: 4.3
+
+      The ``7zip`` and ``zip`` formats support changing the default compression
+      method and compression level.
+
   .. option:: --mtime=<date>
 
     .. versionadded:: 3.1
@@ -1506,7 +1518,7 @@ Available commands are:
     the ``--cmake-tar-compression-level`` option is given.
 
     The ``<compression-level>`` of the ``Zstd`` algorithm can be set
-    between ``0`` and ``19``.
+    between ``0`` and ``19``, except for the ``zip`` format.
 
   .. option:: --cmake-tar-threads=<number>
 

Help/release/dev/cli-tar-7z-algorithms.rst

@@ -0,0 +1,10 @@
+cli-tar-7z-algorithms
+---------------------
+
+* The :manual:`cmake(1)` ``-E tar`` tool supports support compression methods
+  specification for ``7zip`` and ``zip`` formats.
+* The :manual:`cmake(1)` ``-E tar`` tool supports support compression levels
+  specification for ``7zip`` and ``zip`` formats.
+* The :command:`file(ARCHIVE_CREATE)` command's ``COMPRESSION`` option,
+  supports ``Deflate`` compression. The ``Deflate`` compression is
+  an alias for ``GZip``.