Skip to content

Commit f7cbc20

Browse files
committed
Do not fail packaging if implib not found
Do not fail packaging if qsg is not found Fail packaging if ib_util.* not found white space
1 parent b20be9f commit f7cbc20

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

builds/install/arch-specific/win32/BuildExecutableInstall.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ if "%FB2_SNAPSHOT%"=="1" (
137137
::==========
138138

139139
:: Cut off everything that is not #define to let Inno Setup use it
140-
@findstr /B /L "#define" "%FB_ROOT_PATH%\src\jrd\build_no.h" >"%FB_ROOT_PATH%\gen\jrd\build_no.h"
140+
@findstr /B /L "#define" "%FB_ROOT_PATH%\src\jrd\build_no.h" > "%FB_ROOT_PATH%\gen\jrd\build_no.h"
141141
:: Read version parameters from build_no.h
142142
@for /F "tokens=2*" %%a in ( %FB_ROOT_PATH%\gen\jrd\build_no.h ) do (
143143
echo Setting %%a to %%~b
@@ -241,7 +241,7 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
241241
if not ERRORLEVEL 1 (
242242
implib %FB_OUTPUT_DIR%\lib\fbclient_bor.lib %FB_OUTPUT_DIR%\fbclient.dll > nul
243243
) else (
244-
call :ERROR implib not found & goto :EOF
244+
call :WARNING implib not found
245245
)
246246
)
247247

@@ -314,7 +314,7 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
314314
echo ... %%v
315315
copy /Y %FB_EXTERNAL_DOCS%\%%v %FB_OUTPUT_DIR%\doc\%%v > nul
316316
if ERRORLEVEL 1 (
317-
call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v to %FB_OUTPUT_DIR%\doc\%%v FAILED. & goto :EOF
317+
call :WARNING Copying %FB_EXTERNAL_DOCS%\%%v to %FB_OUTPUT_DIR%\doc\%%v FAILED.
318318
)
319319
)
320320

@@ -397,8 +397,8 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
397397
:: grab some missing bits'n'pieces from different parts of the source tree
398398
::=========================================================================
399399
@echo Copying ib_util etc
400-
@copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.h failed. & goto :EOF )
401-
@copy %FB_ROOT_PATH%\src\misc\pascal\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (call :WARNING Copying ib_util.pas failed. & goto :EOF )
400+
@copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul || (call :ERROR Copying ib_util.h failed. & goto :EOF )
401+
@copy %FB_ROOT_PATH%\src\misc\pascal\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (call :ERROR Copying ib_util.pas failed. & goto :EOF )
402402

403403
@echo Copying other include files required for development...
404404
@set OUTPATH=%FB_OUTPUT_DIR%\include

0 commit comments

Comments
 (0)