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/install.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/install.bat')
-rw-r--r-- | msvc/install.bat | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/msvc/install.bat b/msvc/install.bat index 0baa5857f74..1a433991a7d 100644 --- 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. @@ -33,18 +37,10 @@ IF "\" == "%BUILD_DIR:~-1%" ( SET BUILD_DIR=%BUILD_DIR:~0,-1% ) -IF "/" == "%BUILD_DIR:~-1%" ( - SET BUILD_DIR=%BUILD_DIR:~0,-1% -) - IF "\" == "%INSTALL_DIR:~-1%" ( SET INSTALL_DIR=%INSTALL_DIR:~0,-1% ) -IF "/" == "%INSTALL_DIR:~-1%" ( - SET INSTALL_DIR=%INSTALL_DIR:~0,-1% -) - IF NOT EXIST %BUILD_DIR% ( ECHO Error: '%BUILD_DIR%', directory doesn't eixst. GOTO ON_ERROR @@ -70,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 @@ -87,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 |