Restructure project layout

Move source files to a folder 'src' and header files to 'include/libdrizzle-redux' Update '#include' directives such that include paths are as follows: "libdrizzle/..." -> "src/..." "libdrizzle-5.1/..." -> "libdrizzle-redux/..." Update the Autotools build files - Change paths to 'src' and 'libdrizle-redux' - Add '-I./include' to compile flags Update the path to libtool archive files to use 'src' - Update .gitignore
bokchan · Apr 5, 2017 · 5246639 · 5246639
1 parent f5e5e14
commit 5246639
Show file tree

Hide file tree

Showing 83 changed files with 200 additions and 198 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,9 +18,9 @@ configure
 deb/install
 .deps
 docs/conf.py
-libdrizzle/.*
+src/.*
 libdrizzle-redux-config
-libdrizzle-*/version.h
+version.h
 libtool
 m4/libtool.m4
 m4/lt~obsolete.m4

diff --git a/Makefile.am b/Makefile.am
@@ -38,8 +38,8 @@ TESTS+= ${check_PROGRAMS} ${check_SCRIPTS}
 include yatl/include.am
 include tests/include.am
 include m4/include.am
-include libdrizzle/include.am
-include libdrizzle-5.1/include.am
+include src/include.am
+include include/libdrizzle-redux/include.am
 include rpm/include.am
 include deb/include.am
 include docs/include.am

diff --git a/configure.ac b/configure.ac
@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
 
-AC_CONFIG_SRCDIR([libdrizzle/drizzle.cc])
+AC_CONFIG_SRCDIR([src/drizzle.cc])
 
 # Shared library versioning
 #
@@ -137,13 +137,17 @@ AX_ENDIAN
 AX_HEX_VERSION([LIBDRIZZLE],[$VERSION])
 AX_HARDEN_COMPILER_FLAGS
 
+# Append the -./Iinclude to compiler flags
+AX_APPEND_COMPILE_FLAGS([-I./include], [CXXFLAGS])
+AX_APPEND_COMPILE_FLAGS([-I./include], [CFLAGS])
+
 AX_CREATE_GENERIC_CONFIG
 AX_AM_JOBSERVER([yes])
 
 AC_CONFIG_FILES([Makefile
                  docs/conf.py
                  rpm/spec
-                 libdrizzle-5.1/version.h
+                 include/libdrizzle-redux/version.h
                  ])
 
 AC_OUTPUT

diff --git a/libdrizzle-5.1/binlog.h → include/libdrizzle-redux/binlog.h b/libdrizzle-5.1/binlog.h → include/libdrizzle-redux/binlog.h
diff --git a/libdrizzle-5.1/column.h → include/libdrizzle-redux/column.h b/libdrizzle-5.1/column.h → include/libdrizzle-redux/column.h
diff --git a/libdrizzle-5.1/column_client.h → include/libdrizzle-redux/column_client.h b/libdrizzle-5.1/column_client.h → include/libdrizzle-redux/column_client.h
diff --git a/libdrizzle-5.1/conn.h → include/libdrizzle-redux/conn.h b/libdrizzle-5.1/conn.h → include/libdrizzle-redux/conn.h
diff --git a/libdrizzle-5.1/conn_client.h → include/libdrizzle-redux/conn_client.h b/libdrizzle-5.1/conn_client.h → include/libdrizzle-redux/conn_client.h
diff --git a/libdrizzle-5.1/constants.h → include/libdrizzle-redux/constants.h b/libdrizzle-5.1/constants.h → include/libdrizzle-redux/constants.h
@@ -44,8 +44,8 @@
  * @brief Defines, typedefs, enums, and macros
  */
 
-#include <libdrizzle-5.1/return.h>
-#include <libdrizzle-5.1/verbose.h>
+#include <libdrizzle-redux/return.h>
+#include <libdrizzle-redux/verbose.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/libdrizzle-5.1/drizzle.h → include/libdrizzle-redux/drizzle.h b/libdrizzle-5.1/drizzle.h → include/libdrizzle-redux/drizzle.h
@@ -39,7 +39,7 @@
 #pragma once
 
 #ifndef DRIZZLE_CLIENT_INTERFACE
