Compiling: Switch to Visual Studio 2017

C/7zVersion.h

@@ -10,7 +10,7 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2020-04-10"
+#define MY_DATE "2020-04-11"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"

CPP/appveyor.cmd

@@ -1,83 +1,44 @@
 @echo off
 
 REM Microsoft Windows SDK 7.1    (VC=sdk71) -> can compile for IA64, but who needs that?
-REM Microsoft Visual Studio 2010 (VC=10.0) -> for win2k
+REM Microsoft Visual Studio 2010 (VC=10.0) -> for win2k, but who needs that?
 REM Microsoft Visual Studio 2012 (VC=11.0)
 REM Microsoft Visual Studio 2013 (VC=12.0)
 REM Microsoft Visual Studio 2015 (VC=14.0)
-REM Microsoft Visual Studio 2017 (VC=15.0)  -> for: x32 + x64
+REM Microsoft Visual Studio 2017 (VC=15.0)
 
 REM to many vcvarsall.cmd calls will blow it up!
 set OPATH=%PATH%
 set ERRFILE=%APPVEYOR_BUILD_FOLDER%\error.txt
 cd %APPVEYOR_BUILD_FOLDER%\CPP
 
-REM releases now:
-REM sdk71: ia builds
-REM vc10: win2k builds
-REM vc14: >= winxp builds
-REM /TR 2019-09-07
-goto vc14
+goto build_vs2017
 
-:sdk71
-set VC=sdk71
-set NEXT=vc10
-goto build_sdk
-
-:vc10
-set VC=10.0
-set NEXT=vc14
-set CFLAGS=
-goto build_vc
-
-:vc11
-set VC=11.0
-set NEXT=end
-set CFLAGS=-Gw
-goto build_vc
-
-:vc12
-set VC=12.0
-set NEXT=end
-set CFLAGS=-Gw
-goto build_vc
-
-:vc14
-set VC=14.0
-set NEXT=end
-set CFLAGS=-Gw
-goto build_vc
-
-
-:build_sdk
+:build_vs2017
+set VC=15.0
 set PATH=%OPATH%
 set SUBSYS="5.01"
-call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
-call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /ia64 /xp
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-ia64
-call build-ia64.cmd
-goto %NEXT%
+set OPTS=MY_STATIC_LINK=1 /NOLOGO
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+call build-it.cmd
 
-:build_vc
-FOR /R .\ %%d IN (ARM X64 O) DO rd /S /Q %%d 2>NUL
-set PATH=%OPATH%
-set SUBSYS="5.01"
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x32
-call build-x32.cmd
 set PATH=%OPATH%
 set SUBSYS="5.02"
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_amd64
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x64
-call build-x64.cmd
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+call build-it.cmd
+
+set PATH=%OPATH%
+set SUBSYS="6.02"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64_arm
+call build-it.cmd
+
 set PATH=%OPATH%
 set SUBSYS="6.02"
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_arm
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-arm
-call build-arm.cmd
-goto %NEXT%
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64_arm64
+call build-it.cmd
+
+goto end
 
 :end
 cd %APPVEYOR_BUILD_FOLDER%
-set > env.txt
 7z a %APPVEYOR_PROJECT_NAME%-%APPVEYOR_BUILD_VERSION%.7z bin-* *.txt

CPP/build-it.cmd

@@ -0,0 +1,103 @@
+@echo off
+
+set ROOT=%cd%\7zip
+set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-%PLATFORM%
+set ERRFILE=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-%PLATFORM%.log
+set LFLAGS=/SUBSYSTEM:WINDOWS,%SUBSYS%
+set > %APPVEYOR_BUILD_FOLDER%\env-%VC%-%PLATFORM%.txt
+mkdir %OUTDIR%
+
+cd %ROOT%\Bundles\Format7zExtract
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zxa.dll" >> %ERRFILE%
+copy %PLATFORM%\7zxa.dll %OUTDIR%\7zxa.dll
+
+cd %ROOT%\Bundles\Format7z
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7za.dll" >> %ERRFILE%
+copy %PLATFORM%\7za.dll %OUTDIR%\7za.dll
+
+cd %ROOT%\Bundles\Format7zF
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7z.dll" >> %ERRFILE%
+copy %PLATFORM%\7z.dll %OUTDIR%\7z.dll
+
+cd %ROOT%\UI\FileManager
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zFM.exe" >> %ERRFILE%
+copy %PLATFORM%\7zFM.exe %OUTDIR%\7zFM.exe
+
+cd %ROOT%\UI\GUI
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zG.exe" >> %ERRFILE%
+copy %PLATFORM%\7zG.exe %OUTDIR%\7zG.exe
+
+cd %ROOT%\UI\Explorer
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7-zip.dll" >> %ERRFILE%
+copy %PLATFORM%\7-zip.dll %OUTDIR%\7-zip.dll
+
+cd %ROOT%\Bundles\SFXWin
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7z.sfx" >> %ERRFILE%
+copy %PLATFORM%\7z.sfx %OUTDIR%\7z.sfx
+
+cd %ROOT%\Bundles\Codec_brotli
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ brotli.dll" >> %ERRFILE%
+copy %PLATFORM%\brotli.dll %OUTDIR%\brotli.dll
+
+cd %ROOT%\Bundles\Codec_lizard
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ lizard.dll" >> %ERRFILE%
+copy %PLATFORM%\lizard.dll %OUTDIR%\lizard.dll
+
+cd %ROOT%\Bundles\Codec_lz4
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ lz4.dll" >> %ERRFILE%
+copy %PLATFORM%\lz4.dll %OUTDIR%\lz4.dll
+
+cd %ROOT%\Bundles\Codec_lz5
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ lz5.dll" >> %ERRFILE%
+copy %PLATFORM%\lz5.dll %OUTDIR%\lz5.dll
+
+cd %ROOT%\Bundles\Codec_zstd
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ zstd.dll" >> %ERRFILE%
+copy %PLATFORM%\zstd.dll %OUTDIR%\zstd.dll
+
+cd %ROOT%\Bundles\Codec_flzma2
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ flzma2.dll" >> %ERRFILE%
+copy %PLATFORM%\flzma2.dll %OUTDIR%\flzma2.dll
+
+cd %ROOT%\..\..\C\Util\7zipInstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ Install.exe" >> %ERRFILE%
+copy %PLATFORM%\7zipInstall.exe %OUTDIR%\Install.exe
+
+cd %ROOT%\..\..\C\Util\7zipUninstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ Uninstall.exe" >> %ERRFILE%
+copy %PLATFORM%\7zipUninstall.exe %OUTDIR%\Uninstall.exe
+
+set LFLAGS=/SUBSYSTEM:CONSOLE,%SUBSYS%
+cd %ROOT%\UI\Console
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7z.exe" >> %ERRFILE%
+copy %PLATFORM%\7z.exe %OUTDIR%\7z.exe
+
+cd %ROOT%\Bundles\SFXCon
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zCon.sfx" >> %ERRFILE%
+copy %PLATFORM%\7zCon.sfx %OUTDIR%\7zCon.sfx
+
+cd %ROOT%\Bundles\Alone
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7za.exe" >> %ERRFILE%
+copy %PLATFORM%\7za.exe %OUTDIR%\7za.exe
+
+:ende
+cd %ROOT%\..
+