From b5baab44eadd1e177efaa34a2ea2ad7e9448ee74 Mon Sep 17 00:00:00 2001
From: "Beale, Michael" <michael.beale@intel.com>
Date: Tue, 29 Apr 2025 17:23:39 -0700
Subject: [PATCH 1/6] Add error handling for configuration input in deploy.bat

---
 src/deploy.bat | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/deploy.bat b/src/deploy.bat
index e7f9f59d..0511c29b 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -1,6 +1,21 @@
 rem @echo off
 
 set CONFIG=%2
+
+if "%CONFIG%"=="" (
+	echo "ERROR: No configuration specified. Please specify Debug or Release."
+	echo "Usage: deploy.bat <path to ACAT root> <Debug|Release>"
+	exit /b 1
+)
+if "%CONFIG%"=="Debug" (
+	echo Deploying Debug configuration
+) else if "%CONFIG%"=="Release" (
+	echo Deploying Release configuration
+) else (
+	echo "ERROR: Invalid configuration specified. Please specify Debug or Release."
+	echo "Usage: deploy.bat <path to ACAT root> <Debug|Release>"
+	exit /b 1
+)
 set INSTALLDIR=.\Applications\ACATApp\bin\%CONFIG%
 
 cd %1
@@ -90,6 +105,7 @@ rem ------------------------------------------------
 
 set SOURCEDIR=Extensions\Default\Actuators\CameraActuator
 set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
+echo TargetDir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
 copy .\%SOURCEDIR%\bin\%CONFIG%\CameraActuator.dll %TARGETDIR%
 copy .\%SOURCEDIR%\bin\%CONFIG%\*.exe %TARGETDIR%
@@ -199,7 +215,9 @@ rem ------------------------------------------------
 
 set SOURCEDIR=Extensions\BCI\Actuators\BCIActuator
 set BCIEXTERNALSRCDIR=Extensions\BCI\Actuators\External
+echo Install Dir is %INSTALLDIR%
 set TARGETDIR=%INSTALLDIR%\Extensions\BCI\Actuators\BCIActuator
+echo Target Dir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
 copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
 copy .\%BCIEXTERNALSRCDIR%\brainflow.5.5.0\*.dll %TARGETDIR%

From 1909c5fbadd0ede71d7d665aa7d30ceb5b30f338 Mon Sep 17 00:00:00 2001
From: "Beale, Michael" <michael.beale@intel.com>
Date: Tue, 29 Apr 2025 17:37:28 -0700
Subject: [PATCH 2/6] Add error handling for missing source directories in
 deploy.bat

---
 src/deploy.bat | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/deploy.bat b/src/deploy.bat
index 0511c29b..5d0f7885 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -34,7 +34,7 @@ set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\WordPredictors\ConvAssist
 set SOURCEDIR=Applications\Install\%LANGUAGE%\WordPredictors\ConvAssist
 if not exist %SOURCEDIR% (
 	echo ERROR: %SOURCEDIR% does not exist
-	goto DeployConvAssist
+	exit /b 1
 )
 xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
 
@@ -97,8 +97,6 @@ if not exist %TARGETDIR% mkdir %TARGETDIR%
 if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
 if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
 
-rem goto Next
-
 rem ------------------------------------------------
 @echo Actuators
 rem ------------------------------------------------
@@ -109,15 +107,13 @@ echo TargetDir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
 copy .\%SOURCEDIR%\bin\%CONFIG%\CameraActuator.dll %TARGETDIR%
 copy .\%SOURCEDIR%\bin\%CONFIG%\*.exe %TARGETDIR%
-if exist .\%SOURCEDIR%\External goto CopyVisionExternal
-echo *** ERROR *** Could not find External dependencies for the Vision Actuator (.\%SOURCEDIR%\External).
-rem goto Next
-
-:CopyVisionExternal
+if not exist .\%SOURCEDIR%\External (
+	echo "*** ERROR *** Could not find External dependencies for the Vision Actuator \%SOURCEDIR%\External"
+	exit /b 1
+)
 if not exist %TARGETDIR%\acat_gestures_dll.dll copy .\%SOURCEDIR%\External\*.* %TARGETDIR%
 if not exist %INSTALLDIR%\shape_predictor_68_face_landmarks.dat copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
 
