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

Adjust docs and CMake build re. new engine name.

This commit is contained in:
Dmitry Yemanov 2016-06-01 12:03:58 +03:00
parent 63b6708e7f
commit 337ef7707d
5 changed files with 11 additions and 11 deletions

View File

@ -147,7 +147,7 @@ or TCP localhost loopback.
On the server side, default provider configuration is: On the server side, default provider configuration is:
Providers = Remote, Engine12, Loopback Providers = Remote, Engine13, Loopback
It means that if the remote provider fails to match the connection string (because of missing 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 protocol / host parts), then the embedded engine handles the hostless connection. If you need

View File

@ -135,7 +135,7 @@ Win_Sspi, Legacy_Auth</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>UserManager = Srp</I></FONT></P> <P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>UserManager = Srp</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>TracePlugin = fbtrace</I></FONT></P> <P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>TracePlugin = fbtrace</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>Providers = <P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>Providers =
Remote,Engine12,Loopback</I></FONT></P> Remote,Engine13,Loopback</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>WireCryptPlugin = Arc4</I></FONT></P> <P STYLE="margin-bottom: 0in"><FONT SIZE=4><I>WireCryptPlugin = Arc4</I></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>This provides normal <P STYLE="margin-bottom: 0in"><FONT SIZE=4>This provides normal
operation in server, client and embedded cases. If you want to add 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, which is actually used in firebird.conf). Certainly in typical case,
module contains one plugin, and that plugin works with only one module contains one plugin, and that plugin works with only one
configuration, and all 3 names are equal, and no more configuration configuration, and all 3 names are equal, and no more configuration
is needed for example libEngine12.so or Engine12.dll contains is needed for example libEngine13.so or Engine13.dll contains
implementation of provider Engine12, and nothing else except record </FONT> implementation of provider Engine13, and nothing else except record </FONT>
</P> </P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>Providers = Engine12</FONT></P> <P STYLE="margin-bottom: 0in"><FONT SIZE=4>Providers = Engine13</FONT></P>
<P STYLE="margin-bottom: 0in"><FONT SIZE=4>in firebird.conf is needed <P STYLE="margin-bottom: 0in"><FONT SIZE=4>in firebird.conf is needed
to load it. But if you have something complex configuration file to load it. But if you have something complex configuration file
plugins.conf will help you to have such plugin factories which you plugins.conf will help you to have such plugin factories which you

View File

@ -47,7 +47,7 @@ attach stage.</FONT></P>
</P> </P>
<P STYLE="text-indent: 0.39in; margin-bottom: 0in"><FONT SIZE=4>Next <P STYLE="text-indent: 0.39in; margin-bottom: 0in"><FONT SIZE=4>Next
samples are with default configuration, which contains 3 providers: samples are with default configuration, which contains 3 providers:
<B>Remote</B> (establish network connection), <B>Engine12</B> (main <B>Remote</B> (establish network connection), <B>Engine13</B> (main
database engine) and <B>Loopback</B> (force network connection to database engine) and <B>Loopback</B> (force network connection to
local server for database name without explicitly given network local server for database name without explicitly given network
protocol).</FONT></P> protocol).</FONT></P>
@ -59,7 +59,7 @@ provider in the list) at once redirects such call to <I>RemoteHost</I>.
That's how typical client configuration works.</FONT></P> That's how typical client configuration works.</FONT></P>
<P STYLE="text-indent: 0.39in; margin-bottom: 0in"><FONT SIZE=4>When <P STYLE="text-indent: 0.39in; margin-bottom: 0in"><FONT SIZE=4>When
database name does not contain network protocol (just <I>dbname</I>) database name does not contain network protocol (just <I>dbname</I>)
<B>Remote</B> provider rejects it and <B>Engine12</B> provider comes <B>Remote</B> provider rejects it and <B>Engine13</B> provider comes
to stage. It tries to open <I>dbname</I> &ndash; and in case of to stage. It tries to open <I>dbname</I> &ndash; and in case of
success we get embedded connection to the database. Pay attention &ndash; success we get embedded connection to the database. Pay attention &ndash;
we do not need special embedded library to have embedded connection, 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 created by that user in embedded mode or if he was not explicitly
given OS rights for embedded access to databases on given box. given OS rights for embedded access to databases on given box.
Moreover, setting access rights in such a manner is a requirement for Moreover, setting access rights in such a manner is a requirement for
correct superserver operation. So after failure of <B>Engine12</B> to correct superserver operation. So after failure of <B>Engine13</B> to
access database <B>Loopback</B> provider is attempted for an attach. access database <B>Loopback</B> provider is attempted for an attach.
It does not differ much from <B>Remote</B>, but tries to access It does not differ much from <B>Remote</B>, but tries to access
database <I>dbname</I> on a server running on local host. On windows database <I>dbname</I> on a server running on local host. On windows

View File

@ -1428,7 +1428,7 @@ file is stored (firebird.log)</FONT></P>
<P STYLE="margin-bottom: 0in"> <FONT SIZE=4>DIR_GUARD where <P STYLE="margin-bottom: 0in"> <FONT SIZE=4>DIR_GUARD where
guardian lock is stored (fb_guard)</FONT></P> guardian lock is stored (fb_guard)</FONT></P>
<P STYLE="margin-bottom: 0in"> <FONT SIZE=4>DIR_PLUGINS <P STYLE="margin-bottom: 0in"> <FONT SIZE=4>DIR_PLUGINS
plugins directory ([lib]Engine12.{dll|so})</FONT></P> plugins directory ([lib]Engine13.{dll|so})</FONT></P>
<P STYLE="margin-bottom: 0in"><BR> <P STYLE="margin-bottom: 0in"><BR>
</P> </P>
<P STYLE="margin-bottom: 0in"><BR> <P STYLE="margin-bottom: 0in"><BR>

View File

@ -502,7 +502,7 @@ add_library (boot_engine SHARED ${engine_generated_src_boot} ${V
target_link_libraries (boot_engine engine_common boot_alice boot_burp common boot_yvalve) target_link_libraries (boot_engine engine_common boot_alice boot_burp common boot_yvalve)
set_output_directory (boot_engine plugins CURRENT_DIR) set_output_directory (boot_engine plugins CURRENT_DIR)
set_exported_symbols (boot_engine fbplugin) set_exported_symbols (boot_engine fbplugin)
copy_and_rename_lib (boot_engine Engine12) copy_and_rename_lib (boot_engine Engine13)
project_group (boot_engine Boot) project_group (boot_engine Boot)
endif() # if (NOT CMAKE_CROSSCOMPILING) endif() # if (NOT CMAKE_CROSSCOMPILING)
@ -514,7 +514,7 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
add_library (engine SHARED ${engine_generated_src_master} ${VERSION_RC}) add_library (engine SHARED ${engine_generated_src_master} ${VERSION_RC})
target_link_libraries (engine engine_common alice burp common yvalve) target_link_libraries (engine engine_common alice burp common yvalve)
set_target_properties (engine PROPERTIES OUTPUT_NAME Engine12) set_target_properties (engine PROPERTIES OUTPUT_NAME Engine13)
set_output_directory (engine plugins) set_output_directory (engine plugins)
set_exported_symbols (engine fbplugin) set_exported_symbols (engine fbplugin)