From 11924be86a5b02ab46559aacd73064235e49d7fd Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Mon, 29 Jul 2019 09:08:48 +0200 Subject: [PATCH] Update version numbers and Makefiles for zstd and flzma2 --- C/7zVersion.h | 4 ++-- CPP/7zip/Bundles/Alone/makefile | 2 ++ CPP/7zip/Bundles/Codec_flzma2/resource.rc | 2 +- CPP/7zip/Bundles/Codec_zstd/makefile | 2 ++ CPP/7zip/Bundles/Codec_zstd/resource.rc | 2 +- CPP/7zip/Bundles/Format7z/makefile | 2 ++ CPP/7zip/Bundles/Format7zExtract/makefile | 2 ++ CPP/7zip/Bundles/Format7zF/makefile | 2 ++ README.md | 12 ++++++------ 9 files changed, 20 insertions(+), 10 deletions(-) diff --git a/C/7zVersion.h b/C/7zVersion.h index 0fcb3c52..c1a38d54 100644 --- a/C/7zVersion.h +++ b/C/7zVersion.h @@ -1,7 +1,7 @@ #define MY_VER_MAJOR 19 #define MY_VER_MINOR 00 #define MY_VER_BUILD 0 -#define MY_VERSION_NUMBERS "19.00 ZS v1.4.0 R2" +#define MY_VERSION_NUMBERS "19.00 ZS v1.4.2 R1" #define MY_VERSION MY_VERSION_NUMBERS #ifdef MY_CPU_NAME @@ -10,7 +10,7 @@ #define MY_VERSION_CPU MY_VERSION #endif -#define MY_DATE "2019-05-04" +#define MY_DATE "2019-07-29" #undef MY_COPYRIGHT #undef MY_VERSION_COPYRIGHT_DATE #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt" diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile index ac1445e9..e63fbdcd 100644 --- a/CPP/7zip/Bundles/Alone/makefile +++ b/CPP/7zip/Bundles/Alone/makefile @@ -290,6 +290,8 @@ ZSTD_OBJS = \ $O\xxhash.obj \ $O\zstd_common.obj \ $O\zstd_compress.obj \ + $O\zstd_compress_literals.obj \ + $O\zstd_compress_sequences.obj \ $O\zstd_ddict.obj \ $O\zstd_decompress_block.obj \ $O\zstd_decompress.obj \ diff --git a/CPP/7zip/Bundles/Codec_flzma2/resource.rc b/CPP/7zip/Bundles/Codec_flzma2/resource.rc index a793fee9..4243d366 100644 --- a/CPP/7zip/Bundles/Codec_flzma2/resource.rc +++ b/CPP/7zip/Bundles/Codec_flzma2/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip Fast LZMA2 Plugin v1.0.0", "FLZMA2") +MY_VERSION_INFO_DLL("7-Zip Fast LZMA2 Plugin v1.0.1", "FLZMA2") 101 ICON "../../Archive/Icons/7z.ico" diff --git a/CPP/7zip/Bundles/Codec_zstd/makefile b/CPP/7zip/Bundles/Codec_zstd/makefile index 62c0f2fe..98bd7c24 100644 --- a/CPP/7zip/Bundles/Codec_zstd/makefile +++ b/CPP/7zip/Bundles/Codec_zstd/makefile @@ -35,6 +35,8 @@ ZSTD_OBJS = \ $O\xxhash.obj \ $O\zstd_common.obj \ $O\zstd_compress.obj \ + $O\zstd_compress_literals.obj \ + $O\zstd_compress_sequences.obj \ $O\zstd_ddict.obj \ $O\zstd_decompress_block.obj \ $O\zstd_decompress.obj \ diff --git a/CPP/7zip/Bundles/Codec_zstd/resource.rc b/CPP/7zip/Bundles/Codec_zstd/resource.rc index 28ccddc7..54537069 100644 --- a/CPP/7zip/Bundles/Codec_zstd/resource.rc +++ b/CPP/7zip/Bundles/Codec_zstd/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip ZS Plugin v1.4.0", "zstd") +MY_VERSION_INFO_DLL("7-Zip ZS Plugin v1.4.2", "zstd") 101 ICON "../../Archive/Icons/zst.ico" diff --git a/CPP/7zip/Bundles/Format7z/makefile b/CPP/7zip/Bundles/Format7z/makefile index 011faaa2..2c9810bd 100644 --- a/CPP/7zip/Bundles/Format7z/makefile +++ b/CPP/7zip/Bundles/Format7z/makefile @@ -213,6 +213,8 @@ ZSTD_OBJS = \ $O\xxhash.obj \ $O\zstd_common.obj \ $O\zstd_compress.obj \ + $O\zstd_compress_literals.obj \ + $O\zstd_compress_sequences.obj \ $O\zstd_ddict.obj \ $O\zstd_decompress_block.obj \ $O\zstd_decompress.obj \ diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile index 282bb43c..f44d7fdd 100644 --- a/CPP/7zip/Bundles/Format7zExtract/makefile +++ b/CPP/7zip/Bundles/Format7zExtract/makefile @@ -173,6 +173,8 @@ ZSTD_OBJS = \ $O\xxhash.obj \ $O\zstd_common.obj \ $O\zstd_compress.obj \ + $O\zstd_compress_literals.obj \ + $O\zstd_compress_sequences.obj \ $O\zstd_ddict.obj \ $O\zstd_decompress_block.obj \ $O\zstd_decompress.obj \ diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile index 60799a48..28336f77 100644 --- a/CPP/7zip/Bundles/Format7zF/makefile +++ b/CPP/7zip/Bundles/Format7zF/makefile @@ -88,6 +88,8 @@ ZSTD_OBJS = \ $O\xxhash.obj \ $O\zstd_common.obj \ $O\zstd_compress.obj \ + $O\zstd_compress_literals.obj \ + $O\zstd_compress_sequences.obj \ $O\zstd_ddict.obj \ $O\zstd_decompress_block.obj \ $O\zstd_decompress.obj \ diff --git a/README.md b/README.md index d8506b12..fef08b5c 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ You can install it in two ways: ## Codec overview -1. [Zstandard] v1.4.0 is a real-time compression algorithm, providing high compression ratios. It offers a very wide range of compression / speed trade-off, while being backed by a very fast decoder. +1. [Zstandard] v1.4.2 is a real-time compression algorithm, providing high compression ratios. It offers a very wide range of compression / speed trade-off, while being backed by a very fast decoder. - Levels: 1..22 2. [Brotli] v.1.0.7 is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling, with a compression ratio comparable to the best currently available general-purpose compression methods. It is similar in speed with deflate but offers more dense compression. @@ -33,7 +33,7 @@ You can install it in two ways: - Levels 30..39 (fastLZ4 + Huffman) adds Huffman coding to fastLZ4 - Levels 40..49 (LIZv1 + Huffman) give the best ratio, comparable to zlib and low levels of zstd/brotli, but with a faster decompression speed -6. [Fast LZMA2] v1.0.0 is a LZMA2 compression algorithm, 20% to 100% faster than normal LZMA2 at levels 5 and above, but with a slightly lower compression ratio. It uses a parallel buffered radix matchfinder and some optimizations from Zstandard. The codec uses much less additional memory per thread than standard LZMA2. +6. [Fast LZMA2] v1.0.1 is a LZMA2 compression algorithm, 20% to 100% faster than normal LZMA2 at levels 5 and above, but with a slightly lower compression ratio. It uses a parallel buffered radix matchfinder and some optimizations from Zstandard. The codec uses much less additional memory per thread than standard LZMA2. - Levels: 1..9 ## 7-Zip Zstandard Edition (full setup, with GUI and Explorer integration) @@ -46,7 +46,7 @@ You can install it in two ways: The output should look like this: ``` -7-Zip 19.00 ZS v1.4.0 R3 (x64) : Copyright (c) 1999-2019 Igor Pavlov, 2016-2019 Tino Reichardt : 2019-03-05 +7-Zip 19.00 ZS v1.4.2 R3 (x64) : Copyright (c) 1999-2019 Igor Pavlov, 2016-2019 Tino Reichardt : 2019-03-05 Libs: 0 c:\Program Files\7-Zip-Zstandard\7z.dll @@ -276,13 +276,13 @@ You find this project useful, maybe you consider a donation ;-) - 7-Zip ZS Version 19.00 - [Brotli] Version 1.0.7 - - [Fast LZMA2] Version 1.0.0 + - [Fast LZMA2] Version 1.0.1 - [Lizard] Version 1.0 - [LZ4] Version 1.9.1 - [LZ5] Version 1.5 - - [Zstandard] Version 1.4.0 + - [Zstandard] Version 1.4.2 -/TR 2019-05-04 +/TR 2019-07-29 ## Notes