From 45d6d0f673ae4892be5ea9f30ea6056fda978cd2 Mon Sep 17 00:00:00 2001 From: johncolvin-og <46972520+johncolvin-og@users.noreply.github.com> Date: Thu, 29 Sep 2022 13:37:04 -0500 Subject: [PATCH] fix build (win): Update build scripts to use VS 2022 & py venv Clean scripts up a bit while we're at it --- tools/buildspark.cmd | 17 ++++++++++++----- tools/ensure_venv.cmd | 25 +++++++++++++++++++++++++ tools/nuget_restore.cmd | 7 +++---- tools/setup_builds.bat | 30 ++++++++++++++++-------------- 4 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 tools/ensure_venv.cmd diff --git a/tools/buildspark.cmd b/tools/buildspark.cmd index afa7df151..aeeb20442 100644 --- a/tools/buildspark.cmd +++ b/tools/buildspark.cmd @@ -1,8 +1,15 @@ +@REM This script can be run the regular cmd prompt @echo off setlocal -@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" > nul -cd /d %~dp0/../ -setlocal -set path=%spark_build_python_path%;%path% -touch src\lib\CMakeLists.txt +set tools_dir=%~dp0 +set repo_dir=%tools_dir%\.. +set build_dir=%repo_dir%\build + +call "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat" > nul + +if not exist %build_dir% ( + call "%tools_dir%\setup_builds.bat" +) + +touch %repo_dir%\src\lib\CMakeLists.txt msbuild /m /nologo /p:debugtype=portable /p:platform=x64 /p:GenerateFullPaths=true /clp:verbosity=minimal /clp:summary %* spark_client.sln diff --git a/tools/ensure_venv.cmd b/tools/ensure_venv.cmd new file mode 100644 index 000000000..a102d6f58 --- /dev/null +++ b/tools/ensure_venv.cmd @@ -0,0 +1,25 @@ +@echo off +setlocal + +set venv_dir=%~dp0..\.venv + +if exist %venv_dir% ( + if "%1"=="--force" ( + echo Removing python virtual environment + rmdir /S /Q %venv_dir% + ) else ( + GOTO ERROR + ) +) + +echo Creating python virtual environment +@call python -m venv %venv_dir% +@call %venv_dir%\Scripts\activate.bat +@call pip install --upgrade pip +@call %venv_dir%\Scripts\pip install -r %~dp0..\requirements.txt +@call deactivate + +EXIT /B %ERRORLEVEL% + +:ERROR +EXIT /B 1 diff --git a/tools/nuget_restore.cmd b/tools/nuget_restore.cmd index 4c9f5c97d..377c2c0db 100644 --- a/tools/nuget_restore.cmd +++ b/tools/nuget_restore.cmd @@ -1,7 +1,6 @@ +@REM This script should be run from the VS dev prompt @echo off -setlocal -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" > nul cd /d %~dp0/../ -msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore /p:RestoreSources=externals\windows\nuget\packages spark_client.sln -msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /p:Configuration=release /t:restore /p:RestoreSources=externals\windows\nuget\packages spark_client.sln +msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /t:restore spark_client.sln +msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary /p:Configuration=release /t:restore spark_client.sln diff --git a/tools/setup_builds.bat b/tools/setup_builds.bat index 864627cdc..e0f72f9e8 100644 --- a/tools/setup_builds.bat +++ b/tools/setup_builds.bat @@ -1,15 +1,17 @@ +@REM This script should be run from the VS dev prompt @echo off -@setlocal -cd /d %~dp0\.. -mkdir build 2> nul -cd build -rmdir /s /q Debug -rmdir /s /q Release -if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" ( - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" -G "Visual Studio 15 2017 Win64" .. -) else ( - cmake.exe -G "Visual Studio 15 2017 Win64" .. -) -copy /y ..\tools\cpp.build.props Directory.Build.Props -del spark.sln -%~dp0\nuget_restore.cmd +setlocal +set tools_dir=%~dp0 +set repo_dir=%tools_dir%\.. +set build_dir=%repo_dir%\build +mkdir %build_dir% 2> nul +if exist %build_dir%\Debug ( + rmdir /s /q %build_dir%\Debug +) +if exist %build_dir%\Release ( + rmdir /s /q %build_dir%\Release +) +cmake.exe -G "Visual Studio 17 2022" -B %build_dir% -S %repo_dir% +copy /y %tools_dir%\cpp.build.props %build_dir%\Directory.Build.Props +del %build_dir%\spark.sln +%tools_dir%\nuget_restore.cmd