-
Notifications
You must be signed in to change notification settings - Fork 791
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
47 changed files
with
2,002 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| cd /d "%~dp0" | ||
|
|
||
| setlocal | ||
| for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( | ||
| set InstallDir=%%i | ||
| ) | ||
| if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" ( | ||
| call "%InstallDir%\Common7\Tools\vsdevcmd.bat | ||
| ) | ||
|
|
||
| if "%1" == "" ( | ||
| call :BuildBin | ||
| call :BuildBin x64 | ||
| call :BuildBin ARM64 | ||
| ) else ( | ||
| call :BuildBin %1 | ||
| ) | ||
|
|
||
| goto :eof | ||
|
|
||
| :BuildBin | ||
| set PLATFORM=%1 | ||
| if "%1" == "" ( | ||
| set PLATFORM_VS=Win32 | ||
| ) else ( | ||
| set PLATFORM_VS=%1 | ||
| ) | ||
| MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause | ||
| endlocal | ||
|
|
||
| if exist "%SIGNBAT_PATH%" ( | ||
| call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\Merge7z\Merge7z.dll | ||
| ) | ||
|
|
||
| mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL | ||
| copy Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\" | ||
| goto :eof |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.0.31903.59 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z", "Merge7z.vcxproj", "{FFB6D02A-782B-48EF-8398-7F8862859616}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|ARM64 = Debug|ARM64 | ||
| Debug|Win32 = Debug|Win32 | ||
| Debug|x64 = Debug|x64 | ||
| Release|ARM64 = Release|ARM64 | ||
| Release|Win32 = Release|Win32 | ||
| Release|x64 = Release|x64 | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64 | ||
| {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64 | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {36980764-4706-4331-A9F8-A52EB836D8B3} | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| pushd "%~dp0" | ||
| call BuildManual.cmd || goto :eof | ||
| call BuildBin.vs2022.cmd %1 %2 || goto :eof | ||
| pushd Testing\GoogleTest\UnitTests | ||
| UnitTests.exe || goto :eof | ||
| popd | ||
| call BuildInstaller.cmd %1 %2 | ||
| call BuildArc.cmd %1 %2 | ||
| popd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| cd /d "%~dp0" | ||
|
|
||
| call SetVersion.cmd | ||
| cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h | ||
|
|
||
| setlocal | ||
| for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -version [17.0^,18.0^) -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( | ||
| set InstallDir=%%i | ||
| ) | ||
| if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" ( | ||
| call "%InstallDir%\Common7\Tools\vsdevcmd.bat | ||
| ) | ||
|
|
||
| if "%1" == "" ( | ||
| call :BuildBin || goto :eof | ||
| call :BuildBin ARM64 || goto :eof | ||
| call :BuildBin x64 || goto :eof | ||
| ) else ( | ||
| call :BuildBin %1 || goto :eof | ||
| ) | ||
|
|
||
| goto :eof | ||
|
|
||
| :BuildBin | ||
| set PLATFORM=%1 | ||
| if "%1" == "" ( | ||
| set PLATFORM_VS=Win32 | ||
| ) else ( | ||
| set PLATFORM_VS=%1 | ||
| ) | ||
| if "%PLATFORM_VS%" == "Win32" ( | ||
| set PLATFORM_DIR= | ||
| ) else ( | ||
| set PLATFORM_DIR=%PLATFORM_VS% | ||
| ) | ||
| MSBuild WinMerge.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || goto :eof | ||
| endlocal | ||
|
|
||
| if exist "%SIGNBAT_PATH%" ( | ||
| call "%SIGNBAT_PATH%" Build\%PLATFORM_DIR%\Release\WinMergeU.exe | ||
| ) | ||
|
|
||
| mkdir Build\%PLATFORM_DIR%\Release\%APPVER% 2> NUL | ||
| copy Build\%PlATFORM_DIR%\Release\*.pdb "Build\%PLATFORM_DIR%\Release\%APPVER%\" | ||
| goto :eof |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.