Merge pull request #209 from ISISComputingGroup/latest_python_fixes

Tidy ups and extra error checking
ISISComputingGroup · Oct 31, 2024 · 4186bd1 · 4186bd1
2 parents 4225a04 + f8677a1
commit 4186bd1
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 15 deletions.
diff --git a/build_tools/check_builds_are_recent.bat b/build_tools/check_builds_are_recent.bat
@@ -1,6 +1,7 @@
 setlocal
 call "%~dp0..\installation_and_upgrade\define_latest_genie_python.bat"
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 set PYTHONUNBUFFERED=TRUE
 REM use LATEST_PYTHON3 so not killed by stop_ibex_server 
 call "%LATEST_PYTHON3%" -u "%~dp0check_builds_are_recent.py"
-call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%
+call "%~dp0..\installation_and_upgrade\remove_genie_python.bat" %LATEST_PYTHON_DIR%
diff --git a/build_tools/purge_archive.bat b/build_tools/purge_archive.bat
@@ -1,12 +1,14 @@
 setlocal EnableDelayedExpansion
 REM Remove old builds from the archive
 
-if not "%WORKSPACE%" == "" (
+if "%WORKSPACE%" == "" (
+    call "%~dp0..\installation_and_upgrade\define_latest_genie_python.bat"
+) else (
     if exist "%WORKSPACE%\Python3" rd /s /q %WORKSPACE%\Python3
     if !errorlevel! neq 0 exit /b 1
+    call "%~dp0..\installation_and_upgrade\define_latest_genie_python.bat" %WORKSPACE%\Python3
 )
-
-call "%~dp0..\installation_and_upgrade\define_latest_genie_python.bat" %WORKSPACE%\Python3
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
 set PYTHONUNBUFFERED=TRUE
 REM use LATEST_PYTHON3 to avoid process being killed

diff --git a/installation_and_upgrade/define_latest_genie_python.bat b/installation_and_upgrade/define_latest_genie_python.bat
@@ -29,20 +29,28 @@ if "%PYTHON_BUILD_NO%" == "" (
 )
 
 if "%~1" NEQ "" (
-	set "LATEST_PYTHON_DIR=%~1\Python_Build_%PYTHON_BUILD_NO%" 
+	set "LATEST_PYTHON_DIR_T=%~1\Python_Build_%PYTHON_BUILD_NO%"
 ) else (
-	set "LATEST_PYTHON_DIR=%tmp%\Python_Build_%PYTHON_BUILD_NO%"
+	set "LATEST_PYTHON_DIR_T=%tmp%\Python_Build_%PYTHON_BUILD_NO%"
 )
 
-mkdir %LATEST_PYTHON_DIR%
+mkdir %LATEST_PYTHON_DIR_T%
 
-CALL %genie_dir%\BUILD-%PYTHON_BUILD_NO%\genie_python_install.bat %LATEST_PYTHON_DIR%
-
+CALL %genie_dir%\BUILD-%PYTHON_BUILD_NO%\genie_python_install.bat %LATEST_PYTHON_DIR_T%
+IF %errorlevel% neq 0 (
+    call %~dp0remove_genie_python.bat %LATEST_PYTHON_DIR_T%
+    goto ERROR
+)
+set "LATEST_PYTHON_DIR=%LATEST_PYTHON_DIR_T%"
 set "LATEST_PYTHON=%LATEST_PYTHON_DIR%\python.exe"
 set "LATEST_PYTHON3=%LATEST_PYTHON_DIR%\python3.exe"
+set "PYTHON_BUILD_NO="
+set "LATEST_PYTHON_DIR_T="
 
 exit /b 0
 
 :ERROR
 @echo define_latest_genie_python failed
+set PYTHON_BUILD_NO=
+set LATEST_PYTHON_DIR_T=
 exit /b 1
diff --git a/installation_and_upgrade/developer_update.bat b/installation_and_upgrade/developer_update.bat
@@ -1,6 +1,7 @@
 setlocal EnableDelayedExpansion
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
 set "STOP_IBEX=C:\Instrument\Apps\EPICS\stop_ibex_server"
 set "START_IBEX=C:\Instrument\Apps\EPICS\start_ibex_server"

diff --git a/installation_and_upgrade/instrument_install.bat b/installation_and_upgrade/instrument_install.bat
@@ -1,4 +1,4 @@
-setlocal
+setlocal EnableDelayedExpansion
 
 REM check if console has Administrative privileges
 call "%~dp0check_for_admin_console.bat"

diff --git a/installation_and_upgrade/instrument_save_settings.bat b/installation_and_upgrade/instrument_save_settings.bat
@@ -1,4 +1,4 @@
-setlocal
+setlocal EnableDelayedExpansion
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
 if %errorlevel% neq 0 goto ERROR

diff --git a/installation_and_upgrade/instrument_test.bat b/installation_and_upgrade/instrument_test.bat
@@ -1,3 +1,4 @@
+setlocal EnableDelayedExpansion
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
 if %errorlevel% neq 0 goto ERROR

diff --git a/installation_and_upgrade/instrument_update.bat b/installation_and_upgrade/instrument_update.bat
@@ -1,4 +1,4 @@
-setlocal
+setlocal EnableDelayedExpansion
 call "%~dp0define_latest_genie_python.bat"
 if %errorlevel% neq 0 goto ERROR
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases\4.0.0"

diff --git a/installation_and_upgrade/remove_genie_python.bat b/installation_and_upgrade/remove_genie_python.bat
@@ -5,10 +5,10 @@ if "%~1"=="" (
     goto ERROR
 )
 
-set remove_genie_python_path=%~1
+set "remove_genie_python_path=%~1"
 
 REM Checks that supplied filepath exists.
-if exist %remove_genie_python_path% (
+if exist "%remove_genie_python_path%" (
 
     REM Checks that "Python_Build_" is in the supplied filepath, so it is a python build.
     echo.%remove_genie_python_path% | findstr /C:"Python_Build_">nul && (
@@ -22,6 +22,7 @@ if exist %remove_genie_python_path% (
         set LATEST_PYTHON3=
 
         @echo Successfully removed "%remove_genie_python_path%" and unset genie build variables. 
+        set remove_genie_python_path=
         exit /b 0
 
     ) || (
@@ -35,5 +36,6 @@ if exist %remove_genie_python_path% (
 )
 
 :ERROR
+set remove_genie_python_path=
 @echo remove_genie_python failed
 exit /b 1
diff --git a/installation_and_upgrade/run_standalone_backup.bat b/installation_and_upgrade/run_standalone_backup.bat
@@ -2,6 +2,7 @@
 setlocal
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 call cd "%~dp0"
 set PYTHONPATH=.
 @REM Uses Python from the Shares, set as LATEST_PYTHON

diff --git a/installation_and_upgrade/truncate_database.bat b/installation_and_upgrade/truncate_database.bat
@@ -19,4 +19,4 @@ exit /b 0
 :ERROR
 set errcode = %ERRORLEVEL%
 call "%~dp0remove_genie_python.bat" %LATEST_PYTHON_DIR%
-EXIT /b !errcode!
+EXIT /b !errcode!
diff --git a/installation_and_upgrade/upgrade_mysql.bat b/installation_and_upgrade/upgrade_mysql.bat
@@ -1,6 +1,7 @@
 setlocal EnableDelayedExpansion
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
 set "STOP_IBEX=C:\Instrument\Apps\EPICS\stop_ibex_server"
 set "START_IBEX=C:\Instrument\Apps\EPICS\start_ibex_server"

diff --git a/installation_and_upgrade/vhd_build.bat b/installation_and_upgrade/vhd_build.bat
@@ -2,6 +2,7 @@ setlocal EnableDelayedExpansion
 set PYTHONUNBUFFERED=1
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
 IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"

diff --git a/installation_and_upgrade/vhd_build_force_cleanup.bat b/installation_and_upgrade/vhd_build_force_cleanup.bat
@@ -2,6 +2,7 @@ setlocal EnableDelayedExpansion
 set PYTHONUNBUFFERED=1
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
 IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"

diff --git a/installation_and_upgrade/vhd_build_release.bat b/installation_and_upgrade/vhd_build_release.bat
@@ -2,6 +2,7 @@ setlocal EnableDelayedExpansion
 set PYTHONUNBUFFERED=1
 set "SOURCE=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\Releases"
 call "%~dp0define_latest_genie_python.bat"
+IF %errorlevel% neq 0 EXIT /b %errorlevel%
 
 IF EXIST "C:\Instrument\Apps\EPICS\stop_ibex_server.bat" (
   start /wait cmd /c "C:\Instrument\Apps\EPICS\stop_ibex_server.bat"