Skip to content

Commit

Permalink
Update 7-Zip to 21.07
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdottaka
sdottaka committed Jan 6, 2022
1 parent 408ab0f commit c48c91b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion ArchiveSupport/Merge7z/BuildArc.cmd
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions ArchiveSupport/Merge7z/BuildBin.vs2017.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions ArchiveSupport/Merge7z/BuildBin.vs2019.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions ArchiveSupport/Merge7z/BuildBin.vs2022.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions DownloadDeps.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ^
Expand Down
2 changes: 1 addition & 1 deletion Externals/sevenzip
Submodule sevenzip updated 89 files
+12 −1 Asm/x86/7zAsm.asm
+9 −1 Asm/x86/AesOpt.asm
+2 −1 C/7zTypes.h
+3 −3 C/7zVersion.h
+6 −4 C/DllSecur.c
+11 −4 C/LzFind.c
+3 −3 C/LzFindMt.c
+3 −3 C/MtCoder.c
+4 −4 C/MtDec.c
+5 −5 C/Threads.c
+32 −3 C/Threads.h
+26 −6 CPP/7zip/7zip_gcc.mak
+2 −0 CPP/7zip/Archive/7z/7zHandlerOut.cpp
+1 −1 CPP/7zip/Archive/Cab/CabHandler.cpp
+12 −9 CPP/7zip/Archive/Common/HandlerOut.cpp
+1 −0 CPP/7zip/Archive/DmgHandler.cpp
+5 −2 CPP/7zip/Archive/ExtHandler.cpp
+1 −0 CPP/7zip/Archive/GptHandler.cpp
+24 −4 CPP/7zip/Archive/HandlerCont.cpp
+4 −0 CPP/7zip/Archive/HandlerCont.h
+2 −2 CPP/7zip/Archive/QcowHandler.cpp
+3 −3 CPP/7zip/Archive/Rar/RarVol.h
+28 −6 CPP/7zip/Archive/SwfHandler.cpp
+1 −2 CPP/7zip/Archive/Tar/TarHandler.cpp
+2 −2 CPP/7zip/Archive/Tar/TarHandlerOut.cpp
+4 −1 CPP/7zip/Archive/Tar/TarHeader.cpp
+2 −1 CPP/7zip/Archive/Tar/TarHeader.h
+1 −4 CPP/7zip/Archive/Tar/TarIn.cpp
+10 −1 CPP/7zip/Archive/Tar/TarItem.h
+92 −58 CPP/7zip/Archive/Tar/TarOut.cpp
+1 −5 CPP/7zip/Archive/Tar/TarUpdate.cpp
+2 −2 CPP/7zip/Archive/VdiHandler.cpp
+29 −5 CPP/7zip/Archive/VhdHandler.cpp
+2,062 −0 CPP/7zip/Archive/VhdxHandler.cpp
+4 −3 CPP/7zip/Archive/VmdkHandler.cpp
+0 −4 CPP/7zip/Bundles/Alone7z/Alone.dsp
+1 −1 CPP/7zip/Bundles/Fm/resource.rc
+1 −0 CPP/7zip/Bundles/Format7zF/Arc.mak
+28 −10 CPP/7zip/Bundles/Format7zF/Arc_gcc.mak
+4 −0 CPP/7zip/Bundles/Format7zF/Format7z.dsp
+1 −1 CPP/7zip/Bundles/Format7zF/resource.rc
+5 −2 CPP/7zip/Bundles/SFXCon/SfxCon.cpp
+1 −1 CPP/7zip/Bundles/SFXWin/SfxWin.cpp
+20 −26 CPP/7zip/Common/FileStreams.cpp
+39 −11 CPP/7zip/Compress/CopyCoder.cpp
+1 −0 CPP/7zip/Guid.txt
+4 −4 CPP/7zip/UI/Agent/Agent.cpp
+190 −57 CPP/7zip/UI/Common/ArchiveCommandLine.cpp
+2 −2 CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
+14 −6 CPP/7zip/UI/Common/ArchiveOpenCallback.cpp
+1 −1 CPP/7zip/UI/Common/Bench.cpp
+7 −3 CPP/7zip/UI/Common/CompressCall.cpp
+3 −3 CPP/7zip/UI/Common/CompressCall2.cpp
+21 −1 CPP/7zip/UI/Common/EnumDirItems.cpp
+1 −1 CPP/7zip/UI/Common/HashCalc.cpp
+22 −2 CPP/7zip/UI/Common/Update.cpp
+2 −2 CPP/7zip/UI/Console/HashCon.cpp
+2 −2 CPP/7zip/UI/Console/List.cpp
+1 −1 CPP/7zip/UI/Explorer/ContextMenu.cpp
+42 −0 CPP/7zip/UI/Explorer/MyExplorerCommand.h
+1 −1 CPP/7zip/UI/Far/FarUtils.cpp
+2 −2 CPP/7zip/UI/FileManager/FSDrives.cpp
+1 −1 CPP/7zip/UI/FileManager/FSFolder.cpp
+4 −1 CPP/7zip/UI/FileManager/FSFolderCopy.cpp
+2 −2 CPP/7zip/UI/FileManager/MyLoadMenu.cpp
+1 −1 CPP/7zip/UI/FileManager/OpenCallback.cpp
+2 −2 CPP/7zip/UI/FileManager/PanelCrc.cpp
+1 −1 CPP/7zip/UI/FileManager/PanelOperations.cpp
+1 −1 CPP/7zip/UI/FileManager/ProgressDialog2a.rc
+2 −2 CPP/7zip/UI/FileManager/VerCtrl.cpp
+2 −2 CPP/7zip/UI/GUI/BenchmarkDialog.cpp
+1 −1 CPP/7zip/UI/GUI/CompressDialog.cpp
+6 −2 CPP/7zip/UI/GUI/UpdateGUI.cpp
+13 −2 CPP/Common/MyString.cpp
+83 −6 CPP/Common/MyString.h
+120 −38 CPP/Common/Wildcard.cpp
+49 −13 CPP/Common/Wildcard.h
+191 −37 CPP/Windows/Control/Dialog.cpp
+1 −1 CPP/Windows/Control/Dialog.h
+93 −15 CPP/Windows/FileIO.cpp
+6 −0 CPP/Windows/FileIO.h
+16 −4 CPP/Windows/PropVariant.cpp
+16 −3 CPP/Windows/PropVariant.h
+3 −3 CPP/Windows/Thread.h
+1 −0 DOC/7zip.hhp
+1 −1 DOC/7zip.wxs
+23 −1 DOC/readme.txt
+8 −0 DOC/src-history.txt
+23 −1 README.md
2 changes: 1 addition & 1 deletion Externals/versions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c48c91b

Please sign in to comment.