Win Installer: improved error checking

git-svn-id: trunk@37986 -
This commit is contained in:
martin 2012-07-21 11:55:16 +00:00
parent 9e5d5eee7b
commit 01d274cc4c

View File

@ -72,12 +72,14 @@ SET PATH=%FPCBINDIR%
:: copy lazarus dir :: copy lazarus dir
rmdir /s /q %BUILDDIR% rmdir /s /q %BUILDDIR%
%SVN% export %LAZSVNDIR% %BUILDDIR% >> %LOGFILE% %SVN% export %LAZSVNDIR% %BUILDDIR% >> %LOGFILE%
IF %ERRORLEVEL% NEQ 0 GOTO SVNERR
call svn2revisioninc.bat %LAZSVNDIR% %BUILDDIR%\ide\revision.inc call svn2revisioninc.bat %LAZSVNDIR% %BUILDDIR%\ide\revision.inc
call build-fpc.bat call build-fpc.bat
:: INSTALL_BINDIR is set by build-fpc.bat :: INSTALL_BINDIR is set by build-fpc.bat
%SVN% export %FPCBINDIR% %BUILDDIR%\fpcbins >> %LOGFILE% %SVN% export %FPCBINDIR% %BUILDDIR%\fpcbins >> %LOGFILE%
IF %ERRORLEVEL% NEQ 0 GOTO SVNERR
mv %BUILDDIR%\fpcbins\*.* %INSTALL_BINDIR% mv %BUILDDIR%\fpcbins\*.* %INSTALL_BINDIR%
%FPCBINDIR%\rm -rf %BUILDDIR%\fpcbins %FPCBINDIR%\rm -rf %BUILDDIR%\fpcbins
del %INSTALL_BINDIR%\gdb.exe del %INSTALL_BINDIR%\gdb.exe
@ -113,11 +115,16 @@ if not [%IDE_WIDGETSET%]==[win32] SET OutputFileName=lazarus-%IDE_WIDGETSET%-%LA
%ISCC% lazarus.iss >> installer.log %ISCC% lazarus.iss >> installer.log
:: do not delete build dir, if installer failed. :: do not delete build dir, if installer failed.
if not exist output\%OutputFileName%.exe goto END if not exist "output\%OutputFileName%.exe" goto END
:: delete build dir :: delete build dir
rd /s /q %BUILDDIR% > NUL rd /s /q %BUILDDIR% > NUL
GOTO END
:SVNERR
echo SVN failed
:END :END
SET PATH=%OLDPATH% SET PATH=%OLDPATH%