From e645e92a6bfd441fa5b4342d38fb393a96614fc4 Mon Sep 17 00:00:00 2001 From: "Denis Kuzmin (github/3F)" Date: Tue, 14 Dec 2021 18:35:06 +0300 Subject: [PATCH] 7z.Libs 21.6.0. Public release. +fallback unpacking --- .artefacts | 6 +++--- .version | 2 +- .vssbe | 19 +++++++++++++++---- 3rd-party-NOTICES.txt | 6 +++--- License.txt | 4 ++-- build.bat | 2 +- changelog.txt | 4 ++++ tools/7z.Libs.nuspec | 2 +- 8 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.artefacts b/.artefacts index 5da40a0..a32d064 100644 --- a/.artefacts +++ b/.artefacts @@ -1,3 +1,3 @@ -x64:https://sourceforge.net/projects/sevenzip/files/7-Zip/21.02/7z2102-x64.exe/download -x86:https://sourceforge.net/projects/sevenzip/files/7-Zip/21.02/7z2102.exe/download -extra:https://sourceforge.net/projects/sevenzip/files/7-Zip/21.02/7z2102-extra.7z/download +x64:https://sourceforge.net/projects/sevenzip/files/7-Zip/21.06/7z2106-x64.exe/download +x86:https://sourceforge.net/projects/sevenzip/files/7-Zip/21.06/7z2106.exe/download +extra:https://sourceforge.net/projects/sevenzip/files/7-Zip/21.06/7z2106-extra.7z/download diff --git a/.version b/.version index ab3add4..679df1a 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -21.2.0 \ No newline at end of file +21.6.0 \ No newline at end of file diff --git a/.vssbe b/.vssbe index 97c4dfe..32bccf8 100644 --- a/.vssbe +++ b/.vssbe @@ -72,23 +72,34 @@ " {", " #[( $(pkg) != \"\" ) ", " {", - " #[var url = #[$(pkg.Split(':', 2)[1])]]", - " #[var fout = $(dtmpApp)#[$(pkg.Split(':', 2)[0])]]", + " #[var fz = #[$(pkg.Split(':', 2)[0])]]", " #[IO copy.directory(\"\", \"$(dtmpApp)\", true)]", " ", + " #[$(fout = \"$(dtmpApp)$(fz)\")]", " #[( #[IO exists.file(\"$(fout)\")] ) ", " { ", " #[IO writeLine(STDOUT): Rcv is ignored due to available #[$(fout)]]", " }", " else", " {", + " #[var url = #[$(pkg.Split(':', 2)[1])]]", " #[IO writeLine(STDOUT): Rcv #[$(url)] to #[$(fout)] ... ]", " ", " #[File remote.download(\"$(url)\", \"$(fout)\")]", " }]", " ", - " #[(! #[IO exists.directory(\"$(fout).d\")] ) {", - " #[7z unpack(\"$(fout)\", \"$(fout).d\")]", + " #[(! #[IO exists.directory(\"$(fout).d\")] )", + " {", + " #[try ", + " {", + " #[7z unpack(\"$(fout)\", \"$(fout).d\")]", + " }", + " catch", + " {", + " #[IO copy.file(\"$(fout)\", \"$(fout).tar.xz\", true)]", + " #[7z unpack(\"$(fout).tar.xz\", \"$(fout).d\", true)]", + " #[7z unpack(\"$(fout).d\\$(fz).tar\", \"$(fout).d\", true)]", + " }]", " }]", " ", " }]", diff --git a/3rd-party-NOTICES.txt b/3rd-party-NOTICES.txt index 96fb65d..8992d56 100644 --- a/3rd-party-NOTICES.txt +++ b/3rd-party-NOTICES.txt @@ -3,7 +3,7 @@ # Third-party software components -## 7z.Libs and its various packages may include or reference: +## 7z.Libs and its various packages may include or reference * 7-Zip http://www.7-zip.org/ @@ -15,7 +15,7 @@ https://github.com/3F/GetNuTool -## Dev Dependencies includes the following tools: +## Dev Dependencies includes the following tools * vsSolutionBuildEvent https://github.com/3F/vsSolutionBuildEvent @@ -36,7 +36,7 @@ License for use and distribution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 7-Zip Copyright (C) 1999-2019 Igor Pavlov. + 7-Zip Copyright (C) 1999-2021 Igor Pavlov. The licenses for files are: diff --git a/License.txt b/License.txt index 409b35d..820b818 100644 --- a/License.txt +++ b/License.txt @@ -1,7 +1,7 @@ The MIT License (MIT) -Copyright (c) 2015-2020 Denis Kuzmin < x-3F@outlook.com > GitHub/3F -Copyright (c) 7z.Libs contributors: https://github.com/3F/7z.Libs/graphs/contributors +Copyright (c) 2015-2021 Denis Kuzmin github/3F +Copyright (c) 7z.Libs contributors https://github.com/3F/7z.Libs/graphs/contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/build.bat b/build.bat index 54d9ee2..b3e30f5 100644 --- a/build.bat +++ b/build.bat @@ -5,7 +5,7 @@ set cim=packages\vsSolutionBuildEvent\cim.cmd set reltype=%1 if not defined reltype set reltype=Release -call tools\gnt /p:wpath="%cd%" /p:ngconfig="packages.config" /nologo /v:m /m:7 || goto err +call tools\gnt /p:ngconfig="packages.config" /nologo /v:m /m:7 || goto err call %cim% /v:m /m:7 /p:Configuration="%reltype%" || goto err exit /B 0 diff --git a/changelog.txt b/changelog.txt index a313aba..1a69d7a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,10 @@ 7z.Libs - https://github.com/3F/7z.Libs - - - - - - - - - - - - - - - - - - - - +[21.6.0] 2021.12.14 + + * CHANGED: [x86 + x64 windows] Original libraries v21.06 + [21.2.0] 2021.08.23 * CHANGED: Updated original libraries v21.02 diff --git a/tools/7z.Libs.nuspec b/tools/7z.Libs.nuspec index 39196f3..9a22331 100644 --- a/tools/7z.Libs.nuspec +++ b/tools/7z.Libs.nuspec @@ -3,7 +3,7 @@ 7z.Libs $-version-$ - 7-Zip Copyright (C) 1999-2019 Igor Pavlov | Copyright (c) 2015-2020 Denis Kuzmin < x-3F@outlook.com > GitHub/3F + 7-Zip Copyright (C) 1999-2021 Igor Pavlov | Copyright (c) 2015-2020 Denis Kuzmin <x-3F@outlook.com> github/3F github.com/3F/7z.Libs reg bin\License.txt