Update 7-Zip to 21.07

sdottaka · sdottaka · commit c48c91baa4f3 · 2022-01-06T22:11:21.000+09:00
diff --git a/ArchiveSupport/Merge7z/BuildArc.cmd b/ArchiveSupport/Merge7z/BuildArc.cmd
@@ -1,7 +1,7 @@
 pushd "%~dp0"
 
 setlocal
-set MERGE7z_VERSION=2106.1
+set MERGE7z_VERSION=2107.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
@@ -27,6 +27,4 @@ if exist "%SIGNBAT_PATH%" (
   call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
 )
 
-mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
-copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2019.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2019.cmd
@@ -27,6 +27,4 @@ if exist "%SIGNBAT_PATH%" (
   call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
 )
 
-mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
-copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2022.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2022.cmd
@@ -27,6 +27,4 @@ if exist "%SIGNBAT_PATH%" (
   call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
 )
 
-mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
-copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
 goto :eof
diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
@@ -12,10 +12,10 @@ 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.4.0/ShellExtension-1.18.4.0.zip!Build ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.1/Merge7z2106.1-x86.zip!Build\x86\Release ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.1/Merge7z2106.1-x64.zip!Build\X64\Release ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.1/Merge7z2106.1-ARM.zip!Build\ARM64\Release ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.1/Merge7z2106.1-ARM64.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2107.1/Merge7z2107.0-x86.zip!Build\x86\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2107.1/Merge7z2107.0-x64.zip!Build\X64\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2107.1/Merge7z2107.0-ARM.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2107.1/Merge7z2107.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.8-x86.zip!Build\x86\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.8-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.8-ARM.zip!Build\ARM\Release ^
diff --git a/Externals/sevenzip b/Externals/sevenzip
@@ -1 +1 @@
-Subproject commit b361efa151e94e117741298bbf12b5e98ef49005
+Subproject commit 69f3d03c97753429c3989cc26243578ec32b18b0
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: 21.06
+7-zip: 21.07
 LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 html-tidy5: 5.4.0
 jq: 1.4

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,4 @@ if exist "%SIGNBAT_PATH%" (`
`27`	`27`	`call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll`
`28`	`28`	`)`
`29`	`29`
`30`		`-mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL`
`31`		`-copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"`
`32`	`30`	`goto :eof`