From 5bdaa0aea637af2763e6aee87c66d127ecfe45ce Mon Sep 17 00:00:00 2001 From: Dmitry Yemanov Date: Wed, 7 Aug 2024 11:05:09 +0300 Subject: [PATCH] Builds/docs changes for ODS14 --- builds/install/arch-specific/android/BuildFinalPackage.sh | 2 +- builds/install/misc/firebird.conf | 2 +- builds/win32/msvc15/engine.vcxproj | 8 ++++---- doc/README.connection_strings | 2 +- doc/README.plugins.html | 8 ++++---- doc/README.providers.html | 6 +++--- doc/Using_OO_API.html | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/builds/install/arch-specific/android/BuildFinalPackage.sh b/builds/install/arch-specific/android/BuildFinalPackage.sh index 758f52c550..b7611e905f 100755 --- a/builds/install/arch-specific/android/BuildFinalPackage.sh +++ b/builds/install/arch-specific/android/BuildFinalPackage.sh @@ -43,7 +43,7 @@ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "rm -rf $AndroidDir $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "mkdir $AndroidDir" $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName push gen/$InitialDebugTar $AndroidDir/ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir && tar xvf $InitialDebugTar)" -$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 && ./common_test --log_level=all && ./libEngine14_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/security6.fdb gen/Release/firebird/ diff --git a/builds/install/misc/firebird.conf b/builds/install/misc/firebird.conf index fdda0290bf..dff4907c17 100644 --- a/builds/install/misc/firebird.conf +++ b/builds/install/misc/firebird.conf @@ -530,7 +530,7 @@ # # Per-database & per-connection configurable. # -#Providers = Remote,Engine13,Loopback +#Providers = Remote,Engine14,Loopback # ---------------------------- diff --git a/builds/win32/msvc15/engine.vcxproj b/builds/win32/msvc15/engine.vcxproj index 380322d04d..dac34ca809 100644 --- a/builds/win32/msvc15/engine.vcxproj +++ b/builds/win32/msvc15/engine.vcxproj @@ -151,10 +151,10 @@ AllRules.ruleset - engine13 - engine13 - engine13 - engine13 + engine14 + engine14 + engine14 + engine14 ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\ diff --git a/doc/README.connection_strings b/doc/README.connection_strings index 39fe8b538a..6bc1d1f3fc 100644 --- a/doc/README.connection_strings +++ b/doc/README.connection_strings @@ -127,7 +127,7 @@ or TCP localhost loopback. On the server side, default provider configuration is: - Providers = Remote, Engine13, Loopback + Providers = Remote, Engine14, Loopback It means that if the remote provider fails to match the connection string (because of missing protocol / host parts), then the embedded engine handles the hostless connection. If you need diff --git a/doc/README.plugins.html b/doc/README.plugins.html index f73170510c..5c704ea636 100644 --- a/doc/README.plugins.html +++ b/doc/README.plugins.html @@ -135,7 +135,7 @@ Win_Sspi, Legacy_Auth

UserManager = Srp

TracePlugin = fbtrace

Providers = -Remote,Engine13,Loopback

+Remote,Engine14,Loopback

WireCryptPlugin = Arc4

This provides normal operation in server, client and embedded cases. If you want to add @@ -158,10 +158,10 @@ default equals to plugin implementation's name (and it's factory name which is actually used in firebird.conf). Certainly in typical case, module contains one plugin, and that plugin works with only one configuration, and all 3 names are equal, and no more configuration -is needed – for example libEngine13.so or Engine13.dll contains -implementation of provider Engine13, and nothing else except record +is needed – for example libEngine14.so or Engine14.dll contains +implementation of provider Engine14, and nothing else except record

-

Providers = Engine13

+

Providers = Engine14

in firebird.conf is needed to load it. But if you have something complex – configuration file plugins.conf will help you to have such plugin factories which you diff --git a/doc/README.providers.html b/doc/README.providers.html index f513c7797a..cef8f0abd6 100644 --- a/doc/README.providers.html +++ b/doc/README.providers.html @@ -47,7 +47,7 @@ attach stage.

Next samples are with default configuration, which contains 3 providers: -Remote (establish network connection), Engine13 (main +Remote (establish network connection), Engine14 (main database engine) and Loopback (force network connection to local server for database name without explicitly given network protocol).

@@ -59,7 +59,7 @@ provider in the list) at once redirects such call to RemoteHost. That's how typical client configuration works.

When database name does not contain network protocol (just dbname) -Remote provider rejects it and Engine13 provider comes +Remote provider rejects it and Engine14 provider comes to stage. It tries to open dbname – and in case of success we get embedded connection to the database. Pay attention – we do not need special embedded library to have embedded connection, @@ -74,7 +74,7 @@ to open database file. This is normal case if database was not created by that user in embedded mode or if he was not explicitly given OS rights for embedded access to databases on given box. Moreover, setting access rights in such a manner is a requirement for -correct superserver operation. So after failure of Engine13 to +correct superserver operation. So after failure of Engine14 to access database Loopback provider is attempted for an attach. It does not differ much from Remote, but tries to access database dbname on a server running on local host. On windows diff --git a/doc/Using_OO_API.html b/doc/Using_OO_API.html index ee7c3e1710..d3db125f2f 100644 --- a/doc/Using_OO_API.html +++ b/doc/Using_OO_API.html @@ -2121,7 +2121,7 @@ codes:

DIR_GUARD – where guardian lock is stored (fb_guard)

DIR_PLUGINS -– plugins directory ([lib]Engine13.{dll|so})

+– plugins directory ([lib]Engine14.{dll|so})