8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 12:03:03 +01:00

New release version in scripts

This commit is contained in:
Dmitry Yemanov 2023-09-17 18:29:17 +03:00
parent 3847e28a0b
commit 875f0a25a3
27 changed files with 54 additions and 54 deletions

View File

@ -3,7 +3,7 @@
# Run this to generate all the initial makefiles, etc.
#
PKG_NAME=Firebird5
PKG_NAME=Firebird6
SRCDIR=`dirname $0`
if [ -z "$AUTORECONF" ]

View File

@ -19,8 +19,8 @@ runAndCheckExit() {
}
runAndCheckExit "Build messages file (firebird.msg)" "./build_file -f firebird.msg"
runAndCheckExit "Creating security database" "echo create database \'security5.fdb\'^ | ./isql -q -term ^"
runAndCheckExit "Creating security database metadata" "./isql -q security5.fdb -i security.sql"
runAndCheckExit "Creating security database" "echo create database \'security6.fdb\'^ | ./isql -q -term ^"
runAndCheckExit "Creating security database metadata" "./isql -q security6.fdb -i security.sql"
#runAndCheckExit "Restore examples database (employee)" "(cd examples/empbuild ; ../.././isql -q -i ../../employe2.sql)"
rm -f security.sql employe2.sql ./build_file AfterUntar.sh

View File

@ -46,7 +46,7 @@ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir &&
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=all && ./libEngine13_test --log_level=all)"
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./AfterUntar.sh)"
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/firebird.msg gen/Release/firebird/
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security5.fdb gen/Release/firebird/
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security6.fdb gen/Release/firebird/
#$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/examples/empbuild/employe2.fdb gen/Release/firebird/examples/empbuild/
$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(rm -rf $AndroidDir)"

View File

@ -31,7 +31,7 @@ package_firebird:
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
-e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Info.plist \
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Info.plist
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.framework/Resources/Info.plist
sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
@ -39,7 +39,7 @@ package_firebird:
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
-e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Description.plist \
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Description.plist
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.framework/Resources/Description.plist
rm -fr $(ROOT)/gen/$(TARGET)/scripts
mkdir $(ROOT)/gen/$(TARGET)/scripts
@ -63,7 +63,7 @@ package_firebird:
rm -fr $(TARGET)/packages
mkdir $(TARGET)/packages
pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework \
pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird6.framework \
--identifier com.firebirdsql.Firebird \
--install-location /Library/Frameworks/Firebird.framework \
--scripts $(ROOT)/gen/$(TARGET)/scripts \

View File

