7z.Libs 21.6.0. Public release.

+fallback unpacking
3F · Dec 14, 2021 · e645e92 · e645e92
1 parent c3fd452
commit e645e92
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 15 deletions.
diff --git 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
@@ -1 +1 @@
-21.2.0
+21.6.0
diff --git 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
@@ -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
@@ -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 <x-3F@outlook.com> 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
@@ -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
@@ -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
@@ -3,7 +3,7 @@
   <metadata>
     <id>7z.Libs</id>
     <version>$-version-$</version>
-    <copyright>7-Zip Copyright (C) 1999-2019 Igor Pavlov | Copyright (c) 2015-2020  Denis Kuzmin &lt; x-3F@outlook.com &gt; GitHub/3F </copyright>
+    <copyright>7-Zip Copyright (C) 1999-2021 Igor Pavlov | Copyright (c) 2015-2020  Denis Kuzmin &lt;x-3F@outlook.com&gt; github/3F</copyright>
     <authors>github.com/3F/7z.Libs</authors>
     <owners>reg</owners>
     <license type="file">bin\License.txt</license>