Added installation layout for Debian (-DINSTALL_LAYOUT=DEB)

mariadb-corporation · Jan 17, 2018 · c1a5ed4 · c1a5ed4
1 parent d3a6061
commit c1a5ed4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/cmake/install.cmake b/cmake/install.cmake
@@ -31,13 +31,13 @@ IF(NOT INSTALL_LAYOUT)
 ENDIF()
 
 SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE
-  STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip) and RPM")
+  STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip), RPM and DEB")
 
 # On Windows we only provide zip and .msi. Latter one uses a different packager. 
 IF(UNIX)
   IF(INSTALL_LAYOUT MATCHES "RPM")
     SET(libmariadb_prefix "/usr")
-  ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT")
+  ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT|DEB")
     SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
   ENDIF()
 ENDIF()
@@ -47,7 +47,7 @@ IF(CMAKE_DEFAULT_PREFIX_INITIALIZED_BY_DEFAULT)
 ENDIF()
 
 # check if the specified installation layout is valid
-SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM")
+SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "DEB")
 LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" layout_no)
 IF(layout_no EQUAL -1)
   MESSAGE(FATAL_ERROR "Invalid installation layout ${INSTALL_LAYOUT}. Please specify one of the following layouts: ${VALID_INSTALL_LAYOUTS}")
@@ -64,14 +64,12 @@ ENDIF()
 # DEFAULT layout
 #
 
-
-
 SET(INSTALL_BINDIR_DEFAULT "bin")
 SET(INSTALL_LIBDIR_DEFAULT "lib/mariadb")
 SET(INSTALL_INCLUDEDIR_DEFAULT "include/mariadb")
 SET(INSTALL_DOCDIR_DEFAULT "docs")
 SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
-
+SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
 #
 # RPM layout
 #
@@ -85,6 +83,18 @@ ELSE()
 ENDIF()
 SET(INSTALL_INCLUDEDIR_RPM "include")
 SET(INSTALL_DOCDIR_RPM "docs")
+SET(LIBMARIADB_STATIC_RPM "mariadbclient")
+
+#
+# DEB layout
+#
+SET(INSTALL_BINDIR_DEB "bin")
+SET(INSTALL_LIBDIR_DEB "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+SET(INSTALL_PLUGINDIR_DEB "${INSTALL_LIBDIR_DEB}/mariadb/plugin")
+SET(INSTALL_INCLUDEDIR_DEB "include/mariadb")
+SET(LIBMARIADB_STATIC_DEB "mariadb")
+
+
 
 #
 # Overwrite defaults
@@ -119,3 +129,6 @@ FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS"  "PLUGIN")
   SET(INSTALL_${dir}DIR ${INSTALL_${dir}DIR_${INSTALL_LAYOUT}})
   MARK_AS_ADVANCED(INSTALL_${dir}DIR)
 ENDFOREACH()
+
+SET(LIBMARIADB_STATIC_NAME ${LIBMARIADB_STATIC_${INSTALL_LAYOUT}})
+MARK_AS_ADVANCED(LIBMARIADB_STATIC_NAME)
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
@@ -403,6 +403,14 @@ SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "$
 
 SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
 
+SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
+ ${CPACK_PACKAGE_VERSION_MAJOR}
+ SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
+
+IF(NOT WIN32)
+  SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}")
+ENDIF()
+
 #
 # Installation
 #
@@ -420,10 +428,6 @@ IF(WITH_MYSQLCOMPAT)
 ENDIF()
 
 
-SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
- ${CPACK_PACKAGE_VERSION_MAJOR}
- SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
-
 INSTALL(TARGETS mariadbclient
           COMPONENT Development
           DESTINATION ${INSTALL_LIBDIR})

diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
@@ -1382,22 +1382,12 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
 
   /* Get version info */
   mysql->protocol_version= PROTOCOL_VERSION;	/* Assume this */
-/*
-  if (ma_pvio_wait_io_or_timeout(net->pvio, FALSE, 0) < 1)
-  {
-    my_set_error(mysql, CR_SERVER_LOST, SQLSTATE_UNKNOWN,
-                 ER(CR_SERVER_LOST_EXTENDED),
-                 "handshake: waiting for inital communication packet",
-                 errno);
-    goto error;
-  }
- */
   if ((pkt_length=ma_net_safe_read(mysql)) == packet_error)
   {
     if (mysql->net.last_errno == CR_SERVER_LOST)
       my_set_error(mysql, CR_SERVER_LOST, SQLSTATE_UNKNOWN,
                  ER(CR_SERVER_LOST_EXTENDED),
-                 "handshake: reading inital communication packet",
+                 "handshake: reading initial communication packet",
                  errno);
 
     goto error;