@ -74,7 +74,7 @@ chown -R firebird:firebird "$FB_FW"
# set the permissions correctly
echo "Set the permissions correctly"
chmod 777 "$FB_FW/Resources/"
chmod 660 "$FB_FW/Resources/security5.fdb"
chmod 660 "$FB_FW/Resources/security6.fdb"
# Remove all older traces of Classic first
echo "Remove all older traces of Classic first"
@ -95,7 +95,7 @@ fi
# Install the saved security database, if any
echo "Install the saved security database"
if test -f /tmp/fb-security-database-update5.fdb; then
mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security5.fdb"
mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security6.fdb"
rm -f /tmp/fb-security-database-update5.fdb
fi
@ -118,7 +118,7 @@ cp /tmp/UDF_Save/*.* $FB_RES/UDF/
rm -fr /tmp/UDF_save
# Test for saved security database
if test -f "$FB_RES/security5.fdb"; then
if test -f "$FB_RES/security6.fdb"; then
echo "Security database has been preserved"
fi

View File

@ -10,8 +10,8 @@
FB_FW="/Library/Frameworks/Firebird.framework"
FB_UDF="/Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF"
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb"; then
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb" /tmp/fb-security-database-update5.fdb
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security6.fdb"; then
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security6.fdb" /tmp/fb-security-database-update5.fdb
fi
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then

View File

@ -34,7 +34,7 @@ fb_install_prefix=@prefix@
BuildRootDir=..
BuiltFBDir=Release/firebird # Where the just build fb exists.
TargetDir=buildroot # Where we want to build the install image
SecurityDatabase=security5.fdb
SecurityDatabase=security6.fdb
TomMathBuild="@TOMMATH_BUILD@"
TomCryptBuild="@TOMCRYPT_BUILD@"
OBJDUMP=@OBJDUMP@

View File

@ -488,8 +488,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}\security5.fdb; DestDir: {app}; Destname: security5.fdb.empty; Components: ServerComponent;
Source: {#FilesDir}\security5.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
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}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@ -1058,7 +1058,7 @@ begin
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security5.fdb', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security6.fdb', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\replication.conf', false);
InitSecurityDB;
@ -1184,8 +1184,8 @@ begin
aStringList.add(appPath+'\firebird.log');
aStringList.add(appPath+'\databases.conf');
aStringList.add(appPath+'\fbtrace.conf');
aStringList.add(appPath+'\security5.fdb');
aStringList.add(appPath+'\security5.fdb.old');
aStringList.add(appPath+'\security6.fdb');
aStringList.add(appPath+'\security6.fdb.old');
aStringList.add(appPath+'\replication.conf');
for count := 0 to aStringList.count - 1 do begin

View File

@ -795,7 +795,7 @@ else
SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security5.fdb';
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security6.fdb';
SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
@ -1201,7 +1201,7 @@ begin
LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr );
if pos('SharedDatabase', FirebirdConfStr) > 0 then begin
RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1');
RenameFile(GetAppPath+'\security5.fdb', GetAppPath+'\security5.fdb.preRC1');
RenameFile(GetAppPath+'\security6.fdb', GetAppPath+'\security6.fdb.preRC1');
end
end
end;
@ -1213,7 +1213,7 @@ begin
if IsNotServerInstall then
Result := false
else
if FileExists(WizardDirValue + '\security5.fdb') then
if FileExists(WizardDirValue + '\security6.fdb') then
Result := false
else
Result := true;

View File

@ -38,7 +38,7 @@ Pogledajte UNINSTALL sekciju ispod za vise informacija o ovome.
Ako ste instalirali beta ili alpha verziju
firebird-a, instalacija ce preimenovati firebird.conf i
security5.fdb jer ove datoteke vise nisu kompatibilne.
security6.fdb jer ove datoteke vise nisu kompatibilne.
Deployment gds32.dll
@ -69,7 +69,7 @@ Re-instalacija Firebird-a
Instalacioni program radi sve sto moze da detektuje i
sacuva prethodnu instalaciju. Ako instalacija detektuje
firebird.conf ili security5.fdb onda nece ponuditi
firebird.conf ili security6.fdb onda nece ponuditi
opciju da instalira legacy_auth. Niti ce ponuditi
opciju da postavi SYSDBA username i password.
@ -128,7 +128,7 @@ o Deinstalacija ostavlja 6 datoteka u install
- fbtrace.conf
- replication.conf
- firebird.log
- security5.fdb
- security6.fdb
Ovo je uradjeno namjerno. Ove datoteke su sve
potencijalno modifikovane od strane korisnika i mogu

View File

@ -38,7 +38,7 @@ viz část ODINSTALACE níže.
Máte-li nainstalovanou beta či alpha verzi
Firebirdu $MAJOR.$MINOR, instalátor přejmenuje firebird.conf
a security5.fdb, jelikož tyto soubory již nejsou kompatibilní.
a security6.fdb, jelikož tyto soubory již nejsou kompatibilní.
Instalace gds32.dll
@ -63,7 +63,7 @@ Reinstalace of Firebird $MAJOR.$MINOR
---------------------------
Instalační program dělá vše pro detekci a zachování předchozí instalace.
Jestliže instalátor rozpozná firebird.conf či security5.fdb, nebude
Jestliže instalátor rozpozná firebird.conf či security6.fdb, nebude
nabízet možnost instalace legacy_auth. Rovněž nebude nabízet
volbu pro nastavení hesla pro SYSDBA.
@ -123,7 +123,7 @@ o Odinstalace v instalační složce zanechá
- fbtrace.conf
- replication.conf
- firebird.log
- security5.fdb
- security6.fdb
To je záměr. Všechny tyto soubory jsou
potencionálně pozměnitelné uživatelem a

View File

@ -44,7 +44,7 @@ Il est particulièrement important de vérifier que
fbclient.dll et gds32.dll ont été retirés de <system32>.
Si vous avez installé une version beta ou alpha de Firebird $MAJOR.$MINOR,
l'installeur va renommer firebird.conf et security5.fdb, car ces
l'installeur va renommer firebird.conf et security6.fdb, car ces
fichiers ne sont plus compatibles avec la version actuelle.
@ -132,7 +132,7 @@ o La désinstallation laisse six fichiers dans le
- fbtrace.conf
- replication.conf
- firebird.log
- security5.fdb
- security6.fdb
Ceci est intentionnel. Ces fichiers sont tous
potentiellement modifiables par les utilisateurs et peuvent

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 security5.fdb it will not offer the
firebird.conf or security6.fdb it will not offer the
option to set the SYSDBA username and password.
@ -112,7 +112,7 @@ o Uninstallation leaves six files in the install
- fbtrace.conf
- replication.conf
- firebird.log
- security5.fdb
- security6.fdb
This is intentional. These files are all
potentially modifiable by users and may be required

View File

@ -147,7 +147,7 @@ Parameters specific to Firebird uninstalls
firebird.conf
databases.conf
firebird.log
security5.fdb
security6.fdb
fbtrace.conf
replication.conf

View File

@ -36,7 +36,7 @@ o Установка из пакетного (bat) файла
каталога <system32>.
Если у вас установлена Альфа или Бета версия Firebird $MAJOR.$MINOR,
то программа установки переименует файлы firebird.conf и security5.fdb
то программа установки переименует файлы firebird.conf и security6.fdb
из-за их несовместимости с устанавливаемой версией.
@ -67,7 +67,7 @@ MS VC runtime версии 10.0 установлены в системе.
Программа установки пытается обнаружить и сохранить ранее установленную
версию Firebird. Если программа установки обнаруживает файлы firebird.conf
или security5.fdb, то некоторые настройки авторизации могут быть недоступны,
или security6.fdb, то некоторые настройки авторизации могут быть недоступны,
в частности возможность установить пароль пользователя SYSDBA.
@ -124,7 +124,7 @@ o Деинсталлятор оставляет следующие файлы в
- fbtrace.conf
- replication.conf
- firebird.log
- security5.fdb
- security6.fdb
Это происходит намеренно. Эти файлы потенциально
могут быть изменены пользователем и могут

View File

@ -24,7 +24,7 @@ employee = $(dir_sampleDb)/employee.fdb
# Master security database specific setup.
# Do not remove it until you understand well what are you doing!
#
security.db = $(dir_secDb)/security5.fdb
security.db = $(dir_secDb)/security6.fdb
{
RemoteAccess = false
DefaultDbCachePages = 256

View File

@ -1100,7 +1100,7 @@
#
# Type: string (pathname)
#
#SecurityDatabase = $(dir_secDb)/security5.fdb
#SecurityDatabase = $(dir_secDb)/security6.fdb
# ============================

View File

@ -85,7 +85,7 @@ OrigPasswd=""
TmpFile=""
MANIFEST_TXT=""
Manifest=manifest.txt
SecurityDatabase=security5.fdb
SecurityDatabase=security6.fdb
DefaultLibrary=libfbclient
UninstallScript=FirebirdUninstall.sh
XINETD=/etc/xinetd.d/

View File

@ -490,7 +490,7 @@ gpre: $(GPRE) databases
$(GPRE): $(GPRE_Objects) $(COMMON_LIB)
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
SECURITY_FDB = $(FIREBIRD)/security5.fdb
SECURITY_FDB = $(FIREBIRD)/security6.fdb
SECURITY_TMP = security.tmp
databases: yachts.lnk $(SECURITY_FDB)

View File

@ -420,7 +420,7 @@ FBGUARD = $(BIN)/fbguard$(EXEC_EXT)
INSTREG = $(BIN)/instreg$(EXEC_EXT)
INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
SECURITY_FDB = $(FIREBIRD)/security5.fdb
SECURITY_FDB = $(FIREBIRD)/security6.fdb
# From isql
ISQL = $(BIN)/isql$(EXEC_EXT)

View File

@ -19,7 +19,7 @@
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
TARGET ?= Release
FB_FW = ../gen/$(TARGET)/frameworks/Firebird5.framework
FB_FW = ../gen/$(TARGET)/frameworks/Firebird6.framework
all: framework
@ -49,7 +49,7 @@ framework:
cp ../gen/$(TARGET)/firebird/intl/fbintl.conf $(FB_FW)/Versions/A/Resources/intl/fbintl.conf
#chmod a+rx $(FB_FW)/Versions/A/Resources/intl/fbintl
cp -r ../gen/$(TARGET)/firebird/plugins $(FB_FW)/Versions/A/Resources/plugins
cp ../gen/$(TARGET)/firebird/security5.fdb $(FB_FW)/Versions/A/Resources/security5.fdb
cp ../gen/$(TARGET)/firebird/security6.fdb $(FB_FW)/Versions/A/Resources/security6.fdb
cp ../gen/$(TARGET)/firebird/firebird.msg $(FB_FW)/Versions/A/Resources/firebird.msg
cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata
mkdir -p $(FB_FW)/Resources/doc

View File

@ -85,7 +85,7 @@ for %%v in (gpre_boot build_msg common_test engine_test) do (
copy %FB_ROOT_PATH%\src\plugins\udr_engine\udr_engine.conf %FB_OUTPUT_DIR%\plugins\udr_engine.conf >nul
:: DATABASES
copy %FB_GEN_DIR%\dbs\security5.FDB %FB_OUTPUT_DIR%\security5.fdb >nul
copy %FB_GEN_DIR%\dbs\security6.FDB %FB_OUTPUT_DIR%\security6.fdb >nul
:: DOCS
copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ >nul

View File

@ -112,8 +112,8 @@ for %%v in (firebird plugins) do (
if "!ERRLEV!"=="1" goto :END
:: copy security db if not exists already
if not exist %FB_BIN_DIR%\security5.fdb (
copy %FB_GEN_DIR%\dbs\security5.fdb %FB_BIN_DIR%
if not exist %FB_BIN_DIR%\security6.fdb (
copy %FB_GEN_DIR%\dbs\security6.fdb %FB_BIN_DIR%
)
::=======
@ -270,17 +270,17 @@ goto :EOF
@rmdir /s /q %FB_GEN_DIR%\dbs 2>nul
@mkdir %FB_GEN_DIR%\dbs 2>nul
@echo Create security5.fdb...
@echo create database '%FB_GEN_DB_DIR%\dbs\security5.fdb'; | "%FB_BIN_DIR%\isql" -q > nul
@echo Create security6.fdb...
@echo create database '%FB_GEN_DB_DIR%\dbs\security6.fdb'; | "%FB_BIN_DIR%\isql" -q > nul
if errorlevel 1 call :boot2 databases & goto :EOF
@echo Apply security.sql...
@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security5.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql > nul
@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security6.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql > nul
if errorlevel 1 call :boot2 databases & goto :EOF
@mklink %FB_GEN_DIR%\dbs\security.fdb %FB_GEN_DIR%\dbs\security5.fdb > nul
@mklink %FB_GEN_DIR%\dbs\security.fdb %FB_GEN_DIR%\dbs\security6.fdb > nul
if errorlevel 1 (
@copy %FB_GEN_DIR%\dbs\security5.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
@copy %FB_GEN_DIR%\dbs\security6.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
)
if errorlevel 1 call :boot2 databases & goto :EOF

View File

@ -1649,7 +1649,7 @@ AC_OUTPUT
dnl Print out the build configuration (the most interesting thing)
echo
echo
echo The Firebird5 package has been configured with the following options:
echo The Firebird6 package has been configured with the following options:
echo
case $DEVEL_FLG in

View File

@ -1,6 +1,6 @@
Initializing the Security Database
----------------------------------
The security database (security5.fdb) has no predefined users. This is intentional.
The security database (security6.fdb) has no predefined users. This is intentional.
Having user with well known predefined password and full access rights is serious security risk.
Firebird starting with version 3.0 does not require presence of SYSDBA user. One can use another name

View File

@ -877,7 +877,7 @@ add_subdirectory("utilities")
add_custom_target(copy_files
#ALL # uncomment this to copy files every build
# databases
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security5.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security6.fdb
# configs, text files
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf ${output_dir}/firebird.conf
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/databases.conf ${output_dir}/databases.conf

View File

@ -93,7 +93,7 @@ static const char MSG_FILE_LANG[] = "intl/%.10s.msg";
static const char* const LOCKDIR = "firebird"; // created in WORKFILE
static const char* const LOGFILE = FB_LOGFILENAME;
static const char* const MSG_FILE = "firebird.msg";
static const char* const SECURITY_DB = "security5.fdb";
static const char* const SECURITY_DB = "security6.fdb";
// Keep in sync with MSG_FILE_LANG
const int LOCALE_MAX = 10;