Update 7-zip to 21.06

WinMerge · Nov 30, 2021 · 1ff89d3 · 1ff89d3
1 parent b30ac15
commit 1ff89d3
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 17 deletions.
diff --git a/ArchiveSupport/Merge7z/BuildArc.cmd b/ArchiveSupport/Merge7z/BuildArc.cmd
@@ -1,7 +1,7 @@
 pushd "%~dp0"
 
 setlocal
-set MERGE7z_VERSION=1900.5
+set MERGE7z_VERSION=2106.0
 set PATH="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%PATH%
 set DISTDIR=..\..\Build\Releases
 

diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2017.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2017.cmd
@@ -29,9 +29,9 @@ MSBuild Merge7z.vs2017.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%P
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
+  call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
 )
 
-mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
+copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2019.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2019.cmd
@@ -29,9 +29,9 @@ MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%P
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
+  call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
 )
 
-mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
+copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2022.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2022.cmd
@@ -25,13 +25,13 @@ if "%1" == "" (
 ) else (
   set PLATFORM_VS=%1
 )
-MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
+MSBuild Merge7z.vs2022.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
+  call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
 )
 
-mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
+copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vcxproj
@@ -31,7 +31,7 @@
     <SccProjectName />
     <SccLocalPath />
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' >= '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' &gt;= '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -420,7 +420,11 @@
     <None Include="revision.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.h" />
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.h" />
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h" />
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.h" />
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.h" />
     <ClInclude Include="Merge7z.h" />
     <ClInclude Include="Merge7zCommon.h" />
     <ClInclude Include="StdAfx.h" />
@@ -484,7 +488,11 @@
     <ClInclude Include="..\..\Externals\sevenzip\C\Threads.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.cpp" />
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp" />
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.cpp" />
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.cpp" />
     <ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters b/ArchiveSupport/Merge7z/Merge7z.vcxproj.filters
@@ -225,6 +225,18 @@
     <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h">
       <Filter>7zip Common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.h">
+      <Filter>Windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.h">
+      <Filter>Windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.h">
+      <Filter>7zip Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Merge7z907.cpp">
@@ -422,6 +434,18 @@
     <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp">
       <Filter>7zip Common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.cpp">
+      <Filter>Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.cpp">
+      <Filter>Windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.cpp">
+      <Filter>7zip Common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\resource.rc">

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
@@ -12,9 +12,9 @@ set downloadsdir=%~dp0\build\WinMergeDownloadDeps
 set urls_destdirs=^
 https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^
 https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.18.2.0/ShellExtension-1.18.2.0.zip!Build ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-win32.zip!Build ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-x64.zip!Build\X64 ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-ARM64.zip!Build\ARM64 ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.0/Merge7z2106.0-win32.zip!Build ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.0/Merge7z2106.0-x64.zip!Build\X64 ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.0/Merge7z2106.0-ARM64.zip!Build\ARM64 ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-win32.zip!Build ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-x64.zip!Build\X64 ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-ARM64.zip!Build\ARM64 ^

diff --git a/Externals/sevenzip b/Externals/sevenzip
diff --git a/Externals/versions.txt b/Externals/versions.txt
@@ -10,7 +10,7 @@ freeimage: 3.18.0
 WinIMerge: 1.0.31.0
 Google C++ Testing Framework: 1.11.0
 GnuWin32 Patch for Windows: 2.5.9-7
-7-zip: 19.00
+7-zip: 21.06
 LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 html-tidy5: 5.4.0
 jq: 1.4