Update 7-Zip to 24.09

WinMerge · Dec 6, 2024 · 49d3b39 · 49d3b39
1 parent b3fb846
commit 49d3b39
Show file tree

Hide file tree

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

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.7.0/ShellExtension-1.18.7.0.zip!Build ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-x86.zip!Build\x86\Release ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-x64.zip!Build\X64\Release ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-ARM.zip!Build\ARM64\Release ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z2408.0/Merge7z2408.0-ARM64.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-x86.zip!Build\x86\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-x64.zip!Build\X64\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-ARM.zip!Build\ARM64\Release ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z2409.0/Merge7z2409.0-ARM64.zip!Build\ARM64\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.15-x86.zip!Build\x86\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.15-x64.zip!Build\x64\Release ^
 https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.15-ARM.zip!Build\ARM\Release ^

diff --git a/Externals/sevenzip b/Externals/sevenzip
diff --git a/Externals/versions.txt b/Externals/versions.txt
@@ -15,7 +15,7 @@ This file lists versions of the external components we are using.
   - rapidjson: 1.1.1
 - Google C++ Testing Framework: 1.14.0
 - GNU patch: 2.7.6-1
-- 7-zip: 24.08
+- 7-zip: 24.09
 - LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
 - html-tidy5: 5.4.0
 - jq: 1.7.1