diff options
author | lateralusX <lateralusx.github@gmail.com> | 2016-06-02 12:34:15 +0300 |
---|---|---|
committer | lateralusX <lateralusx.github@gmail.com> | 2016-06-15 10:44:24 +0300 |
commit | 0e0002e2559cba3f97bf6d862f6b33e5adcabee0 (patch) | |
tree | 4f17c9f5139112edecbb19ba96d2af071c88912a /msvc/libmono.bat | |
parent | c60a49439ae36a3ea134e6d3f9e4e62062d8ac9c (diff) |
Fixed .bat file to handle xcopy command not in path.
Also added support to not always replace config.h/version.h since that triggers
unnecessary rebuilds during development. New script will check if there is
an actual difference in the config.h/version.h file before doing the copy.
Diffstat (limited to 'msvc/libmono.bat')
-rw-r--r-- | msvc/libmono.bat | 52 |
1 files changed, 33 insertions, 19 deletions
diff --git a/msvc/libmono.bat b/msvc/libmono.bat index d5501450f5e..6509ac127ca 100644 --- a/msvc/libmono.bat +++ b/msvc/libmono.bat @@ -4,8 +4,12 @@ SET SOURCE_ROOT=%1 SET TARGET_ROOT=%2 SET ARGUMENTS=%3 +SET XCOPY_COMMAND=%windir%\system32\xcopy + SET TARGET_ROOT=%TARGET_ROOT:"=% +SET TARGET_ROOT=%TARGET_ROOT:/=\% SET SOURCE_ROOT=%SOURCE_ROOT:"=% +SET SOURCE_ROOT=%SOURCE_ROOT:/=\% IF "" == "%SOURCE_ROOT%" ( ECHO Error: No source root parameter set. @@ -43,36 +47,36 @@ IF "-v" == "%ARGUMENTS%" ( ) IF "-q" == "%ARGUMENTS%" ( - SET "OPTIONS=/q /y ^>nul" + SET "OPTIONS=/q /y" ) -ECHO Copying mono include files from '%SOURCE_ROOT%' to '%TARGET_ROOT%' ... +ECHO Copying mono include files from %SOURCE_ROOT% to %TARGET_ROOT% ... -SET RUN=xcopy "%SOURCE_ROOT%\cil\opcode.def" "%TARGET_ROOT%\cil\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\cil\opcode.def" "%TARGET_ROOT%\cil\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -SET RUN=xcopy "%SOURCE_ROOT%\mini\jit.h" "%TARGET_ROOT%\jit\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\mini\jit.h" "%TARGET_ROOT%\jit\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -SET RUN=xcopy "%SOURCE_ROOT%\metadata\*.h" "%TARGET_ROOT%\metadata\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\metadata\*.h" "%TARGET_ROOT%\metadata\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -SET RUN=xcopy "%SOURCE_ROOT%\utils\mono-counters.h" "%TARGET_ROOT%\utils\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\utils\mono-counters.h" "%TARGET_ROOT%\utils\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -SET RUN=xcopy "%SOURCE_ROOT%\utils\mono-dl-fallback.h" "%TARGET_ROOT%\utils\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\utils\mono-dl-fallback.h" "%TARGET_ROOT%\utils\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -SET RUN=xcopy "%SOURCE_ROOT%\utils\mono-error.h" "%TARGET_ROOT%\utils\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\utils\mono-error.h" "%TARGET_ROOT%\utils\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -SET RUN=xcopy "%SOURCE_ROOT%\utils\mono-logger.h" "%TARGET_ROOT%\utils\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\utils\mono-logger.h" "%TARGET_ROOT%\utils\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -SET RUN=xcopy "%SOURCE_ROOT%\utils\mono-publib.h" "%TARGET_ROOT%\utils\" %OPTIONS% -%RUN% +SET RUN=%XCOPY_COMMAND% "%SOURCE_ROOT%\utils\mono-publib.h" "%TARGET_ROOT%\utils\" %OPTIONS% +call :runCommand "%RUN%" %ARGUMENTS% -ECHO Copying mono include files from '%SOURCE_ROOT%' to '%TARGET_ROOT%' DONE. +ECHO Copying mono include files from %SOURCE_ROOT% to %TARGET_ROOT% DONE. EXIT /b 0 @@ -81,3 +85,13 @@ EXIT /b 0 EXIT /b 1 @ECHO on + +:runCommand + + IF "-q" == "%~2" ( + %~1 >nul 2>&1 + ) ELSE ( + %~1 + ) + +goto :EOF |