|
16 | 16 | :: |
17 | 17 | ::============================================================================= |
18 | 18 | @echo off |
| 19 | +set SCRIPT_FULL_NAME=%~d0%~p0%~n0%~x0 |
| 20 | +set SCRIPT_SHORT_NAME=%~n0%~x0 |
19 | 21 |
|
20 | 22 | @goto :MAIN |
21 | 23 | @goto :EOF |
@@ -67,13 +69,13 @@ if "%FB2_SNAPSHOT%"=="1" ( |
67 | 69 | :: let's bail out now. |
68 | 70 |
|
69 | 71 | @echo o Checking for sed... |
70 | | -@(cmd /c "sed.exe --version 2>&1 | findstr version > nul ") || ( call :ERROR Could not locate sed & goto :EOF ) |
| 72 | +@(cmd /c "sed.exe --version 2>&1 > nul ") || ( call :ERROR Could not locate sed & goto :EOF ) |
71 | 73 |
|
72 | 74 | @echo o Checking for unix2dos... |
73 | | -@( cmd /c "unix2dos.exe --version 2>&1 | findstr version > nul" ) || ( call :ERROR Could not locate unix2dos & goto :EOF ) |
| 75 | +@(cmd /c "unix2dos.exe --quiet --version 2>&1 > nul" ) || ( call :ERROR Could not locate unix2dos & goto :EOF ) |
74 | 76 |
|
75 | 77 | @for /f "usebackq tokens=*" %%c in ( `where /f md5sum 2^>nul` ) do set MD5_COMMAND=%%c |
76 | | -if defined MD5_COMMAND ( |
| 78 | +@if defined MD5_COMMAND ( |
77 | 79 | echo o POSIX md5sum utility found at %MD5_COMMAND% |
78 | 80 | ) |
79 | 81 |
|
@@ -243,17 +245,27 @@ if defined MD5_COMMAND ( |
243 | 245 |
|
244 | 246 | @if "%FBBUILD_SHIP_PDB%"=="ship_pdb" ( |
245 | 247 | echo Copying pdb files... |
| 248 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\chacha\chacha.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
| 249 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\engine\engine*.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
| 250 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fb_lock_print\fb_lock_print.pdb %FB_OUTPUT_DIR%\ > nul |
246 | 251 | copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbserver\firebird.pdb %FB_OUTPUT_DIR%\ > nul |
247 | | - copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\burp\burp.pdb %FB_OUTPUT_DIR%\gbak.pdb > nul |
| 252 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbsvcmgr\fbsvcmgr.pdb %FB_OUTPUT_DIR%\ > nul |
| 253 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtrace\fbtrace.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
| 254 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtracemgr\fbtracemgr.pdb %FB_OUTPUT_DIR%\ > nul |
| 255 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gbak\gbak.pdb %FB_OUTPUT_DIR%\ > nul |
248 | 256 | copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gfix\gfix.pdb %FB_OUTPUT_DIR%\ > nul |
| 257 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gstat\gstat.pdb %FB_OUTPUT_DIR%\ > nul |
| 258 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\ib_util\ib_util.pdb %FB_OUTPUT_DIR%\ > nul |
| 259 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\intl\fbintl.pdb %FB_OUTPUT_DIR%\intl\ > nul |
249 | 260 | copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\isql\isql.pdb %FB_OUTPUT_DIR%\ > nul |
250 | | - copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\yvalve\fbclient.pdb %FB_OUTPUT_DIR%\ > nul |
251 | | - copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\engine\engine*.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
252 | | - copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtrace\fbtrace.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
253 | 261 | copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\legacy_auth\legacy_auth.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
254 | 262 | copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\legacy_usermanager\legacy_usermanager.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
| 263 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\nbackup\nbackup.pdb %FB_OUTPUT_DIR%\ > nul |
255 | 264 | copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\srp\srp.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
| 265 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udf_compat\udf_compat.pdb %FB_OUTPUT_DIR%\plugins\udr\ > nul |
| 266 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udrcpp_example\udrcpp_example.pdb %FB_OUTPUT_DIR%\plugins\udr\ > nul |
256 | 267 | copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udr_engine\udr_engine.pdb %FB_OUTPUT_DIR%\plugins\ > nul |
| 268 | + copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\yvalve\fbclient.pdb %FB_OUTPUT_DIR%\ > nul |
257 | 269 | ) |
258 | 270 |
|
259 | 271 | @echo Started copying docs... |
@@ -598,7 +610,7 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do ( |
598 | 610 | :: errorlevel gets reset automatically so capture it before we lose it. |
599 | 611 | @set ERRLEV=%ERRORLEVEL% |
600 | 612 | @echo. |
601 | | -@echo Error %ERRLEV% in BuildExecutableInstall |
| 613 | +@echo Error code %ERRLEV% in %SCRIPT_SHORT_NAME% |
602 | 614 | @echo %* |
603 | 615 | @echo. |
604 | 616 | ::End of ERROR |
@@ -641,7 +653,6 @@ pushd ..\..\..\win32 |
641 | 653 | @call setenvvar.bat |
642 | 654 | @if ERRORLEVEL 1 ( popd & ( call :ERROR Failure after calling setenvvar.bat ) & goto :END ) |
643 | 655 | popd |
644 | | -@if errorlevel 1 (goto :END) |
645 | 656 |
|
646 | 657 | @if not defined FB2_ISS_DEBUG (set FB2_ISS_DEBUG=0) |
647 | 658 |
|
|
0 commit comments