-
 rem ------------------------------------------------
 @echo Deploying TTSEngine dlls
 rem ------------------------------------------------

From 3ba0ea9da9da5ed2fff7a8cd2ecf8bdffc9b3c75 Mon Sep 17 00:00:00 2001
From: "Beale, Michael" <michael.beale@intel.com>
Date: Tue, 29 Apr 2025 17:47:17 -0700
Subject: [PATCH 3/6] Comment out actuator deployment section in deploy.bat

---
 src/deploy.bat | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/deploy.bat b/src/deploy.bat
index 5d0f7885..c65f8579 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -97,23 +97,26 @@ if not exist %TARGETDIR% mkdir %TARGETDIR%
 if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
 if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
 
-rem ------------------------------------------------
-@echo Actuators
-rem ------------------------------------------------
-
-set SOURCEDIR=Extensions\Default\Actuators\CameraActuator
-set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
-echo TargetDir is %TARGETDIR%
-if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\CameraActuator.dll %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.exe %TARGETDIR%
-if not exist .\%SOURCEDIR%\External (
-	echo "*** ERROR *** Could not find External dependencies for the Vision Actuator \%SOURCEDIR%\External"
-	exit /b 1
-)
-if not exist %TARGETDIR%\acat_gestures_dll.dll copy .\%SOURCEDIR%\External\*.* %TARGETDIR%
-if not exist %INSTALLDIR%\shape_predictor_68_face_landmarks.dat copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
-
+@REM rem ------------------------------------------------
+@REM @echo Actuators
+@REM rem ------------------------------------------------
+
+@REM set SOURCEDIR=Extensions\Default\Actuators\CameraActuator
+@REM set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
+@REM echo TargetDir is %TARGETDIR%
+@REM if not exist %TARGETDIR% mkdir %TARGETDIR%
+@REM copy .\%SOURCEDIR%\bin\%CONFIG%\CameraActuator.dll %TARGETDIR%
+@REM copy .\%SOURCEDIR%\bin\%CONFIG%\*.exe %TARGETDIR%
+@REM if not exist .\%SOURCEDIR%\External (
+@REM 	echo "*** ERROR *** Could not find External dependencies for the Vision Actuator \%SOURCEDIR%\External"
+@REM 	exit /b 1
+@REM )
+@REM if not exist %TARGETDIR%\acat_gestures_dll.dll (
+@REM 	copy .\%SOURCEDIR%\External\*.* %TARGETDIR%
+@REM )
+@REM if not exist %INSTALLDIR%\shape_predictor_68_face_landmarks.dat (
+@REM 	copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+@REM )
 rem ------------------------------------------------
 @echo Deploying TTSEngine dlls
 rem ------------------------------------------------

From 27b0e769cb85a4947ceeee91829cd7fd13e58b35 Mon Sep 17 00:00:00 2001
From: "Beale, Michael" <michael.beale@intel.com>
Date: Wed, 30 Apr 2025 07:02:29 -0700
Subject: [PATCH 4/6] Refactor actuator deployment section in deploy.bat to
 streamline file copying and improve readability

---
 src/deploy.bat | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/deploy.bat b/src/deploy.bat
index c65f8579..29ce5624 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -97,30 +97,20 @@ if not exist %TARGETDIR% mkdir %TARGETDIR%
 if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
 if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
 
