Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / msvc / install.bat

diff --git a/msvc/install.bat b/msvc/install.bat
index e9344e20f89358a3cb109a30d4494692c8579163..1a433991a7d53c754281b49475de26e4b88d6cde 100644 (file)
--- a/msvc/install.bat
+++ b/msvc/install.bat
@@ -6,8 +6,12 @@ SET BUILD_DIR=%3
 SET INSTALL_DIR=%4
 SET ARGUMENTS=%5
 
+SET XCOPY_COMMAND=%windir%\system32\xcopy
+
 SET BUILD_DIR=%BUILD_DIR:"=%
+SET BUILD_DIR=%BUILD_DIR:/=\%
 SET INSTALL_DIR=%INSTALL_DIR:"=%
+SET INSTALL_DIR=%INSTALL_DIR:/=\%
 
 IF "" == "%PLATFORM%" (
        ECHO Error: No platform parameter set.
@@ -62,15 +66,15 @@ IF "-v" == "%ARGUMENTS%" (
 )
 
 IF "-q" == "%ARGUMENTS%" (
-       SET "OPTIONS=/s /e /q /y ^>nul"
+       SET "OPTIONS=/s /e /q /y"
 )
 
-ECHO Installing mono build %PLATFORM% %CONFIG% from %BUILD_DIR% into %INSTALL_DIR% ...
+ECHO Installing mono build %PLATFORM% %CONFIG% from %PACKAGE_DIR% into %INSTALL_DIR% ...
 
-SET RUN=xcopy "%PACKAGE_DIR%\*.*" "%INSTALL_DIR%" %OPTIONS%
-%RUN%
+SET RUN=%XCOPY_COMMAND% "%PACKAGE_DIR%\*.*" "%INSTALL_DIR%" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
 
-ECHO Installing of mono build %PLATFORM% %CONFIG% from %BUILD_DIR% into %INSTALL_DIR% DONE. 
+ECHO Installing of mono build %PLATFORM% %CONFIG% from %PACKAGE_DIR% into %INSTALL_DIR% DONE.
 
 EXIT /b 0
 
@@ -79,4 +83,14 @@ EXIT /b 0
        EXIT /b 1
 
 @ECHO on
+
+:runCommand
+
+       IF "-q" == "%~2" (
+               %~1 >nul 2>&1
+       ) ELSE (
+               %~1
+       )
+
+goto :EOF
        
\ No newline at end of file