From eeb469ffc5d13062ac527d3f7d0d3cd0abb509d9 Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Sun, 8 Mar 2015 12:46:00 +0100 Subject: [PATCH] add install to build me batch --- build/cmake/build-me.bat | 45 ++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/build/cmake/build-me.bat b/build/cmake/build-me.bat index 41394c5..d08d704 100644 --- a/build/cmake/build-me.bat +++ b/build/cmake/build-me.bat @@ -52,29 +52,32 @@ cmake --build . --config Release >> %TMPLOG% 2>&1 :DNTINST @echo. -@echo No install at this time, but there is a updexe.bat to copy the EXE to c:\MDOS... -@goto END - +@REM echo No install at this time, but there is a updexe.bat to copy the EXE to c:\MDOS... +@REM goto END @echo Continue with install? Only Ctrl+c aborts... @pause cmake --build . --config Debug --target INSTALL >> %TMPLOG% 2>&1 -@if EXIST install_manifest.txt ( -@copy install_manifest.txt install_manifest_dbg.txt >nul -@echo. >> %TMPINS%/installed.txt -@echo = %TMPRJ% Debug install %DATE% %TIME% >> %TMPINS%/installed.txt -@type install_manifest.txt >> %TMPINS%/installed.txt -) +@if ERRORLEVEL 1 goto ERR4 +@REM if EXIST install_manifest.txt ( +@REM copy install_manifest.txt install_manifest_dbg.txt >nul +@REM echo. >> %TMPINS%/installed.txt +@REM echo = %TMPRJ% Debug install %DATE% %TIME% >> %TMPINS%/installed.txt +@REM type install_manifest.txt >> %TMPINS%/installed.txt +@REM ) cmake --build . --config Release --target INSTALL >> %TMPLOG% 2>&1 -@if EXIST install_manifest.txt ( -@copy install_manifest.txt install_manifest_rel.txt >nul -@echo. >> %TMPINS%/installed.txt -@echo = %TMPRJ% Release install %DATE% %TIME% >> %TMPINS%/installed.txt -@type install_manifest.txt >> %TMPINS%/installed.txt -) +@if ERRORLEVEL 1 goto ERR5 +@REM if EXIST install_manifest.txt ( +@REM copy install_manifest.txt install_manifest_rel.txt >nul +@REM echo. >> %TMPINS%/installed.txt +@REM echo = %TMPRJ% Release install %DATE% %TIME% >> %TMPINS%/installed.txt +@REM type install_manifest.txt >> %TMPINS%/installed.txt +@REM ) + +@fa4 " -- " %TMPLOG% @call elapsed %TMPBGN% @echo All done... see %TMPLOG% @@ -101,11 +104,21 @@ cmake --build . --config Release --target INSTALL >> %TMPLOG% 2>&1 @echo ERROR: Cmake build Debug FAILED! >> %TMPLOG% @goto ISERR -:ERR1 +:ERR3 @echo ERROR: Cmake build Release FAILED! @echo ERROR: Cmake build Release FAILED! >> %TMPLOG% @goto ISERR +:ERR4 +@echo ERROR: Install Debug FAILED! +@echo ERROR: Install Debug FAILED! >> %TMPLOG% +@goto ISERR + +:ERR5 +@echo ERROR: Install Release FAILED! +@echo ERROR: Install Release FAILED! >> %TMPLOG% +@goto ISERR + :ISERR @echo See %TMPLOG% for details... @endlocal