From d3585454b9dd8650dd904c0e308da3e85f76d32d Mon Sep 17 00:00:00 2001 From: Paul Reeves Date: Mon, 1 Feb 2021 16:20:07 +0100 Subject: [PATCH] Do not let missing FB4 QSG break the packaging of RC1. --- .../win32/BuildExecutableInstall.bat | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat index b62ab24114..8c2c66e180 100644 --- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat +++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat @@ -303,11 +303,28 @@ for %%d in ( v3.0 v4.0 ) do ( :: an error if FB_EXTERNAL_DOCS is not defined. On the other hand, :: if the docs are available then we can include them. if defined FB_EXTERNAL_DOCS ( -@echo Copying pdf docs... -@for %%v in ( Firebird-%FB_MAJOR_VER%.%FB_MINOR_VER%-QuickStart.pdf Firebird_v%FB_MAJOR_VER%.%FB_MINOR_VER%.%FB_REV_NO%.ReleaseNotes.pdf ) do ( - @echo ... %%v - (@copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul) || (call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v failed.) -) + @echo Copying pdf docs... + @for %%v in ( Firebird_v%FB_MAJOR_VER%.%FB_MINOR_VER%.%FB_REV_NO%.ReleaseNotes.pdf ) do ( + @echo ... %%v + @copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul + if %ERRORLEVEL% GEQ 1 (call :ERROR Copying %FB_EXTERNAL_DOCS%\%%v failed.) + ) + + @for %%v in ( Firebird-%FB_MAJOR_VER%.%FB_MINOR_VER%-QuickStart.pdf ) do ( + @echo ... %%v + @copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul + if %ERRORLEVEL% GEQ 1 ( + REM - As of RC1 there is no quick start guide so we do not want + REM the packaging to fail for something that doesn't exist + if "%FBBUILD_FILENAME_SUFFIX%" == "_RC1" ( + echo Copying %FB_EXTERNAL_DOCS%\%%v failed. + ) else ( + call :ERROR Copying %FB_EXTERNAL_DOCS%\%%v failed. + ) + ) + ) + + @echo Finished copying pdf docs... @echo. ) @@ -744,6 +761,6 @@ if %FBBUILD_ISX_PACK% EQU 1 ( :END -exit /b +exit /b %ERRLEV%