Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / msvc / package.bat

diff --git a/msvc/package.bat b/msvc/package.bat
index ab19228298830f1d67f30124076813f896a6a528..df29a8ba6f2d0819476f7685fe8143dc1c5efe41 100644 (file)
--- a/msvc/package.bat
+++ b/msvc/package.bat
@@ -3,6 +3,12 @@
 SET PLATFORM=%1
 SET CONFIG=%2
 SET BUILD_DIR=%3
+SET ARGUMENTS=%4
+
+SET XCOPY_COMMAND=%windir%\system32\xcopy
+
+SET BUILD_DIR=%BUILD_DIR:"=%
+SET BUILD_DIR=%BUILD_DIR:/=\%
 
 IF "" == "%PLATFORM%" (
        ECHO Error: No platform parameter set.
@@ -40,27 +46,59 @@ IF NOT EXIST %BUILD_DIR%\%PLATFORM%\bin\%CONFIG% (
 
 SET PACKAGE_DIR=%BUILD_DIR%\package\%PLATFORM%\%CONFIG%
 
+SET OPTIONS=/s /e /y
+
+IF "-v" == "%ARGUMENTS%" (
+       SET OPTIONS=/f /s /e /y
+)
+
+IF "-q" == "%ARGUMENTS%" (
+       SET "OPTIONS=/s /e /q /y"
+)
+
 ECHO Packaging mono build %PLATFORM% %CONFIG% into '%PACKAGE_DIR%' ...
 
 IF EXIST %PACKAGE_DIR% rmdir %PACKAGE_DIR% /s /q
 mkdir %PACKAGE_DIR%
 mkdir %PACKAGE_DIR%\include\mono-2.0
-xcopy .\include\*.* %PACKAGE_DIR%\include\mono-2.0\ /s /e /q /y > nul
 
-xcopy %BUILD_DIR%\%PLATFORM%\lib\%CONFIG%\*.lib %PACKAGE_DIR%\lib\ /s /e /q /y > nul
-xcopy %BUILD_DIR%\%PLATFORM%\lib\%CONFIG%\*.pdb %PACKAGE_DIR%\lib\ /s /e /q /y > nul
+SET RUN=%XCOPY_COMMAND% ".\include\*.*" "%PACKAGE_DIR%\include\mono-2.0\" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
+
+SET RUN=%XCOPY_COMMAND% "%BUILD_DIR%\%PLATFORM%\lib\%CONFIG%\*.lib" "%PACKAGE_DIR%\lib\" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
 
-xcopy %BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.exe %PACKAGE_DIR%\bin\ /s /e /q /y > nul
-xcopy %BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.dll %PACKAGE_DIR%\bin\ /s /e /q /y > nul
-xcopy %BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.pdb %PACKAGE_DIR%\bin\ /s /e /q /y > nul
-xcopy %BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.lib %PACKAGE_DIR%\bin\ /s /e /q /y > nul
+SET RUN=%XCOPY_COMMAND% "%BUILD_DIR%\%PLATFORM%\lib\%CONFIG%\*.pdb" "%PACKAGE_DIR%\lib\" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
+
+SET RUN=%XCOPY_COMMAND% "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.exe" "%PACKAGE_DIR%\bin\" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
+
+SET RUN=%XCOPY_COMMAND% "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.dll" "%PACKAGE_DIR%\bin\" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
+
+SET RUN=%XCOPY_COMMAND% "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.pdb" "%PACKAGE_DIR%\bin\" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
+
+SET RUN=%XCOPY_COMMAND% "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.lib" "%PACKAGE_DIR%\bin\" %OPTIONS%
+call :runCommand "%RUN%" %ARGUMENTS%
 
 ECHO Packaging of mono build %PLATFORM% %CONFIG% into '%PACKAGE_DIR%' DONE. 
 
 EXIT /b 0
 
 :ON_ERROR
-       ECHO "package.bat [win32|x64] [Debug|Release] [MONO_BUILD_DIR_PREFIX]"
+       ECHO "package.bat [win32|x64] [Debug|Release] [MONO_BUILD_DIR_PREFIX] [ARGUMENTS]"
        EXIT /b 1
 
 @ECHO on
+
+:runCommand
+
+       IF "-q" == "%~2" (
+               %~1 >nul 2>&1
+       ) ELSE (
+               %~1
+       )
+
+goto :EOF