diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd index 2827732b..99b96fc1 100644 --- a/CPP/appveyor.cmd +++ b/CPP/appveyor.cmd @@ -40,14 +40,19 @@ goto build_vc :build_vc +FOR /R .\ %%d IN (ARM X64 O) DO rd /S /Q %%d 2>NUL set PATH=%OPATH% -FOR /R .\ %%d IN (AMD64 O) DO rd /S /Q %%d 2>NUL 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% 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 +set PATH=%OPATH% +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% :build_sdk diff --git a/CPP/build-arm.cmd b/CPP/build-arm.cmd new file mode 100644 index 00000000..a614129d --- /dev/null +++ b/CPP/build-arm.cmd @@ -0,0 +1,101 @@ +@echo off + +set ROOT=%cd%\7zip +if not defined OUTDIR set OUTDIR=%ROOT%\binArm +if not defined ERRFILE set ERRFILE=%cd%\error.txt +mkdir %OUTDIR% + +set OPTS=PLATFORM=arm MY_STATIC_LINK=1 /NOLOGO + +cd %ROOT%\Bundles\Format7zExtract +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zxa.dll" >> %ERRFILE% +copy arm\7zxa.dll %OUTDIR%\7zxa.dll + +cd %ROOT%\Bundles\Format7z +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.dll" >> %ERRFILE% +copy arm\7za.dll %OUTDIR%\7za.dll + +cd %ROOT%\Bundles\Format7zF +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> %ERRFILE% +copy arm\7z.dll %OUTDIR%\7z.dll + +cd %ROOT%\UI\FileManager +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE% +copy arm\7zFM.exe %OUTDIR%\7zFM.exe + +cd %ROOT%\UI\GUI +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> %ERRFILE% +copy arm\7zG.exe %OUTDIR%\7zG.exe + +cd %ROOT%\UI\Explorer +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> %ERRFILE% +copy arm\7-zip.dll %OUTDIR%\7-zip.dll + +cd %ROOT%\Bundles\SFXWin +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> %ERRFILE% +copy arm\7z.sfx %OUTDIR%\7z.sfx + +cd %ROOT%\Bundles\Codec_brotli +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ brotli-arm.dll" >> %ERRFILE% +copy arm\brotli.dll %OUTDIR%\brotli-arm.dll + +cd %ROOT%\Bundles\Codec_lizard +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ lizard-arm.dll" >> %ERRFILE% +copy arm\lizard.dll %OUTDIR%\lizard-arm.dll + +cd %ROOT%\Bundles\Codec_lz4 +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ lz4-arm.dll" >> %ERRFILE% +copy arm\lz4.dll %OUTDIR%\lz4-arm.dll + +cd %ROOT%\Bundles\Codec_lz5 +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ lz5-arm.dll" >> %ERRFILE% +copy arm\lz5.dll %OUTDIR%\lz5-arm.dll + +cd %ROOT%\Bundles\Codec_zstd +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ zstd-arm.dll" >> %ERRFILE% +copy arm\zstd.dll %OUTDIR%\zstd-arm.dll + +cd %ROOT%\Bundles\Codec_flzma2 +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ flzma2-arm.dll" >> %ERRFILE% +copy arm\flzma2.dll %OUTDIR%\flzma2-arm.dll + +cd %ROOT%\..\..\C\Util\7zipInstall +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ Install-arm.exe" >> %ERRFILE% +copy arm\7zipInstall.exe %OUTDIR%\Install-arm.exe + +cd %ROOT%\..\..\C\Util\7zipUninstall +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> %ERRFILE% +copy arm\7zipUninstall.exe %OUTDIR%\Uninstall.exe + +cd %ROOT%\UI\Console +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> %ERRFILE% +copy arm\7z.exe %OUTDIR%\7z.exe + +cd %ROOT%\Bundles\SFXCon +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> %ERRFILE% +copy arm\7zCon.sfx %OUTDIR%\7zCon.sfx + +cd %ROOT%\Bundles\Alone +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.exe" >> %ERRFILE% +copy arm\7za.exe %OUTDIR%\7za.exe + +:ende +cd %ROOT%\.. diff --git a/CPP/build-ia64.cmd b/CPP/build-ia64.cmd deleted file mode 100644 index 1d3ac3ef..00000000 --- a/CPP/build-ia64.cmd +++ /dev/null @@ -1,102 +0,0 @@ -@echo off - -set ROOT=%cd%\7zip -if not defined OUTDIR set OUTDIR=%ROOT%\binIA64 -mkdir %OUTDIR% - -set OPTS=CPU=IA64 MY_STATIC_LINK=1 /NOLOGO -set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" - -cd %ROOT%\Bundles\Format7zExtract -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zxa.dll" >> %ERRFILE% -copy IA64\7zxa.dll %OUTDIR%\7zxa.dll - -cd %ROOT%\Bundles\Format7z -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7za.dll" >> %ERRFILE% -copy IA64\7za.dll %OUTDIR%\7za.dll - -cd %ROOT%\Bundles\Format7zF -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.dll" >> %ERRFILE% -copy IA64\7z.dll %OUTDIR%\7z.dll - -cd %ROOT%\UI\FileManager -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zFM.exe" >> %ERRFILE% -copy IA64\7zFM.exe %OUTDIR%\7zFM.exe - -cd %ROOT%\UI\GUI -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zG.exe" >> %ERRFILE% -copy IA64\7zG.exe %OUTDIR%\7zG.exe - -cd %ROOT%\UI\Explorer -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7-zip.dll" >> %ERRFILE% -copy IA64\7-zip.dll %OUTDIR%\7-zip.dll - -cd %ROOT%\Bundles\SFXWin -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.sfx" >> %ERRFILE% -copy IA64\7z.sfx %OUTDIR%\7z.sfx - -cd %ROOT%\Bundles\Codec_brotli -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ brotli-x64.dll" >> %ERRFILE% -copy IA64\brotli.dll %OUTDIR%\brotli-x64.dll - -cd %ROOT%\Bundles\Codec_lizard -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ lizard-x64.dll" >> %ERRFILE% -copy IA64\lizard.dll %OUTDIR%\lizard-x64.dll - -cd %ROOT%\Bundles\Codec_lz4 -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ lz4-x64.dll" >> %ERRFILE% -copy IA64\lz4.dll %OUTDIR%\lz4-x64.dll - -cd %ROOT%\Bundles\Codec_lz5 -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ lz5-x64.dll" >> %ERRFILE% -copy IA64\lz5.dll %OUTDIR%\lz5-x64.dll - -cd %ROOT%\Bundles\Codec_zstd -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ zstd-x64.dll" >> %ERRFILE% -copy IA64\zstd.dll %OUTDIR%\zstd-x64.dll - -cd %ROOT%\Bundles\Codec_flzma2 -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ flzma2-x64.dll" >> %ERRFILE% -copy IA64\flzma2.dll %OUTDIR%\flzma2-x64.dll - -cd %ROOT%\..\..\C\Util\7zipInstall -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ Install-x64.exe" >> %ERRFILE% -copy IA64\7zipInstall.exe %OUTDIR%\Install-x64.exe - -cd %ROOT%\..\..\C\Util\7zipUninstall -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ Uninstall.exe" >> %ERRFILE% -copy IA64\7zipUninstall.exe %OUTDIR%\Uninstall.exe - -set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02" -cd %ROOT%\UI\Console -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.exe" >> %ERRFILE% -copy IA64\7z.exe %OUTDIR%\7z.exe - -cd %ROOT%\Bundles\SFXCon -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zCon.sfx" >> %ERRFILE% -copy IA64\7zCon.sfx %OUTDIR%\7zCon.sfx - -cd %ROOT%\Bundles\Alone -nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error ia64 @ 7za.exe" >> %ERRFILE% -copy IA64\7za.exe %OUTDIR%\7za.exe - -:ende -cd %ROOT%\.. diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd index 210da8cf..1b38a9f7 100644 --- a/CPP/build-x64.cmd +++ b/CPP/build-x64.cmd @@ -5,7 +5,7 @@ if not defined OUTDIR set OUTDIR=%ROOT%\bin64 if not defined ERRFILE set ERRFILE=%cd%\error.txt mkdir %OUTDIR% -set OPTS=CPU=X64 MY_STATIC_LINK=1 /NOLOGO +set OPTS=PLATFORM=x64 MY_STATIC_LINK=1 /NOLOGO set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" cd %ROOT%\Bundles\Format7zExtract