-@REM rem ------------------------------------------------
-@REM @echo Actuators
-@REM rem ------------------------------------------------
-
-@REM set SOURCEDIR=Extensions\Default\Actuators\CameraActuator
-@REM set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
-@REM echo TargetDir is %TARGETDIR%
-@REM if not exist %TARGETDIR% mkdir %TARGETDIR%
-@REM copy .\%SOURCEDIR%\bin\%CONFIG%\CameraActuator.dll %TARGETDIR%
-@REM copy .\%SOURCEDIR%\bin\%CONFIG%\*.exe %TARGETDIR%
-@REM if not exist .\%SOURCEDIR%\External (
-@REM 	echo "*** ERROR *** Could not find External dependencies for the Vision Actuator \%SOURCEDIR%\External"
-@REM 	exit /b 1
-@REM )
-@REM if not exist %TARGETDIR%\acat_gestures_dll.dll (
-@REM 	copy .\%SOURCEDIR%\External\*.* %TARGETDIR%
-@REM )
-@REM if not exist %INSTALLDIR%\shape_predictor_68_face_landmarks.dat (
-@REM 	copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
-@REM )
+rem ------------------------------------------------
+@echo Actuators
+rem ------------------------------------------------
+set SOURCEDIR=Extensions\Default\Actuators\CameraActuator\bin\%CONFIG%\
+set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
+echo TargetDir is %TARGETDIR%
+if not exist %TARGETDIR% mkdir %TARGETDIR%
+copy %SOURCEDIR%\CameraActuator.dll %TARGETDIR%
+copy %SOURCEDIR%\External\*.* %TARGETDIR%
+copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+
 rem ------------------------------------------------
 @echo Deploying TTSEngine dlls
 rem ------------------------------------------------
-:Next
 set SOURCEDIR=Extensions\Default\TTSEngines\SAPIEngine
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%

From f61a0c88f80353aed5bd9ffd56872eb99faf93f2 Mon Sep 17 00:00:00 2001
From: "Beale, Michael" <michael.beale@intel.com>
Date: Wed, 30 Apr 2025 16:38:18 -0700
Subject: [PATCH 5/6] Refactor deploy.bat to improve error handling and
 streamline file copying

---
 src/ACATResources/ACATResources.csproj        |  60 ++++----
 .../CameraActuator/CameraActuator.csproj      | 102 +++++++-------
 src/deploy.bat                                | 132 ++++++++++++------
 3 files changed, 171 insertions(+), 123 deletions(-)

diff --git a/src/ACATResources/ACATResources.csproj b/src/ACATResources/ACATResources.csproj
index 74db04e2..05319205 100644
--- a/src/ACATResources/ACATResources.csproj
+++ b/src/ACATResources/ACATResources.csproj
@@ -66,95 +66,95 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="en\KeyboardABCUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardEditUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardLockUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardModesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardNumberNumericKeypadUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\MenuUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\NumericUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\PhrasesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\TalkApplicationBCIScannerNewUI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\TTSYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlContainerForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlScreenLock.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlDefaultTryout.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardAbcUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\ScanTimeAdjustForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlTalkInterfaceDesc.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionSetModeScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardNumbersUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardEditUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\MainMenu.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\SentencePredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardQwertyUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\PanelConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
       <SubType>Designer</SubType>
     </Content>
     <Content Include="en\TalkApplicationScannerQwerty.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\YesNoResponseScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\YesNoScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj b/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
index 52511939..c71b3754 100644
--- a/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
+++ b/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
@@ -38,7 +38,7 @@
     <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -132,154 +132,152 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="External\acat_gestures.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <Content Include="External\acat_gestures.exe" />
     <Content Include="External\acat_gestures_dll.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\acat_gestures_dll_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libinfra.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libinfra_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libivcp.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libivcp_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libpipeline.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libpipeline_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\msvcp110.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\msvcr110.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_calib3d2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_calib3d2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_contrib2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_contrib2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_core2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_core2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_features2d2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_features2d2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ffmpeg2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_flann2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_flann2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_gpu2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_gpu2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_highgui2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_highgui2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_imgproc2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_imgproc2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_legacy2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_legacy2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ml2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ml2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_nonfree2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_nonfree2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_objdetect2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_objdetect2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ocl2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ocl2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_photo2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_photo2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_stitching2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_stitching2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_superres2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_superres2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_video2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_video2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_videostab2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_videostab2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="External\shape_predictor_68_face_landmarks.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/deploy.bat b/src/deploy.bat
index 29ce5624..377eea24 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -1,4 +1,4 @@
-rem @echo off
+@echo off
 
 set CONFIG=%2
 
@@ -18,15 +18,19 @@ if "%CONFIG%"=="Debug" (
 )
 set INSTALLDIR=.\Applications\ACATApp\bin\%CONFIG%
 
+echo Deploying ACAT to %INSTALLDIR%
 cd %1
 
