firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:03:03 +01:00
Code Issues

Dynamically set FB_MAJOR_VER

Browse Source
This commit is contained in:
Paul Reeves 2024-06-21 11:38:36 +02:00
parent 7d975f330b
commit 8b6720d940
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builds/install/arch-specific/win32/FirebirdInstall.iss
View File

@ -481,8 +481,8 @@ Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Compon
Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\replication.conf; DestDir: {app}; DestName: replication.conf.default; Components: ServerComponent;
Source: {#FilesDir}\replication.conf; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NoReplicationConfExists;
Source: {#FilesDir}\security6.fdb; DestDir: {app}; Destname: security6.fdb.empty; Components: ServerComponent;
Source: {#FilesDir}\security6.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\security{#FB_MAJOR_VER}.fdb; DestDir: {app}; Destname: security{#FB_MAJOR_VER}.fdb.empty; Components: ServerComponent;
Source: {#FilesDir}\security{#FB_MAJOR_VER}.fdb; DestDir: {app}; Components: ServerComponent; Check: ConfigureAuthentication; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@ -1049,7 +1049,7 @@ begin
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security6.fdb', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security{#FB_MAJOR_VER}.fdb', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\replication.conf', false);
InitSecurityDB;
@ -1175,8 +1175,8 @@ begin
aStringList.add(appPath+'\firebird.log');
aStringList.add(appPath+'\databases.conf');
aStringList.add(appPath+'\fbtrace.conf');
aStringList.add(appPath+'\security6.fdb');
aStringList.add(appPath+'\security6.fdb.old');
aStringList.add(appPath+'\security{#FB_MAJOR_VER}.fdb');
aStringList.add(appPath+'\security{#FB_MAJOR_VER}.fdb.old');
aStringList.add(appPath+'\replication.conf');
for count := 0 to aStringList.count - 1 do begin

4
builds/install/arch-specific/win32/installation_readme.txt
View File

@ -52,7 +52,7 @@ Re-installation of Firebird
The binary installer does its best to detect and
preserve a previous install. If the installer detects
firebird.conf or security6.fdb it will not offer the
firebird.conf or security$MAJOR.fdb it will not offer the
option to set the SYSDBA username and password.
@ -119,7 +119,7 @@ o Uninstallation leaves six files in the install
- fbtrace.conf
- replication.conf
- firebird.log
- security6.fdb
- security$MAJOR.fdb
This is intentional. These files are all
potentially modifiable by users and may be required

2
builds/install/arch-specific/win32/installation_scripted.txt
View File

@ -149,7 +149,7 @@ Parameters specific to Firebird uninstalls
firebird.conf
databases.conf
firebird.log
security6.fdb
security$MAJOR.fdb
fbtrace.conf
replication.conf