Skip to content
Permalink
Browse files

ODBC-262 Added client_ed25519 pluginto msi and pkg

  • Loading branch information...
lawrinn committed Aug 7, 2019
1 parent 07bc411 commit 5cb835ec054826fafd6d4ab1a70971045475ff59
Showing with 5 additions and 1 deletion.
  1. +1 −1 osxinstall/CMakeLists.txt
  2. +1 −0 osxinstall/copy_package_files.sh
  3. +3 −0 wininstall/mariadb_odbc.xml.in
@@ -70,6 +70,6 @@ SET_TARGET_PROPERTIES(maodbcpkg PROPERTIES EXCLUDE_FROM_ALL OFF)
ADD_DEPENDENCIES(maodbcpkg copypkgfiles)
ADD_DEPENDENCIES(copypkgfiles maodbc)
IF(NOT USE_SYSTEM_INSTALLED_LIB)
ADD_DEPENDENCIES(copypkgfiles maodbc dialog caching_sha2_password auth_gssapi_client sha256_password mysql_clear_password)
ADD_DEPENDENCIES(copypkgfiles maodbc dialog caching_sha2_password auth_gssapi_client sha256_password mysql_clear_password client_ed25519)
ENDIF()

@@ -33,5 +33,6 @@ if [ $2 ]; then
cp $2/caching_sha2_password.so ./ROOT/${LibPath}/plugin/
cp $2/mysql_clear_password.so ./ROOT/${LibPath}/plugin/
cp $2/sha256_password.so ./ROOT/${LibPath}/plugin/
cp $2/client_ed25519.so ./ROOT/${LibPath}/plugin/
fi

@@ -77,12 +77,15 @@
<File Id="auth_gssapi_client_dll" Name="auth_gssapi_client.dll" DiskId="1" Source="$(var.plugins_source_dir)/auth_gssapi_client.dll" />
<File Id="mysql_clear_password_dll" Name="mysql_clear_password.dll" DiskId="1" Source="$(var.plugins_source_dir)/mysql_clear_password.dll" />
<File Id="sha256_password_dll" Name="sha256_password.dll" DiskId="1" Source="$(var.plugins_source_dir)/sha256_password.dll" />
<File Id="client_ed25519_dll" Name="client_ed25519.dll" DiskId="1" Source="$(var.plugins_source_dir)/client_ed25519.dll" />
</Component>
<Component Id="PluginsDebug" Guid="@GUID_PLUGINS_DEBUG@" Directory="PLUGINSFOLDER" DiskId="1" Win64="@IS_WIN64@">
<File Id="caching_sha2_password_pdb" Name="caching_sha2_password.pdb" DiskId="1" Source="$(var.plugins_source_dir)/caching_sha2_password.pdb" />
<File Id="dialog_pdb" Name="dialog.pdb" DiskId="1" Source="$(var.plugins_source_dir)/dialog.pdb" />
<File Id="auth_gssapi_client_pdb" Name="auth_gssapi_client.pdb" DiskId="1" Source="$(var.plugins_source_dir)/auth_gssapi_client.pdb" />
<File Id="mysql_clear_password_pdb" Name="mysql_clear_password.pdb" DiskId="1" Source="$(var.plugins_source_dir)/mysql_clear_password.pdb" />
<File Id="sha256_password_pdb" Name="sha256_password.pdb" DiskId="1" Source="$(var.plugins_source_dir)/sha256_password.pdb" />
<File Id="client_ed25519_pdb" Name="client_ed25519.pdb" DiskId="1" Source="$(var.plugins_source_dir)/client_ed25519.pdb" />
<CreateFolder />
</Component>
<Component Id="InstallerTools" Guid="@GUID_INSTALLER_TOOLS@" Directory="INSTALLFOLDER" DiskId="1" Win64="@IS_WIN64@">

0 comments on commit 5cb835e

Please sign in to comment.
You can’t perform that action at this time.