+echo Current Directory is %CD%
+
+
 rem ------------------------------------------------
 @echo Deploying Install files
 rem ------------------------------------------------
 
-set SOURCEDIR=Applications\Install\Users
-set TARGETDIR=%INSTALLDIR%\Install\Users
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+set SOURCEDIR=Applications\Install\Users\
+set TARGETDIR=%INSTALLDIR%\Install\Users\
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
 
 set LANGUAGE=en
 
@@ -36,7 +40,7 @@ if not exist %SOURCEDIR% (
 	echo ERROR: %SOURCEDIR% does not exist
 	exit /b 1
 )
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
 
 rem ------------------------------------------------
 @echo Deploying ConvAssist
@@ -53,15 +57,15 @@ if not exist %TARGETDIR% (
 if not exist %SOURCEDIR%\ConvAssist\ (
 	powershell -Command "Expand-Archive -Force -Path %SOURCEDIR%\ConvAssist.zip -Destination %SOURCEDIR%\ConvAssist"
 )
-xcopy /s /y /e /i %SOURCEDIR%\ConvAssist\* %TARGETDIR%
+call :safe_xcopy /s /y /e /i %SOURCEDIR%\ConvAssist\* %TARGETDIR%
 
 :DeployAssets
 rem ------------------------------------------------
 @echo Deploying Assets
 rem ------------------------------------------------
-set SOURCEDIR=Assets
+set SOURCEDIR=Assets\
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
 
 rem ------------------------------------------------
 @echo Deploying UI dlls
@@ -70,14 +74,14 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\UI\Scanners
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
 
 set SOURCEDIR=Extensions\Default\UI\Menus
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR%
-copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
 
 rem ------------------------------------------------
 @echo Deploying English Language UI DLL's
@@ -88,25 +92,32 @@ set BASEDIR=Extensions\Default\UI
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
 
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 rem ------------------------------------------------
-@echo Actuators
+@echo Deploying Camera Actuator
 rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\Actuators\CameraActuator\bin\%CONFIG%\
 set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
 echo TargetDir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy %SOURCEDIR%\CameraActuator.dll %TARGETDIR%
-copy %SOURCEDIR%\External\*.* %TARGETDIR%
-copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+call :safe_copy %SOURCEDIR%\CameraActuator.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+set SOURCEDIR=Extensions\Default\Actuators\CameraActuator\External\
+call :safe_xcopy %SOURCEDIR% %TARGETDIR%
+if errorlevel 1 exit /b 1
+call :safe_copy .\%SOURCEDIR%shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying TTSEngine dlls
@@ -114,12 +125,14 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\TTSEngines\SAPIEngine
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\SAPIEngine.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\SAPIEngine.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=Extensions\Default\TTSEngines\TTSClient
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\TTSClient.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\TTSClient.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying SpellChecker dlls
@@ -128,7 +141,8 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\SpellCheckers\SpellCheck
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\SpellCheck.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\SpellCheck.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying AppAgents dlls
@@ -139,18 +153,24 @@ set EXTENSIONSBASE=Extensions\Default
 set SOURCEDIR=%EXTENSIONSBASE%\AppAgents\%AGENT%
 set TARGETDIR=%INSTALLDIR%\%EXTENSIONSBASE%\AppAgents\%AGENT%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
-if exist %SOURCEDIR%\*.xml copy %SOURCEDIR%\*.xml %TARGETDIR%
-if exist %SOURCEDIR%\Config\*.xml copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\*.xml call :safe_copy %SOURCEDIR%\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\Config\*.xml call :safe_copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set AGENT=TalkApplicationScannerAgent
 set EXTENSIONSBASE=Extensions\Default
 set SOURCEDIR=%EXTENSIONSBASE%\AppAgents\%AGENT%
 set TARGETDIR=%INSTALLDIR%\%EXTENSIONSBASE%\AppAgents\%AGENT%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
-if exist %SOURCEDIR%\*.xml copy %SOURCEDIR%\*.xml %TARGETDIR%
-if exist %SOURCEDIR%\Config\*.xml copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\*.xml call :safe_copy %SOURCEDIR%\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\Config\*.xml call :safe_copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ACAT WordPredictor dlls
@@ -159,7 +179,8 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\WordPredictors\ConvAssist
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ACAT UserControls
@@ -169,8 +190,10 @@ rem ------------------------------------------------
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 
 rem ------------------------------------------------
@@ -181,7 +204,8 @@ set LANGUAGE=en
 set SOURCEDIR=ACATResources\bin\%CONFIG%\%LANGUAGE%
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\*.* %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\*.* %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 
 rem ------------------------------------------------
@@ -189,14 +213,16 @@ rem ------------------------------------------------
 rem ------------------------------------------------
 set SHARED_LIB_DIR=%INSTALLDIR%\SharedLibs
 if not exist %SHARED_LIB_DIR% mkdir %SHARED_LIB_DIR%
-copy Redistributable\*.*  %SHARED_LIB_DIR%
+call :safe_copy Redistributable\*.*  %SHARED_LIB_DIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying Docs
 rem ------------------------------------------------
 set TARGETDIR=%INSTALLDIR%\Docs
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-xcopy /s /y /e /i Docs\*.* %TARGETDIR% 
+call :safe_xcopy Docs\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying BCI Extensions
@@ -208,19 +234,43 @@ echo Install Dir is %INSTALLDIR%
 set TARGETDIR=%INSTALLDIR%\Extensions\BCI\Actuators\BCIActuator
 echo Target Dir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-copy .\%BCIEXTERNALSRCDIR%\brainflow.5.5.0\*.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+call :safe_copy .\%BCIEXTERNALSRCDIR%\brainflow.5.5.0\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set LANGUAGE=en
 set BASEDIR=Extensions\BCI\UI
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+echo Completed deploying ACAT to %INSTALLDIR%
+exit /b 0
+
+:safe_copy
+copy %1 %2
+echo ERRORLEVEL is %errorlevel%
+if errorlevel 1 (
+    echo Failed to copy %1 to %2
+    exit /b 1
+)
+goto :eof
+
+:safe_xcopy
+xcopy /E /Y %1 %2
+echo ERRORLEVEL is %errorlevel%
+if errorlevel 1 (
+    echo Failed to xcopy from %1 to %2
+    exit /b 1
+)
+goto :eof
\ No newline at end of file

From 9336a357995435b24b51401ec89ddf6318a74a0b Mon Sep 17 00:00:00 2001
From: Michael Beale <michael.beale@intel.com>
Date: Thu, 1 May 2025 07:33:38 -0700
Subject: [PATCH 6/6] Update deploy.bat

---
 src/deploy.bat | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/deploy.bat b/src/deploy.bat
index 377eea24..98f22aa1 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -31,6 +31,7 @@ rem ------------------------------------------------
 set SOURCEDIR=Applications\Install\Users\
 set TARGETDIR=%INSTALLDIR%\Install\Users\
 call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 set LANGUAGE=en
 
@@ -41,6 +42,7 @@ if not exist %SOURCEDIR% (
 	exit /b 1
 )
 call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ConvAssist
@@ -58,6 +60,7 @@ if not exist %SOURCEDIR%\ConvAssist\ (
 	powershell -Command "Expand-Archive -Force -Path %SOURCEDIR%\ConvAssist.zip -Destination %SOURCEDIR%\ConvAssist"
 )
 call :safe_xcopy /s /y /e /i %SOURCEDIR%\ConvAssist\* %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 :DeployAssets
 rem ------------------------------------------------
@@ -66,6 +69,7 @@ rem ------------------------------------------------
 set SOURCEDIR=Assets\
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying UI dlls
@@ -75,13 +79,18 @@ set SOURCEDIR=Extensions\Default\UI\Scanners
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
 if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=Extensions\Default\UI\Menus
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
 call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
 call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying English Language UI DLL's
@@ -93,7 +102,10 @@ set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
 if not exist %TARGETDIR% mkdir %TARGETDIR%
 if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
 if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
@@ -273,4 +285,4 @@ if errorlevel 1 (
     echo Failed to xcopy from %1 to %2
     exit /b 1
 )
-goto :eof
\ No newline at end of file
+goto :eof