Skip to content

Commit 1ff89d3

Browse files
sdottakasdottaka
committed
Update 7-zip to 21.06
1 parent b30ac15 commit 1ff89d3

9 files changed

+49
-17
lines changed

‎ArchiveSupport/Merge7z/BuildArc.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pushd "%~dp0"
22

33
setlocal
4-
set MERGE7z_VERSION=1900.5
4+
set MERGE7z_VERSION=2106.0
55
set PATH="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%PATH%
66
set DISTDIR=..\..\Build\Releases
77

‎ArchiveSupport/Merge7z/BuildBin.vs2017.cmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ MSBuild Merge7z.vs2017.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%P
2929
endlocal
3030

3131
if exist "%SIGNBAT_PATH%" (
32-
call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
32+
call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
3333
)
3434

35-
mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
36-
copy Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
35+
mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
36+
copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
3737
goto :eof

‎ArchiveSupport/Merge7z/BuildBin.vs2019.cmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%P
2929
endlocal
3030

3131
if exist "%SIGNBAT_PATH%" (
32-
call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
32+
call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
3333
)
3434

35-
mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
36-
copy Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
35+
mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
36+
copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
3737
goto :eof

‎ArchiveSupport/Merge7z/BuildBin.vs2022.cmd

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ if "%1" == "" (
2525
) else (
2626
set PLATFORM_VS=%1
2727
)
28-
MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
28+
MSBuild Merge7z.vs2022.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
2929
endlocal
3030

3131
if exist "%SIGNBAT_PATH%" (
32-
call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
32+
call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
3333
)
3434

35-
mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
36-
copy Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
35+
mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
36+
copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
3737
goto :eof

‎ArchiveSupport/Merge7z/Merge7z.vcxproj

+9-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<SccProjectName />
3232
<SccLocalPath />
3333
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' == '15'">10.0.17763.0</WindowsTargetPlatformVersion>
34-
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' >= '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)' &gt;= '16'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
3535
</PropertyGroup>
3636
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -420,7 +420,11 @@
420420
<None Include="revision.txt" />
421421
</ItemGroup>
422422
<ItemGroup>
423+
<ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.h" />
424+
<ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.h" />
423425
<ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h" />
426+
<ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.h" />
427+
<ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.h" />
424428
<ClInclude Include="Merge7z.h" />
425429
<ClInclude Include="Merge7zCommon.h" />
426430
<ClInclude Include="StdAfx.h" />
@@ -484,7 +488,11 @@
484488
<ClInclude Include="..\..\Externals\sevenzip\C\Threads.h" />
485489
</ItemGroup>
486490
<ItemGroup>
491+
<ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.cpp" />
492+
<ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.cpp" />
487493
<ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp" />
494+
<ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.cpp" />
495+
<ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.cpp" />
488496
<ClCompile Include="..\..\Externals\sevenzip\C\7zCrcOpt.c">
489497
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
490498
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

‎ArchiveSupport/Merge7z/Merge7z.vcxproj.filters

+24
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,18 @@
225225
<ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.h">
226226
<Filter>7zip Common</Filter>
227227
</ClInclude>
228+
<ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.h">
229+
<Filter>Common</Filter>
230+
</ClInclude>
231+
<ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.h">
232+
<Filter>Windows</Filter>
233+
</ClInclude>
234+
<ClInclude Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.h">
235+
<Filter>Windows</Filter>
236+
</ClInclude>
237+
<ClInclude Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.h">
238+
<Filter>7zip Common</Filter>
239+
</ClInclude>
228240
</ItemGroup>
229241
<ItemGroup>
230242
<ClCompile Include="Merge7z907.cpp">
@@ -422,6 +434,18 @@
422434
<ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\UI\Common\SortUtils.cpp">
423435
<Filter>7zip Common</Filter>
424436
</ClCompile>
437+
<ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\CreateCoder.cpp">
438+
<Filter>Common</Filter>
439+
</ClCompile>
440+
<ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\Clipboard.cpp">
441+
<Filter>Windows</Filter>
442+
</ClCompile>
443+
<ClCompile Include="..\..\Externals\sevenzip\CPP\Windows\MemoryGlobal.cpp">
444+
<Filter>Windows</Filter>
445+
</ClCompile>
446+
<ClCompile Include="..\..\Externals\sevenzip\CPP\7zip\Common\FilterCoder.cpp">
447+
<Filter>7zip Common</Filter>
448+
</ClCompile>
425449
</ItemGroup>
426450
<ItemGroup>
427451
<ResourceCompile Include="..\..\Externals\sevenzip\CPP\7zip\Ui\Gui\resource.rc">

‎DownloadDeps.cmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ set downloadsdir=%~dp0\build\WinMergeDownloadDeps
1212
set urls_destdirs=^
1313
https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^
1414
https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.18.2.0/ShellExtension-1.18.2.0.zip!Build ^
15-
https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-win32.zip!Build ^
16-
https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-x64.zip!Build\X64 ^
17-
https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-ARM64.zip!Build\ARM64 ^
15+
https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.0/Merge7z2106.0-win32.zip!Build ^
16+
https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.0/Merge7z2106.0-x64.zip!Build\X64 ^
17+
https://github.com/WinMerge/winmerge/releases/download/Merge7z2106.0/Merge7z2106.0-ARM64.zip!Build\ARM64 ^
1818
https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-win32.zip!Build ^
1919
https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-x64.zip!Build\X64 ^
2020
https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-ARM64.zip!Build\ARM64 ^

‎Externals/sevenzip

Submodule sevenzip updated 668 files

‎Externals/versions.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ freeimage: 3.18.0
1010
WinIMerge: 1.0.31.0
1111
Google C++ Testing Framework: 1.11.0
1212
GnuWin32 Patch for Windows: 2.5.9-7
13-
7-zip: 19.00
13+
7-zip: 21.06
1414
LibXDiff: 611e42a on Nov 2, 2018 (https://github.com/git/git/tree/master/xdiff)
1515
html-tidy5: 5.4.0
1616
jq: 1.4

0 commit comments

Comments
 (0)