@@ -56,7 +56,7 @@ if exist "%GENIECMDLOGDIR%\%GENIECMDLOGFILE%" (
56
56
robocopy " %GENIECMDLOGDIR% " " %TEMP% " " %GENIECMDLOGFILE% " /R:2 /IS /NFL /NDL /NP /NC /NS /LOG:NUL
57
57
)
58
58
59
- REM Create the "GALIL_OLD.txt" or "GALIL_NEX .txt" file in tmp dir
59
+ REM Create the "GALIL_OLD.txt" or "GALIL_NEW .txt" file in tmp dir
60
60
REM to inform the IBEX Server installation step which Galil version to use
61
61
set " GALIL_OLD_FILE = GALIL_OLD.txt"
62
62
set " GALIL_NEW_FILE = GALIL_NEW.txt"
@@ -65,13 +65,21 @@ set "GALIL_OLD_DIR=C:\Instrument\Apps\EPICS\ioc\master\GALIL-OLD"
65
65
if exist " %TEMP% \%GALIL_OLD_FILE% " del " %TEMP% \%GALIL_OLD_FILE% "
66
66
if exist " %TEMP% \%GALIL_NEW_FILE% " del " %TEMP% \%GALIL_NEW_FILE% "
67
67
if exist " %GALIL_DIR% \%GALIL_OLD_FILE% " (
68
- @ echo Detected old Galil driver
69
- robocopy " %GALIL_DIR% " " %TEMP% " " %GALIL_OLD_FILE% " /R:2 /IS /NFL /NDL /NP /NC /NS /LOG:NUL
68
+ @ echo Detected old Galil driver - %GALIL_OLD_FILE% in %GALIL_DIR%
69
+ robocopy " %GALIL_DIR% " " %TEMP% " " %GALIL_OLD_FILE% " /R:2 /IS /NFL /NDL /NP /NC /NS /LOG:NUL
70
+ set " DETECT_OLD_GALIL = YES"
70
71
)
71
72
if exist " %GALIL_OLD_DIR% \%GALIL_OLD_FILE% " (
72
73
REM GALIL-OLD has not been renamed to GALIL hence we must be using new driver
73
- @ echo Detected new Galil driver
74
- copy /y " %GALIL_OLD_DIR% \%GALIL_OLD_FILE% " " %TEMP% \%GALIL_NEW_FILE% "
74
+ @ echo Detected new Galil driver - %GALIL_OLD_FILE% in %GALIL_OLD_DIR%
75
+ copy /y " %GALIL_OLD_DIR% \%GALIL_OLD_FILE% " " %TEMP% \%GALIL_NEW_FILE% "
76
+ set " DETECT_NEW_GALIL = YES"
77
+ )
78
+ if " %DETECT_OLD_GALIL% " == " YES" (
79
+ if " %DETECT_NEW_GALIL% " == " YES" (
80
+ @ echo ERROR - both NEW and OLD GALIL driver appear enabled, this should not be possible
81
+ exit /b 1
82
+ )
75
83
)
76
84
77
85
if " %1 " == " RELEASE" (
0 commit comments