From 51870b34bd1810497f2f77c1bc4c960a1fe614f2 Mon Sep 17 00:00:00 2001 From: lateralusX Date: Tue, 12 Apr 2016 14:14:58 +0200 Subject: Better property manager and user macros support. * Added support for user macros in order to set build/install/sgen. * Added support for more arguments to bat files + support for quoted paths. * Added support for verbose/quite output in bat files. * Moved libmono xcopy post build step into separate bat file. * Cleaned some sgen configs still left in vcxprojs. --- msvc/package.bat | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'msvc/package.bat') diff --git a/msvc/package.bat b/msvc/package.bat index ab192282988..d9eb9e020c3 100644 --- a/msvc/package.bat +++ b/msvc/package.bat @@ -3,6 +3,9 @@ SET PLATFORM=%1 SET CONFIG=%2 SET BUILD_DIR=%3 +SET ARGUMENTS=%4 + +SET BUILD_DIR=%BUILD_DIR:"=% IF "" == "%PLATFORM%" ( ECHO Error: No platform parameter set. @@ -40,27 +43,49 @@ 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 ^>nul" +) + 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 +mkdir "%PACKAGE_DIR%" +mkdir "%PACKAGE_DIR%\include\mono-2.0" + +SET RUN=xcopy ".\include\*.*" "%PACKAGE_DIR%\include\mono-2.0\" %OPTIONS% +%RUN% + +SET RUN=xcopy "%BUILD_DIR%\%PLATFORM%\lib\%CONFIG%\*.lib" "%PACKAGE_DIR%\lib\" %OPTIONS% +%RUN% + +SET RUN=xcopy "%BUILD_DIR%\%PLATFORM%\lib\%CONFIG%\*.pdb" "%PACKAGE_DIR%\lib\" %OPTIONS% +%RUN% + +SET RUN=xcopy "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.exe" "%PACKAGE_DIR%\bin\" %OPTIONS% +%RUN% + +SET RUN=xcopy "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.dll" "%PACKAGE_DIR%\bin\" %OPTIONS% +%RUN% -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 "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.pdb" "%PACKAGE_DIR%\bin\" %OPTIONS% +%RUN% -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 "%BUILD_DIR%\%PLATFORM%\bin\%CONFIG%\*.lib" "%PACKAGE_DIR%\bin\" %OPTIONS% +%RUN% 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 -- cgit v1.2.3