Skip to content

Commit 875f0a2

Browse files
dyemanovdyemanov
committed
New release version in scripts
1 parent 3847e28 commit 875f0a2

27 files changed

+54
-54
lines changed

‎autogen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Run this to generate all the initial makefiles, etc.
44
#
55

6-
PKG_NAME=Firebird5
6+
PKG_NAME=Firebird6
77
SRCDIR=`dirname $0`
88

99
if [ -z "$AUTORECONF" ]

‎builds/install/arch-specific/android/AfterUntar.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ runAndCheckExit() {
1919
}
2020

2121
runAndCheckExit "Build messages file (firebird.msg)" "./build_file -f firebird.msg"
22-
runAndCheckExit "Creating security database" "echo create database \'security5.fdb\'^ | ./isql -q -term ^"
23-
runAndCheckExit "Creating security database metadata" "./isql -q security5.fdb -i security.sql"
22+
runAndCheckExit "Creating security database" "echo create database \'security6.fdb\'^ | ./isql -q -term ^"
23+
runAndCheckExit "Creating security database metadata" "./isql -q security6.fdb -i security.sql"
2424
#runAndCheckExit "Restore examples database (employee)" "(cd examples/empbuild ; ../.././isql -q -i ../../employe2.sql)"
2525

2626
rm -f security.sql employe2.sql ./build_file AfterUntar.sh

‎builds/install/arch-specific/android/BuildFinalPackage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir &&
4646
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=all && ./libEngine13_test --log_level=all)"
4747
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./AfterUntar.sh)"
4848
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/firebird.msg gen/Release/firebird/
49-
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security5.fdb gen/Release/firebird/
49+
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security6.fdb gen/Release/firebird/
5050
#$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/examples/empbuild/employe2.fdb gen/Release/firebird/examples/empbuild/
5151
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(rm -rf $AndroidDir)"
5252

‎builds/install/arch-specific/darwin/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ package_firebird:
3131
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
3232
-e 's/_REV_NO_/$(FB_REV_NO)/g' \
3333
../builds/install/arch-specific/darwin/Info.plist \
34-
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Info.plist
34+
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.framework/Resources/Info.plist
3535
sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
3636
-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
3737
-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
3838
-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
3939
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
4040
-e 's/_REV_NO_/$(FB_REV_NO)/g' \
4141
../builds/install/arch-specific/darwin/Description.plist \
42-
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Description.plist
42+
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.framework/Resources/Description.plist
4343

4444
rm -fr $(ROOT)/gen/$(TARGET)/scripts
4545
mkdir $(ROOT)/gen/$(TARGET)/scripts
@@ -63,7 +63,7 @@ package_firebird:
6363

6464
rm -fr $(TARGET)/packages
6565
mkdir $(TARGET)/packages
66-
pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework \
66+
pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.framework \
6767
--identifier com.firebirdsql.Firebird \
6868
--install-location /Library/Frameworks/Firebird.framework \
6969
--scripts $(ROOT)/gen/$(TARGET)/scripts \

‎builds/install/arch-specific/darwin/install-script

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ chown -R firebird:firebird "$FB_FW"
7474
# set the permissions correctly
7575
echo "Set the permissions correctly"
7676
chmod 777 "$FB_FW/Resources/"
77-
chmod 660 "$FB_FW/Resources/security5.fdb"
77+
chmod 660 "$FB_FW/Resources/security6.fdb"
7878

7979
# Remove all older traces of Classic first
8080
echo "Remove all older traces of Classic first"
@@ -95,7 +95,7 @@ fi
9595
# Install the saved security database, if any
9696
echo "Install the saved security database"
9797
if test -f /tmp/fb-security-database-update5.fdb; then
98-
mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security5.fdb"
98+
mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security6.fdb"
9999
rm -f /tmp/fb-security-database-update5.fdb
100100
fi
101101

