From c48c91baa4f3041e894bf0f5bccde658cc3c124a Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Thu, 6 Jan 2022 22:11:21 +0900 Subject: [PATCH] Update 7-Zip to 21.07 --- ArchiveSupport/Merge7z/BuildArc.cmd | 2 +- ArchiveSupport/Merge7z/BuildBin.vs2017.cmd | 2 -- ArchiveSupport/Merge7z/BuildBin.vs2019.cmd | 2 -- ArchiveSupport/Merge7z/BuildBin.vs2022.cmd | 2 -- DownloadDeps.cmd | 8 ++++---- Externals/sevenzip | 2 +- Externals/versions.txt | 2 +- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ArchiveSupport/Merge7z/BuildArc.cmd b/ArchiveSupport/Merge7z/BuildArc.cmd index 0afd738dc8e..20cdbdc0dbe 100644 --- 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 index 13e1daf9fbc..b40a36664b1 100644 --- 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 index 41c5e61b276..44d7bb87873 100644 --- 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 index 8017dfe8628..aa5d15f9ee4 100644 --- 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 index 75fac47be71..14c5a0cdcc8 100644 --- 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 index b361efa151e..69f3d03c977 160000 --- a/Externals/sevenzip +++ b/Externals/sevenzip @@ -1 +1 @@ -Subproject commit b361efa151e94e117741298bbf12b5e98ef49005 +Subproject commit 69f3d03c97753429c3989cc26243578ec32b18b0 diff --git a/Externals/versions.txt b/Externals/versions.txt index e760bf851a7..0b7a887c7f7 100644 --- 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