Skip to content

Commit 6e8f085

Browse files
committed
Add missing pdb files
1 parent 88ba7c3 commit 6e8f085

File tree

2 files changed

+25
-9
lines changed

2 files changed

+25
-9
lines changed

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ if "%FB2_SNAPSHOT%"=="1" (
163163
)
164164

165165
:: Set up our final destination
166-
set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
166+
@set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
167167
@if not exist "%FBBUILD_INSTALL_IMAGES%" ( mkdir "%FBBUILD_INSTALL_IMAGES%" )
168168

169169
:: Determine Product Status
@@ -248,17 +248,28 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
248248

249249
@if "%FBBUILD_SHIP_PDB%"=="ship_pdb" (
250250
echo Copying pdb files...
251+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\chacha\chacha.pdb %FB_OUTPUT_DIR%\plugins\ > nul
252+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\default_profiler\default_profiler.pdb %FB_OUTPUT_DIR%\plugins\ > nul
253+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\engine\engine*.pdb %FB_OUTPUT_DIR%\plugins\ > nul
254+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fb_lock_print\fb_lock_print.pdb %FB_OUTPUT_DIR%\ > nul
251255
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbserver\firebird.pdb %FB_OUTPUT_DIR%\ > nul
252-
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\burp\burp.pdb %FB_OUTPUT_DIR%\gbak.pdb > nul
256+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbsvcmgr\fbsvcmgr.pdb %FB_OUTPUT_DIR%\ > nul
257+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtrace\fbtrace.pdb %FB_OUTPUT_DIR%\plugins\ > nul
258+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtracemgr\fbtracemgr.pdb %FB_OUTPUT_DIR%\ > nul
259+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gbak\gbak.pdb %FB_OUTPUT_DIR%\ > nul
253260
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gfix\gfix.pdb %FB_OUTPUT_DIR%\ > nul
261+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\gstat\gstat.pdb %FB_OUTPUT_DIR%\ > nul
262+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\ib_util\ib_util.pdb %FB_OUTPUT_DIR%\ > nul
263+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\intl\fbintl.pdb %FB_OUTPUT_DIR%\intl\ > nul
254264
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\isql\isql.pdb %FB_OUTPUT_DIR%\ > nul
255-
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\yvalve\fbclient.pdb %FB_OUTPUT_DIR%\ > nul
256-
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\engine\engine*.pdb %FB_OUTPUT_DIR%\plugins\ > nul
257-
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtrace\fbtrace.pdb %FB_OUTPUT_DIR%\plugins\ > nul
258265
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\legacy_auth\legacy_auth.pdb %FB_OUTPUT_DIR%\plugins\ > nul
259266
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\legacy_usermanager\legacy_usermanager.pdb %FB_OUTPUT_DIR%\plugins\ > nul
267+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\nbackup\nbackup.pdb %FB_OUTPUT_DIR%\ > nul
260268
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\srp\srp.pdb %FB_OUTPUT_DIR%\plugins\ > nul
269+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udf_compat\udf_compat.pdb %FB_OUTPUT_DIR%\plugins\udr\ > nul
270+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udrcpp_example\udrcpp_example.pdb %FB_OUTPUT_DIR%\plugins\udr\ > nul
261271
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udr_engine\udr_engine.pdb %FB_OUTPUT_DIR%\plugins\ > nul
272+
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\yvalve\fbclient.pdb %FB_OUTPUT_DIR%\ > nul
262273
)
263274

264275
@echo Started copying docs...
@@ -383,8 +394,9 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
383394
call :ERROR Could not generate MSVCC Runtime MSI %MSVC_RUNTIME_LIBRARY_VERSION% & goto :EOF
384395
)
385396
)
386-
) else (
387-
echo Using an existing build of %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi
397+
) else (
398+
echo Using an existing build of %FB_OUTPUT_DIR%\system32\vccrt%MSVC_RUNTIME_LIBRARY_VERSION%_%FB_TARGET_PLATFORM%.msi
399+
)
388400
)
389401

390402
::End of BUILD_CRT_MSI

builds/install/arch-specific/win32/FirebirdInstall.iss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,9 +607,13 @@ Source: {#FilesDir}\examples\*.*; DestDir: {app}\examples; Components: DevAdminC
607607
#ifdef ship_pdb
608608
Source: {#FilesDir}\fbclient.pdb; DestDir: {app}; Components: ClientComponent;
609609
Source: {#FilesDir}\firebird.pdb; DestDir: {app}; Components: ServerComponent;
610+
Source: {#FilesDir}\fbtracemgr.pdb; DestDir: {app}; Components: DevAdminComponent;
611+
Source: {#FilesDir}\intl\fbintl.pdb; DestDir: {app}\intl; Components: DevAdminComponent;
610612
Source: {#FilesDir}\gbak.pdb; DestDir: {app}; Components: DevAdminComponent;
611613
Source: {#FilesDir}\gfix.pdb; DestDir: {app}; Components: DevAdminComponent;
614+
Source: {#FilesDir}\ib_util.pdb; DestDir: {app}; Components: ServerComponent;
612615
Source: {#FilesDir}\isql.pdb; DestDir: {app}; Components: ClientComponent;
616+
Source: {#FilesDir}\nbackup.pdb; DestDir: {app}; Components: DevAdminComponent;
613617
Source: {#FilesDir}\plugins\*.pdb; DestDir: {app}\plugins; Components: ServerComponent;
614618
#if PlatformTarget == "x64"
615619
Source: {#WOW64Dir}\fbclient.pdb; DestDir: {app}\WOW64; Components: ClientComponent;
@@ -718,8 +722,8 @@ begin
718722
if ((pos('HELP',Uppercase(CommandLine)) > 0) or
719723
(pos('--',Uppercase(CommandLine)) > 0) )
720724
// or
721-
// (pos('/?',Uppercase(CommandLine)) > 0) or // InnoSetup displays its own help if these switches are passed.
722-
// (pos('/H',Uppercase(CommandLine)) > 0) ) // Note also that our help scren only appears after the Choose Language dialogue :-(
725+
// (pos('/?',Uppercase(CommandLine)) > 0) or // InnoSetup displays its own help if these switches are passed.
726+
// (pos('/H',Uppercase(CommandLine)) > 0) ) // Note also that our help screen only appears after the Choose Language dialogue :-(
723727
then begin
724728
ShowHelpDlg;
725729
result := False;

0 commit comments

Comments
 (0)