@@ -118,7 +118,7 @@ cp /tmp/UDF_Save/*.* $FB_RES/UDF/
118118
rm -fr /tmp/UDF_save
119119

120120
# Test for saved security database
121-
if test -f "$FB_RES/security5.fdb"; then
121+
if test -f "$FB_RES/security6.fdb"; then
122122
echo "Security database has been preserved"
123123
fi
124124

‎builds/install/arch-specific/darwin/preupgrade-script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
FB_FW="/Library/Frameworks/Firebird.framework"
1111
FB_UDF="/Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF"
1212

13-
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb"; then
14-
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb" /tmp/fb-security-database-update5.fdb
13+
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security6.fdb"; then
14+
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security6.fdb" /tmp/fb-security-database-update5.fdb
1515
fi
1616

1717
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then

‎builds/install/arch-specific/linux/makeInstallImage.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fb_install_prefix=@prefix@
3434
BuildRootDir=..
3535
BuiltFBDir=Release/firebird # Where the just build fb exists.
3636
TargetDir=buildroot # Where we want to build the install image
37-
SecurityDatabase=security5.fdb
37+
SecurityDatabase=security6.fdb
3838
TomMathBuild="@TOMMATH_BUILD@"
3939
TomCryptBuild="@TOMCRYPT_BUILD@"
4040
OBJDUMP=@OBJDUMP@

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Compon
488488
Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
489489
Source: {#FilesDir}\replication.conf; DestDir: {app}; DestName: replication.conf.default; Components: ServerComponent;
490490
Source: {#FilesDir}\replication.conf; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NoReplicationConfExists;
491-
Source: {#FilesDir}\security5.fdb; DestDir: {app}; Destname: security5.fdb.empty; Components: ServerComponent;
492-
Source: {#FilesDir}\security5.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
491+
Source: {#FilesDir}\security6.fdb; DestDir: {app}; Destname: security6.fdb.empty; Components: ServerComponent;
492+
Source: {#FilesDir}\security6.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
493493
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
494494
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
495495

@@ -1058,7 +1058,7 @@ begin
10581058
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
10591059
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
10601060
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
1061-
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security5.fdb', false);
1061+
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security6.fdb', false);
10621062
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\replication.conf', false);
10631063
10641064
InitSecurityDB;
@@ -1184,8 +1184,8 @@ begin
11841184
aStringList.add(appPath+'\firebird.log');
11851185
aStringList.add(appPath+'\databases.conf');
11861186
aStringList.add(appPath+'\fbtrace.conf');
1187-
aStringList.add(appPath+'\security5.fdb');
1188-
aStringList.add(appPath+'\security5.fdb.old');
1187+
aStringList.add(appPath+'\security6.fdb');
1188+
aStringList.add(appPath+'\security6.fdb.old');
11891189
aStringList.add(appPath+'\replication.conf');
11901190
11911191
for count := 0 to aStringList.count - 1 do begin

‎builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ else
795795
SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
796796
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
797797
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
798-
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security5.fdb';
798+
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security6.fdb';
799799
SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
800800
SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
801801
SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
@@ -1201,7 +1201,7 @@ begin
12011201
LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr );
12021202
if pos('SharedDatabase', FirebirdConfStr) > 0 then begin
12031203
RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1');
1204-
RenameFile(GetAppPath+'\security5.fdb', GetAppPath+'\security5.fdb.preRC1');
1204+
RenameFile(GetAppPath+'\security6.fdb', GetAppPath+'\security6.fdb.preRC1');
12051205
end
12061206
end
12071207
end;
@@ -1213,7 +1213,7 @@ begin
12131213
if IsNotServerInstall then
12141214
Result := false
12151215
else
1216-
if FileExists(WizardDirValue + '\security5.fdb') then
1216+
if FileExists(WizardDirValue + '\security6.fdb') then
12171217
Result := false
12181218
else
12191219
Result := true;

‎builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Pogledajte UNINSTALL sekciju ispod za vise informacija o ovome.
3838

3939
Ako ste instalirali beta ili alpha verziju
4040
firebird-a, instalacija ce preimenovati firebird.conf i
41-
security5.fdb jer ove datoteke vise nisu kompatibilne.
41+
security6.fdb jer ove datoteke vise nisu kompatibilne.
4242

4343

4444
Deployment gds32.dll
@@ -69,7 +69,7 @@ Re-instalacija Firebird-a
6969

7070
Instalacioni program radi sve sto moze da detektuje i
7171
sacuva prethodnu instalaciju. Ako instalacija detektuje
72-
firebird.conf ili security5.fdb onda nece ponuditi
72+
firebird.conf ili security6.fdb onda nece ponuditi
7373
opciju da instalira legacy_auth. Niti ce ponuditi
7474
opciju da postavi SYSDBA username i password.
7575

@@ -128,7 +128,7 @@ o Deinstalacija ostavlja 6 datoteka u install
128128
- fbtrace.conf
129129
- replication.conf
130130
- firebird.log
131-
- security5.fdb
131+
- security6.fdb
132132

133133
Ovo je uradjeno namjerno. Ove datoteke su sve
134134
potencijalno modifikovane od strane korisnika i mogu

‎builds/install/arch-specific/win32/cz/instalace_ctime.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ viz část ODINSTALACE níže.
3838

3939
Máte-li nainstalovanou beta či alpha verzi
4040
Firebirdu $MAJOR.$MINOR, instalátor přejmenuje firebird.conf
41-
a security5.fdb, jelikož tyto soubory již nejsou kompatibilní.
41+
a security6.fdb, jelikož tyto soubory již nejsou kompatibilní.
4242

4343

4444
Instalace gds32.dll
@@ -63,7 +63,7 @@ Reinstalace of Firebird $MAJOR.$MINOR
6363
---------------------------
6464

6565
Instalační program dělá vše pro detekci a zachování předchozí instalace.
66-
Jestliže instalátor rozpozná firebird.conf či security5.fdb, nebude
66+
Jestliže instalátor rozpozná firebird.conf či security6.fdb, nebude
6767
nabízet možnost instalace legacy_auth. Rovněž nebude nabízet
6868
volbu pro nastavení hesla pro SYSDBA.
6969

@@ -123,7 +123,7 @@ o Odinstalace v instalační složce zanechá
123123
- fbtrace.conf
124124
- replication.conf
125125
- firebird.log
126-
- security5.fdb
126+
- security6.fdb
127127

128128
To je záměr. Všechny tyto soubory jsou
129129
potencionálně pozměnitelné uživatelem a

‎builds/install/arch-specific/win32/fr/installation_lisezmoi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Il est particulièrement important de vérifier que
4444
fbclient.dll et gds32.dll ont été retirés de <system32>.
4545

4646
Si vous avez installé une version beta ou alpha de Firebird $MAJOR.$MINOR,
47-
l'installeur va renommer firebird.conf et security5.fdb, car ces
47+
l'installeur va renommer firebird.conf et security6.fdb, car ces
4848
fichiers ne sont plus compatibles avec la version actuelle.
4949

5050

@@ -132,7 +132,7 @@ o La désinstallation laisse six fichiers dans le
132132
- fbtrace.conf
133133
- replication.conf
134134
- firebird.log
135-
- security5.fdb
135+
- security6.fdb
136136

137137
Ceci est intentionnel. Ces fichiers sont tous
138138
potentiellement modifiables par les utilisateurs et peuvent

‎builds/install/arch-specific/win32/installation_readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Re-installation of Firebird
5252

5353
The binary installer does its best to detect and
5454
preserve a previous install. If the installer detects
55-
firebird.conf or security5.fdb it will not offer the
55+
firebird.conf or security6.fdb it will not offer the
5656
option to set the SYSDBA username and password.
5757

5858

@@ -112,7 +112,7 @@ o Uninstallation leaves six files in the install
112112
- fbtrace.conf
113113
- replication.conf
114114
- firebird.log
115-
- security5.fdb
115+
- security6.fdb
116116

117117
This is intentional. These files are all
118118
potentially modifiable by users and may be required

‎builds/install/arch-specific/win32/installation_scripted.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Parameters specific to Firebird uninstalls
147147
firebird.conf
148148
databases.conf
149149
firebird.log
150-
security5.fdb
150+
security6.fdb
151151
fbtrace.conf
152152
replication.conf
153153

‎builds/install/arch-specific/win32/ru/installation_readme.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ o Установка из пакетного (bat) файла
3636
каталога <system32>.
3737

3838
Если у вас установлена Альфа или Бета версия Firebird $MAJOR.$MINOR,
39-
то программа установки переименует файлы firebird.conf и security5.fdb
39+
то программа установки переименует файлы firebird.conf и security6.fdb
4040
из-за их несовместимости с устанавливаемой версией.
4141

4242

@@ -67,7 +67,7 @@ MS VC runtime версии 10.0 установлены в системе.
6767

6868
Программа установки пытается обнаружить и сохранить ранее установленную
6969
версию Firebird. Если программа установки обнаруживает файлы firebird.conf
70-
или security5.fdb, то некоторые настройки авторизации могут быть недоступны,
70+
или security6.fdb, то некоторые настройки авторизации могут быть недоступны,
7171
в частности возможность установить пароль пользователя SYSDBA.
7272

7373

@@ -124,7 +124,7 @@ o Деинсталлятор оставляет следующие файлы в
124124
- fbtrace.conf
125125
- replication.conf
126126
- firebird.log
127-
- security5.fdb
127+
- security6.fdb
128128

129129
Это происходит намеренно. Эти файлы потенциально
130130
могут быть изменены пользователем и могут

‎builds/install/misc/databases.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ employee = $(dir_sampleDb)/employee.fdb
2424
# Master security database specific setup.
2525
# Do not remove it until you understand well what are you doing!
2626
#
27-
security.db = $(dir_secDb)/security5.fdb
27+
security.db = $(dir_secDb)/security6.fdb
2828
{
2929
RemoteAccess = false
3030
DefaultDbCachePages = 256

‎builds/install/misc/firebird.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@
11001100
#
11011101
# Type: string (pathname)
11021102
#
1103-
#SecurityDatabase = $(dir_secDb)/security5.fdb
1103+
#SecurityDatabase = $(dir_secDb)/security6.fdb
11041104

11051105

11061106
# ============================

‎builds/install/posix-common/posixLibrary.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ OrigPasswd=""
8585
TmpFile=""
8686
MANIFEST_TXT=""
8787
Manifest=manifest.txt
88-
SecurityDatabase=security5.fdb
88+
SecurityDatabase=security6.fdb
8989
DefaultLibrary=libfbclient
9090
UninstallScript=FirebirdUninstall.sh
9191
XINETD=/etc/xinetd.d/

‎builds/posix/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ gpre: $(GPRE) databases
490490
$(GPRE): $(GPRE_Objects) $(COMMON_LIB)
491491
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
492492

493-
SECURITY_FDB = $(FIREBIRD)/security5.fdb
493+
SECURITY_FDB = $(FIREBIRD)/security6.fdb
494494
SECURITY_TMP = security.tmp
495495

496496
databases: yachts.lnk $(SECURITY_FDB)

‎builds/posix/make.defaults

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ FBGUARD = $(BIN)/fbguard$(EXEC_EXT)
420420
INSTREG = $(BIN)/instreg$(EXEC_EXT)
421421
INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
422422

423-
SECURITY_FDB = $(FIREBIRD)/security5.fdb
423+
SECURITY_FDB = $(FIREBIRD)/security6.fdb
424424

425425
# From isql
426426
ISQL = $(BIN)/isql$(EXEC_EXT)

‎builds/posix/postfix.darwin

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
2020

2121
TARGET ?= Release
22-
FB_FW = ../gen/$(TARGET)/frameworks/Firebird5.framework
22+
FB_FW = ../gen/$(TARGET)/frameworks/Firebird6.framework
2323

2424
all: framework
2525

@@ -49,7 +49,7 @@ framework:
4949
cp ../gen/$(TARGET)/firebird/intl/fbintl.conf $(FB_FW)/Versions/A/Resources/intl/fbintl.conf
5050
#chmod a+rx $(FB_FW)/Versions/A/Resources/intl/fbintl
5151
cp -r ../gen/$(TARGET)/firebird/plugins $(FB_FW)/Versions/A/Resources/plugins
52-
cp ../gen/$(TARGET)/firebird/security5.fdb $(FB_FW)/Versions/A/Resources/security5.fdb
52+
cp ../gen/$(TARGET)/firebird/security6.fdb $(FB_FW)/Versions/A/Resources/security6.fdb
5353
cp ../gen/$(TARGET)/firebird/firebird.msg $(FB_FW)/Versions/A/Resources/firebird.msg
5454
cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata
5555
mkdir -p $(FB_FW)/Resources/doc

‎builds/win32/make_all.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ for %%v in (gpre_boot build_msg common_test engine_test) do (
8585
copy %FB_ROOT_PATH%\src\plugins\udr_engine\udr_engine.conf %FB_OUTPUT_DIR%\plugins\udr_engine.conf >nul
8686

8787
:: DATABASES
88-
copy %FB_GEN_DIR%\dbs\security5.FDB %FB_OUTPUT_DIR%\security5.fdb >nul
88+
copy %FB_GEN_DIR%\dbs\security6.FDB %FB_OUTPUT_DIR%\security6.fdb >nul
8989

9090
:: DOCS
9191
copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ >nul

‎builds/win32/make_boot.bat

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ for %%v in (firebird plugins) do (
112112
if "!ERRLEV!"=="1" goto :END
113113

114114
:: copy security db if not exists already
115-
if not exist %FB_BIN_DIR%\security5.fdb (
116-
copy %FB_GEN_DIR%\dbs\security5.fdb %FB_BIN_DIR%
115+
if not exist %FB_BIN_DIR%\security6.fdb (
116+
copy %FB_GEN_DIR%\dbs\security6.fdb %FB_BIN_DIR%
117117
)
118118

119119
::=======
@@ -270,17 +270,17 @@ goto :EOF
270270
@rmdir /s /q %FB_GEN_DIR%\dbs 2>nul
271271
@mkdir %FB_GEN_DIR%\dbs 2>nul
272272

273-
@echo Create security5.fdb...
274-
@echo create database '%FB_GEN_DB_DIR%\dbs\security5.fdb'; | "%FB_BIN_DIR%\isql" -q > nul
273+
@echo Create security6.fdb...
274+
@echo create database '%FB_GEN_DB_DIR%\dbs\security6.fdb'; | "%FB_BIN_DIR%\isql" -q > nul
275275
if errorlevel 1 call :boot2 databases & goto :EOF
276276

277277
@echo Apply security.sql...
278-
@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security5.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql > nul
278+
@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security6.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql > nul
279279
if errorlevel 1 call :boot2 databases & goto :EOF
280280

281-
@mklink %FB_GEN_DIR%\dbs\security.fdb %FB_GEN_DIR%\dbs\security5.fdb > nul
281+
@mklink %FB_GEN_DIR%\dbs\security.fdb %FB_GEN_DIR%\dbs\security6.fdb > nul
282282
if errorlevel 1 (
283-
@copy %FB_GEN_DIR%\dbs\security5.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
283+
@copy %FB_GEN_DIR%\dbs\security6.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
284284
)
285285
if errorlevel 1 call :boot2 databases & goto :EOF
286286

0 commit comments

Comments
 (0)