WL#16310: XDevAPI connector library rename

Author: rsomla1

install_layout.cmake

@@ -193,7 +193,7 @@ endif()
 # static runtime.
 #
 
-set(LIB_NAME_BASE "mysqlcppconn${CONCPP_VERSION_MAJOR}")
+set(LIB_NAME_BASE "mysqlcppconnx")
 set(LIB_NAME_STATIC "${LIB_NAME_BASE}-static")
 
 if(WIN32 AND STATIC_MSVCRT)

mysql-concpp-config.cmake.in

@@ -355,7 +355,7 @@ function(find_connector which)
     set(base_name "mysqlcppconn")
     set(target_name "concpp-jdbc")
   else()
-    set(base_name "mysqlcppconn@CONCPP_VERSION_MAJOR@")
+    set(base_name "mysqlcppconnx")
     set(target_name "concpp-xdevapi")
   endif()
 

packaging/deb-in/control.in

@@ -6,7 +6,7 @@ Standards-Version: 3.9.8
 Homepage: https://dev.mysql.com/doc/connector-cpp/en/
 Build-Depends: cmake, debhelper (>= 10), libboost-dev, libmysqlclient-dev, libssl-dev
 
-Package: libmysqlcppconn8-@ABI_VERSION_MAJOR@
+Package: libmysqlcppconnx@ABI_VERSION_MAJOR@
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
@@ -32,7 +32,7 @@ Architecture: any
 Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Depends: libmysqlcppconn@JDBC_ABI_VERSION_MAJOR@ (= ${binary:Version}), libmysqlcppconn8-@ABI_VERSION_MAJOR@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libmysqlcppconn@JDBC_ABI_VERSION_MAJOR@ (= ${binary:Version}), libmysqlcppconnx@ABI_VERSION_MAJOR@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Development header files and libraries for MySQL C++ client applications
  This package contains the development header files and libraries necessary
  to develop MySQL client applications in C++.

packaging/deb-in/libmysqlcppconn-dev.install.in

@@ -23,8 +23,8 @@
 
 usr/lib/*/libmysqlcppconn.so
 usr/lib/*/libmysqlcppconn-static.a
-usr/lib/*/libmysqlcppconn9.so
-usr/lib/*/libmysqlcppconn9-static.a
+usr/lib/*/libmysqlcppconnx.so
+usr/lib/*/libmysqlcppconnx-static.a
 usr/lib/*/cmake/mysql-concpp/mysql-concpp-config.cmake
 usr/lib/*/cmake/mysql-concpp/mysql-concpp-config-version.cmake
 

packaging/deb-in/libmysqlcppconn8-2-dbgsym.install.in renamed to packaging/deb-in/libmysqlcppconnx2-dbgsym.install.in

@@ -22,5 +22,5 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Legal
-usr/LICENSE.txt /usr/share/doc/libmysqlcppconn8-2-dbgsym
-usr/README.txt /usr/share/doc/libmysqlcppconn8-2-dbgsym
+usr/LICENSE.txt /usr/share/doc/libmysqlcppconnx2-dbgsym
+usr/README.txt /usr/share/doc/libmysqlcppconnx2-dbgsym

packaging/deb-in/libmysqlcppconn8-2.install.in renamed to packaging/deb-in/libmysqlcppconnx2.install.in

@@ -21,12 +21,12 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-usr/lib/*/libmysqlcppconn8.so.2*
+usr/lib/*/libmysqlcppconnx.so.2*
 
 # Build info
-/usr/INFO_SRC /usr/share/doc/libmysqlcppconn8-2
-/usr/INFO_BIN /usr/share/doc/libmysqlcppconn8-2
+/usr/INFO_SRC /usr/share/doc/libmysqlcppconnx2
+/usr/INFO_BIN /usr/share/doc/libmysqlcppconnx2
 
 # Legal
-usr/LICENSE.txt /usr/share/doc/libmysqlcppconn8-2
-usr/README.txt /usr/share/doc/libmysqlcppconn8-2
+usr/LICENSE.txt /usr/share/doc/libmysqlcppconnx2
+usr/README.txt /usr/share/doc/libmysqlcppconnx2

packaging/deb-in/libmysqlcppconn8-2.lintian-overrides.in renamed to packaging/deb-in/libmysqlcppconnx2.lintian-overrides.in

@@ -22,4 +22,4 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Additional license file is needed so overriding this warning
-libmysqlcppconn8-2: extra-license-file
+libmysqlcppconnx2: extra-license-file

packaging/mysql-connector-c++.spec.in

@@ -153,7 +153,7 @@ rm %{buildroot}/usr/*.cmake
 
 %files
 %doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
-%{_libdir}/libmysqlcppconn9.so.@ABI_VERSION_MAJOR@*
+%{_libdir}/libmysqlcppconnx.so.@ABI_VERSION_MAJOR@*
 
 %files jdbc
 %doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
@@ -163,9 +163,8 @@ rm %{buildroot}/usr/*.cmake
 %doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
 %{_libdir}/libmysqlcppconn.so
 %{_libdir}/libmysqlcppconn-static.a
-%{_libdir}/libmysqlcppconn9.so
-%{_libdir}/libmysqlcppconn9-static.a
-%{_includedir}/mysql-cppconn
+%{_libdir}/libmysqlcppconnx.so
+%{_libdir}/libmysqlcppconnx-static.a
 %{_libdir}/cmake/mysql-concpp/mysql-concpp-config-version.cmake
 %{_libdir}/cmake/mysql-concpp/mysql-concpp-config.cmake
 %dir %{_includedir}/mysql-cppconn-9