msvc/winConfigDebug.bat

and
msvc/winConfigRelease.bat
have been broken for a very long time
and I never tested them.
This commit is contained in:
Cheng 2024-02-21 04:40:57 +00:00
parent 47f9e77aec
commit f999a8280d
No known key found for this signature in database
GPG Key ID: 571C3A9C3B9E6FCA
2 changed files with 46 additions and 50 deletions

View File

@ -3,35 +3,40 @@ echo exists to make sure no other libraries are around
echo off echo off
call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat
call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat" call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
del /Q build
del /Q libsodium\obj echo on
del /Q libsodium\bin rmdir /Q /S build
del /Q libsodium\src\libsodium\include\sodium\version.h rmdir /Q /S msvc\.vs
cd mpir cd libsodium
rmdir /Q /S bin
rmdir /Q /S obj
del src\libsodium\include\sodium\version.h
cd ..\mpir
rmdir /Q /S lib
del config.h del config.h
del gmp-mparam.h del gmp-mparam.h
del gmp.h del gmp.h
del /Q lib
del longlong.h del longlong.h
del mpir.h del mpir.h
del msvc\output_params.bat del msvc\output_params.bat
del msvc\tmp.h rmdir /Q /S msvc\vs22\lib_mpir_cxx\x64
del /Q msvc\vs22\lib_mpir_cxx\x64 rmdir /Q /S msvc\vs22\lib_mpir_gc\x64
del /Q msvc\vs22\lib_mpir_gc\x64
del msvc\vs22\test-config.props del msvc\vs22\test-config.props
cd ..\wxWidgets cd ..
del /Q build\msw\vc_x64_mswu cd wxWidgets
del /Q build\msw\vc_x64_mswud rmdir /Q /S build\msw\vc_x64_mswu
del /Q lib\vc_x64_lib rmdir /Q /S build\msw\vc_x64_mswud
rmdir /Q /S lib\vc_x64_lib
cd .. cd ..
echo check to see that everything is cleaned echo check to see that everything is cleaned
echo off rem echo off
git submodule foreach --recursive "git clean -xnf" git clean -xdn
git clean -xnf git submodule foreach git clean -xdn
PAUSE PAUSE
echo on echo on
cd libsodium/builds/msvc/vs2022 echo on
cd libsodium\builds\msvc\vs2022
msbuild libsodium.sln -p:Configuration=StaticDebug;Platform=x64 -m msbuild libsodium.sln -p:Configuration=StaticDebug;Platform=x64 -m
echo off echo off
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (

View File

@ -3,34 +3,40 @@ echo exists to make sure no other libraries are around
echo off echo off
call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat
call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat" call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
del /Q build
del /Q libsodium\obj echo on
del /Q libsodium\bin rmdir /Q /S build
del /Q libsodium\src\libsodium\include\sodium\version.h rmdir /Q /S msvc\.vs
cd mpir cd libsodium
rmdir /Q /S bin
rmdir /Q /S obj
del src\libsodium\include\sodium\version.h
cd ..\mpir
rmdir /Q /S lib
del config.h del config.h
del gmp-mparam.h del gmp-mparam.h
del gmp.h del gmp.h
del /Q lib
del longlong.h del longlong.h
del mpir.h del mpir.h
del msvc\output_params.bat del msvc\output_params.bat
del msvc\tmp.h rmdir /Q /S msvc\vs22\lib_mpir_cxx\x64
del /Q msvc\vs22\lib_mpir_cxx\x64 rmdir /Q /S msvc\vs22\lib_mpir_gc\x64
del /Q msvc\vs22\lib_mpir_gc\x64
del msvc\vs22\test-config.props del msvc\vs22\test-config.props
cd ..\wxWidgets cd ..
del /Q build\msw\vc_x64_mswu cd wxWidgets
del /Q build\msw\vc_x64_mswud rmdir /Q /S build\msw\vc_x64_mswu
del /Q lib\vc_x64_lib rmdir /Q /S build\msw\vc_x64_mswud
rmdir /Q /S lib\vc_x64_lib
cd .. cd ..
echo check to see that everything is cleaned echo check to see that everything is cleaned
echo off rem echo off
git submodule foreach --recursive "git clean -xnf" git clean -xdn
git clean -xnf git submodule foreach git clean -xdn
PAUSE PAUSE
echo on echo on
cd libsodium/builds/msvc/vs2022
echo on
cd libsodium\builds\msvc\vs2022
msbuild libsodium.sln -p:Configuration=StaticRelease;Platform=x64 -m msbuild libsodium.sln -p:Configuration=StaticRelease;Platform=x64 -m
echo off echo off
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (
@ -49,22 +55,7 @@ IF %ERRORLEVEL% NEQ 0 (
PAUSE PAUSE
GOTO:EOF GOTO:EOF
) )
echo on
call msbuild.bat gc lib x64 Release test
echo off
IF %ERRORLEVEL% NEQ 0 (
cd ..
PAUSE
GOTO:EOF
)
echo on
call msbuild.bat gc lib x64 Release tune
echo off
IF %ERRORLEVEL% NEQ 0 (
cd ..
PAUSE
GOTO:EOF
)
echo on echo on
cd ..\..\.. cd ..\..\..
cd wxWidgets\build\msw cd wxWidgets\build\msw