-# error "You need to include libdrizzle-5.1/drizzle_client.h in your application"
+# error "You need to include libdrizzle-redux/drizzle_client.h in your application"
 #endif
 
 /**
@@ -59,11 +59,11 @@ typedef int in_port_t;
 # include <netdb.h>
 #endif
 
-#include <libdrizzle-5.1/constants.h>
-#include <libdrizzle-5.1/structs.h>
-#include <libdrizzle-5.1/conn.h>
-#include <libdrizzle-5.1/result.h>
-#include <libdrizzle-5.1/column.h>
+#include <libdrizzle-redux/constants.h>
+#include <libdrizzle-redux/structs.h>
+#include <libdrizzle-redux/conn.h>
+#include <libdrizzle-redux/result.h>
+#include <libdrizzle-redux/column.h>
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/libdrizzle-5.1/drizzle_client.h → include/libdrizzle-redux/drizzle_client.h b/libdrizzle-5.1/drizzle_client.h → include/libdrizzle-redux/drizzle_client.h
@@ -52,20 +52,20 @@
 #include <sys/types.h>
 
 /* Visibility must come first */
-#include <libdrizzle-5.1/visibility.h>
+#include <libdrizzle-redux/visibility.h>
 
-#include <libdrizzle-5.1/drizzle.h>
-#include <libdrizzle-5.1/conn_client.h>
-#include <libdrizzle-5.1/query.h>
-#include <libdrizzle-5.1/result_client.h>
-#include <libdrizzle-5.1/column_client.h>
-#include <libdrizzle-5.1/row_client.h>
-#include <libdrizzle-5.1/field_client.h>
-#include <libdrizzle-5.1/error.h>
-#include <libdrizzle-5.1/ssl.h>
-#include <libdrizzle-5.1/binlog.h>
-#include <libdrizzle-5.1/statement.h>
-#include <libdrizzle-5.1/version.h>
+#include <libdrizzle-redux/drizzle.h>
+#include <libdrizzle-redux/conn_client.h>
+#include <libdrizzle-redux/query.h>
+#include <libdrizzle-redux/result_client.h>
+#include <libdrizzle-redux/column_client.h>
+#include <libdrizzle-redux/row_client.h>
+#include <libdrizzle-redux/field_client.h>
+#include <libdrizzle-redux/error.h>
+#include <libdrizzle-redux/ssl.h>
+#include <libdrizzle-redux/binlog.h>
+#include <libdrizzle-redux/statement.h>
+#include <libdrizzle-redux/version.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/libdrizzle-5.1/error.h → include/libdrizzle-redux/error.h b/libdrizzle-5.1/error.h → include/libdrizzle-redux/error.h
diff --git a/libdrizzle-5.1/field_client.h → include/libdrizzle-redux/field_client.h b/libdrizzle-5.1/field_client.h → include/libdrizzle-redux/field_client.h
@@ -89,7 +89,7 @@ drizzle_field_t drizzle_field_read(drizzle_result_st *result, uint64_t *offset,
  * allocates 'new-size + 1' bytes.
  *
  * For further details please refer to the inline documentation in
- * libdrizzle/field.cc
+ * src/field.cc
  *
  * @param[in]  result  A result object
  * @param[in]  total   The total size of the field, to be written to by the function

diff --git a/include/libdrizzle-redux/include.am b/include/libdrizzle-redux/include.am
@@ -0,0 +1,26 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+nobase_include_HEADERS+= include/libdrizzle-redux/binlog.h
+nobase_include_HEADERS+= include/libdrizzle-redux/column.h
+nobase_include_HEADERS+= include/libdrizzle-redux/column_client.h
+nobase_include_HEADERS+= include/libdrizzle-redux/conn.h
+nobase_include_HEADERS+= include/libdrizzle-redux/conn_client.h
+nobase_include_HEADERS+= include/libdrizzle-redux/constants.h
+nobase_include_HEADERS+= include/libdrizzle-redux/drizzle.h
+nobase_include_HEADERS+= include/libdrizzle-redux/drizzle_client.h
+nobase_include_HEADERS+= include/libdrizzle-redux/error.h
+nobase_include_HEADERS+= include/libdrizzle-redux/field_client.h
+nobase_include_HEADERS+= include/libdrizzle-redux/libdrizzle.h
+nobase_include_HEADERS+= include/libdrizzle-redux/query.h
+nobase_include_HEADERS+= include/libdrizzle-redux/result.h
+nobase_include_HEADERS+= include/libdrizzle-redux/result_client.h
+nobase_include_HEADERS+= include/libdrizzle-redux/return.h
+nobase_include_HEADERS+= include/libdrizzle-redux/row_client.h
+nobase_include_HEADERS+= include/libdrizzle-redux/ssl.h
+nobase_include_HEADERS+= include/libdrizzle-redux/statement.h
+nobase_include_HEADERS+= include/libdrizzle-redux/structs.h
+nobase_include_HEADERS+= include/libdrizzle-redux/verbose.h
+nobase_include_HEADERS+= include/libdrizzle-redux/visibility.h
+nobase_include_HEADERS+= include/libdrizzle-redux/version.h
diff --git a/libdrizzle-5.1/libdrizzle.h → include/libdrizzle-redux/libdrizzle.h b/libdrizzle-5.1/libdrizzle.h → include/libdrizzle-redux/libdrizzle.h
@@ -33,4 +33,4 @@
 
 #pragma once
 
-#include <libdrizzle-5.1/drizzle_client.h>
+#include <libdrizzle-redux/drizzle_client.h>
diff --git a/libdrizzle-5.1/query.h → include/libdrizzle-redux/query.h b/libdrizzle-5.1/query.h → include/libdrizzle-redux/query.h
diff --git a/libdrizzle-5.1/result.h → include/libdrizzle-redux/result.h b/libdrizzle-5.1/result.h → include/libdrizzle-redux/result.h
diff --git a/libdrizzle-5.1/result_client.h → include/libdrizzle-redux/result_client.h b/libdrizzle-5.1/result_client.h → include/libdrizzle-redux/result_client.h
diff --git a/libdrizzle-5.1/return.h → include/libdrizzle-redux/return.h b/libdrizzle-5.1/return.h → include/libdrizzle-redux/return.h
diff --git a/libdrizzle-5.1/row_client.h → include/libdrizzle-redux/row_client.h b/libdrizzle-5.1/row_client.h → include/libdrizzle-redux/row_client.h
diff --git a/libdrizzle-5.1/ssl.h → include/libdrizzle-redux/ssl.h b/libdrizzle-5.1/ssl.h → include/libdrizzle-redux/ssl.h
diff --git a/libdrizzle-5.1/statement.h → include/libdrizzle-redux/statement.h b/libdrizzle-5.1/statement.h → include/libdrizzle-redux/statement.h
diff --git a/libdrizzle-5.1/structs.h → include/libdrizzle-redux/structs.h b/libdrizzle-5.1/structs.h → include/libdrizzle-redux/structs.h
diff --git a/libdrizzle-5.1/verbose.h → include/libdrizzle-redux/verbose.h b/libdrizzle-5.1/verbose.h → include/libdrizzle-redux/verbose.h
diff --git a/libdrizzle-5.1/version.h.in → include/libdrizzle-redux/version.h.in b/libdrizzle-5.1/version.h.in → include/libdrizzle-redux/version.h.in
diff --git a/libdrizzle-5.1/visibility.h → include/libdrizzle-redux/visibility.h b/libdrizzle-5.1/visibility.h → include/libdrizzle-redux/visibility.h
diff --git a/libdrizzle-5.1/include.am b/libdrizzle-5.1/include.am
diff --git a/libdrizzle/include.am b/libdrizzle/include.am
diff --git a/libdrizzle/binlog.cc → src/binlog.cc b/libdrizzle/binlog.cc → src/binlog.cc
@@ -36,7 +36,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 #include <zlib.h>
 #include <inttypes.h>

diff --git a/libdrizzle/binlog.h → src/binlog.h b/libdrizzle/binlog.h → src/binlog.h
diff --git a/libdrizzle/column.cc → src/column.cc b/libdrizzle/column.cc → src/column.cc
@@ -43,7 +43,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 /*
  * Common definitions

diff --git a/libdrizzle/column.h → src/column.h b/libdrizzle/column.h → src/column.h
diff --git a/libdrizzle/command.cc → src/command.cc b/libdrizzle/command.cc → src/command.cc
@@ -43,7 +43,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 /*
  * State Definitions

diff --git a/libdrizzle/common.h → src/common.h b/libdrizzle/common.h → src/common.h
@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <libdrizzle-5.1/drizzle_client.h>
+#include <libdrizzle-redux/drizzle_client.h>
 
 #include <cassert>
 #include <new>
@@ -52,7 +52,7 @@
 #endif
 
 #if defined(_WIN32) || defined(__MINGW32__)
-# include "libdrizzle/windows.hpp"
+# include "src/windows.hpp"
 # define get_socket_errno() WSAGetLastError()
 
 #else
@@ -71,7 +71,7 @@
 # include <poll.h>
 typedef struct pollfd pollfd_t;
 #else
-# include "libdrizzle/poll.h"
+# include "src/poll.h"
 #endif
 
 #include <stddef.h>
@@ -81,16 +81,16 @@ typedef struct pollfd pollfd_t;
 #include <stdlib.h>
 #include <string.h>
 
-#include "libdrizzle/structs.h"
-#include "libdrizzle/drizzle_local.h"
-#include "libdrizzle/conn_local.h"
-#include "libdrizzle/pack.h"
-#include "libdrizzle/state.h"
-#include "libdrizzle/sha1.h"
-#include "libdrizzle/statement_local.h"
-#include "libdrizzle/column.h"
-#include "libdrizzle/binlog.h"
-#include "libdrizzle/handshake_client.h"
-#include "libdrizzle/result.h"
+#include "src/structs.h"
+#include "src/drizzle_local.h"
+#include "src/conn_local.h"
+#include "src/pack.h"
+#include "src/state.h"
+#include "src/sha1.h"
+#include "src/statement_local.h"
+#include "src/column.h"
+#include "src/binlog.h"
+#include "src/handshake_client.h"
+#include "src/result.h"
 
 #include <memory.h>
diff --git a/libdrizzle/conn.cc → src/conn.cc b/libdrizzle/conn.cc → src/conn.cc
@@ -44,7 +44,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 #ifndef MSG_NOSIGNAL
 # define MSG_NOSIGNAL 0

diff --git a/libdrizzle/conn_local.h → src/conn_local.h b/libdrizzle/conn_local.h → src/conn_local.h
diff --git a/libdrizzle/conn_uds.cc → src/conn_uds.cc b/libdrizzle/conn_uds.cc → src/conn_uds.cc
@@ -42,7 +42,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 const char *drizzle_uds(const drizzle_st *con)
 {

diff --git a/libdrizzle/datetime.h → src/datetime.h b/libdrizzle/datetime.h → src/datetime.h
diff --git a/libdrizzle/drizzle.cc → src/drizzle.cc b/libdrizzle/drizzle.cc → src/drizzle.cc
@@ -43,7 +43,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 #include <cerrno>
 #include <pthread.h>

diff --git a/libdrizzle/drizzle_local.h → src/drizzle_local.h b/libdrizzle/drizzle_local.h → src/drizzle_local.h
diff --git a/libdrizzle/error.cc → src/error.cc b/libdrizzle/error.cc → src/error.cc
@@ -37,7 +37,7 @@
 
 #include "config.h"
 
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 const char *drizzle_strerror(const drizzle_return_t arg)
 {

diff --git a/libdrizzle/field.cc → src/field.cc b/libdrizzle/field.cc → src/field.cc
@@ -42,7 +42,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 #include <inttypes.h>
 

diff --git a/libdrizzle/handshake.cc → src/handshake.cc b/libdrizzle/handshake.cc → src/handshake.cc
@@ -42,7 +42,7 @@
  */
 
 #include "config.h"
-#include "libdrizzle/common.h"
+#include "src/common.h"
 
 /*
  * Client Definitions

diff --git a/libdrizzle/handshake_client.h → src/handshake_client.h b/libdrizzle/handshake_client.h → src/handshake_client.h