add activate venv script

Author: rerpha

installation_and_upgrade/_activate_venv.bat

@@ -0,0 +1,4 @@
+REM Activate a virtual environment created by set_up_venv.bat. Also set the UV_TEMP_VENV var.
+REM this might be needed if ie. stop_ibex_server calls config_env and wipes env vars.
+set UV_TEMP_VENV=C:\Instrument\Var\tmp\.deployscriptvenv
+call %UV_TEMP_VENV%\scripts\activate

installation_and_upgrade/instrument_deploy.bat

@@ -80,7 +80,7 @@ if "%DETECT_OLD_GALIL%" == "YES" (
 )
 
 REM stop_ibex_server calls config_env which means we have to reactivate our venv
-call %UV_TEMP_VENV%\scripts\activate
+call "%~dp0_activate_venv.bat"
 
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_main
 IF %errorlevel% neq 0 exit /b %errorlevel%
@@ -89,6 +89,8 @@ ENDLOCAL
 start /i /wait cmd /c "%START_IBEX%"
 
 REM start_ibex_server calls config_env which means we have to reactivate our venv
+call "%~dp0_activate_venv.bat"
+
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_deploy_post_start
 call rmdir /s /q %UV_TEMP_VENV%
 

installation_and_upgrade/instrument_install.bat

@@ -38,7 +38,7 @@ IF EXIST "C:\Instrument\Apps\EPICS" (start /wait cmd /c "%STOP_IBEX%")
 
 
 REM stop_ibex_server calls config_env which means we have to reactivate our venv
-call %UV_TEMP_VENV%\scripts\activate
+call "%~dp0_activate_venv.bat"
 
 call python "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --server_arch %SERVER_ARCH% --confirm_step instrument_install
 if %errorlevel% neq 0 goto ERROR

installation_and_upgrade/instrument_install_latest_build_only.bat

@@ -21,7 +21,7 @@ set "STOP_IBEX=C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 IF EXIST "C:\Instrument\Apps\EPICS" (
     call "%STOP_IBEX%"
     REM stop_ibex_server calls config_env which means we have to reactivate our venv
-    call %UV_TEMP_VENV%\scripts\activate
+    call "%~dp0_activate_venv.bat"
 ) else (
     REM in case one has been left around running in the background
     taskkill /f /im caRepeater.exe

installation_and_upgrade/instrument_test.bat

@@ -8,8 +8,6 @@ if %errorlevel% neq 0 goto ERROR
 call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --confirm_step instrument_test
 if %errorlevel% neq 0 goto ERROR
 
-call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%
-
 call rmdir /s /q %UV_TEMP_VENV%
 
 exit /b 0

installation_and_upgrade/run_standalone_backup.bat

@@ -5,8 +5,6 @@ call "%~dp0set_epics_ca_addr_list.bat"
 call "%~dp0install_or_update_uv.bat"
 call "%~dp0set_up_venv.bat"
 IF %errorlevel% neq 0 EXIT /b %errorlevel%
-call cd "%~dp0"
-@REM Uses Python from the Shares, set as LATEST_PYTHON
 call python "%~dp0ibex_install_utils\tasks\backup_tasks.py"
 call rmdir /s /q %UV_TEMP_VENV%
 endlocal

installation_and_upgrade/upgrade_mysql.bat

@@ -11,7 +11,8 @@ set "START_IBEX=C:\Instrument\Apps\EPICS\start_ibex_server"
 
 start /wait cmd /c "%STOP_IBEX%"
 
-call "%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step force_upgrade_mysql
+call "%~dp0_activate_venv.bat"
+call python -u "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" --release_suffix "%SUFFIX%" --confirm_step force_upgrade_mysql
 
 IF %errorlevel% neq 0 (
     set errcode = %ERRORLEVEL%

installation_and_upgrade/vhd_build.bat

@@ -12,6 +12,7 @@ IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 )
 
+call "%~dp0_activate_venv.bat"
 call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" create_vhds --quiet --no_log_to_var
 IF %ERRORLEVEL% NEQ 0 (
   set errcode = %ERRORLEVEL%

installation_and_upgrade/vhd_build_force_cleanup.bat

@@ -11,7 +11,8 @@ IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 )
 
-call "%LATEST_PYTHON%" "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" request_dismount_vhds --quiet --no_log_to_var
+call "%~dp0_activate_venv.bat"
+call python "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" request_dismount_vhds --quiet --no_log_to_var
 
 IF %ERRORLEVEL% NEQ 0 (
   set errcode = %ERRORLEVEL%

installation_and_upgrade/vhd_build_release.bat

@@ -11,7 +11,8 @@ IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"
 )
 
-call "%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" create_vhds --quiet --no_log_to_var
+call "%~dp0_activate_venv.bat"
+call python -u "%~dp0IBEX_upgrade.py" --release_dir "%SOURCE%" create_vhds --quiet --no_log_to_var
 
 IF %ERRORLEVEL% NEQ 0 (
   set errcode = %ERRORLEVEL%