Cleaning for Ubuntu build

Author: rupor-github

CMakeLists.txt

@@ -43,30 +43,36 @@ else()
 endif()
 message(STATUS "Destination directory: ${DEST_DIR} ${WINPTHREAD_DLL_DIR}")
 
-set(BUILD_SHARED_LIBS OFF)
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-
+set(BUILD_SHARED_LIBS OFF)
+if(UNIX)
+    # STATIC LINK set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+else()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
+endif()
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     message(STATUS "** Debug mode")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_XML_DEBUG")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -D_XML_DEBUG")
+else()
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
 endif()
 
+find_package(Git REQUIRED)
+
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME ON)
-find_package(Boost 1.64.0 REQUIRED COMPONENTS "date_time" "program_options" "filesystem")
+find_package(Boost 1.63.0 REQUIRED COMPONENTS "date_time" "program_options" "filesystem")
 find_package(Threads)
 if(DEFINED ENV{MYSQL_PROPER})
     find_package(MySQL 5.7.17 REQUIRED EXACT)
 else()
     find_package(MariaDB 10.1.24 REQUIRED)
 endif()
 find_package(ZLIB REQUIRED)
-find_package(Iconv REQUIRED)
 find_package(EXPAT REQUIRED)
-find_package(Git REQUIRED)
+find_package(Iconv REQUIRED)
 
 get_filename_component(MYSQL_NAME ${MYSQL_LIBRARIES} NAME_WE)
 
@@ -87,6 +93,11 @@ if(UNIX)
     set(ADD_LIBS "${CMAKE_THREAD_LIBS_INIT} -lm -lrt -ldl -lcrypt -laio")
 endif()
 target_link_libraries(lib2inpx minizip ${Boost_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${EXPAT_LIBRARIES} ${ICONV_LIBRARIES} ${ADD_LIBS})
+# STATIC LINK
+#if(UNIX)
+#    set_target_properties(lib2inpx PROPERTIES LINK_SEARCH_START_STATIC 1)
+#    set_target_properties(lib2inpx PROPERTIES LINK_SEARCH_END_STATIC 1)
+#endif()
 
 install(FILES ${PROJECT_BINARY_DIR}/history.txt DESTINATION ${DEST_DIR} CONFIGURATIONS Release)
 FILE(GLOB files "misc/*")

lib2inpx/lib2inpx.cpp

@@ -131,20 +131,20 @@ static const char* dummy = "dummy:"
                            "\r\n";
 
 #ifdef MARIADB_BASE_VERSION
-static const char* options_pattern[] = {"%s", "--defaults-file=%s/mysql.ini", "--datadir=%s/data", "--language=%s/language", "--skip-grant-tables", "--innodb_data_home_dir=%s/data/dbtmp_%s/",
-    "--innodb_log_group_home_dir=%s/data/dbtmp_%s/", "--innodb_tmpdir=%s/data/dbtmp_%s/", "--innodb_fast_shutdown=2", "--log-error=%s/data/errors.log", "--log_warnings=2", NULL};
+static const char* options_pattern[] = {"%s", "--defaults-file=%sdata/mysql.ini", "--language=%s/language", "--datadir=%sdata", "--skip-grant-tables", "--innodb_data_home_dir=%sdata/dbtmp_%s",
+    "--innodb_log_group_home_dir=%sdata/dbtmp_%s", "--innodb_tmpdir=%sdata/dbtmp_%s", "--log_warnings=2", NULL};
 #else
-static const char* options_pattern[] = {"%s", "--defaults-file=%s/mysql.ini", "--datadir=%s/data", "--language=%s/language", "--skip-grant-tables", "--innodb_data_home_dir=%s/data/dbtmp_%s/",
-    "--innodb_log_group_home_dir=%s/data/dbtmp_%s/", "--innodb_tmpdir=%s/data/dbtmp_%s/", "--log_syslog=0", NULL};
+static const char* options_pattern[] = {"%s", "--defaults-file=%sdata/mysql.ini", "--language=%s/language", "--datadir=%sdata", "--skip-grant-tables", "--innodb_data_home_dir=%s/data/dbtmp_%s",
+    "--innodb_log_group_home_dir=%sdata/dbtmp_%s", "--innodb_tmpdir=%sdata/dbtmp_%s", "--log_syslog=0", NULL};
 #endif
 
-class mysql_connection : boost::noncopyable {
+class mysql_connection {
     enum { num_options = sizeof(options_pattern) / sizeof(char*) };
 
     char* m_options[num_options];
 
   public:
-    mysql_connection(const char* path, const char* name, const char* dbname) : m_mysql(NULL)
+    mysql_connection(const char* module_path, const char* path, const char* name, const char* dbname) : m_mysql(NULL)
     {
         if (0 == m_initialized) {
 
@@ -162,6 +162,8 @@ class mysql_connection : boost::noncopyable {
 
                 if (0 == ni) {
                     sprintf(mem, pattern, name);
+                } else if (2 == ni) {
+                    sprintf(mem, pattern, module_path);
                 } else {
                     sprintf(mem, pattern, path, dbname);
                 }
@@ -238,7 +240,7 @@ class mysql_connection : boost::noncopyable {
 
 int mysql_connection::m_initialized = 0;
 
-class mysql_results : boost::noncopyable {
+class mysql_results {
   public:
     mysql_results(const mysql_connection& mysql) : m_mysql(mysql), m_results(NULL) { m_results = mysql_store_result(m_mysql); }
 
@@ -298,8 +300,12 @@ void prepare_mysql(const char* path, const string& dbname)
         fs::create_directories(path);
     }
 
-    string config = string(path) + "/mysql.ini";
+    string config = string(path) + "/data";
+    if (0 != access(config.c_str(), 6)) {
+        fs::create_directories(config.c_str());
+    }
 
+    config = string(path) + "/data/mysql.ini";
     if (0 != access(config.c_str(), 6)) {
         ofstream out(config.c_str());
 
@@ -312,12 +318,7 @@ void prepare_mysql(const char* path, const string& dbname)
         }
     }
 
-    config = string(path) + "/data";
-    if (0 != access(config.c_str(), 6)) {
-        fs::create_directories(config.c_str());
-    }
-
-    config += "/dbtmp_" + dbname;
+    config = string(path) + "/data/dbtmp_" + dbname;
     if (0 != access(config.c_str(), 6)) {
         fs::create_directories(config.c_str());
     }
@@ -1487,7 +1488,7 @@ int main(int argc, char* argv[])
         {
             string table_name = ((e20111106 == g_format) || (e20170531 == g_format)) ? "libavtors" : "libavtorname";
 
-            mysql_connection mysql(g_outdir.c_str(), g_db_name.c_str(), db_name.c_str());
+            mysql_connection mysql(module_path, g_outdir.c_str(), g_db_name.c_str(), db_name.c_str());
 
             if (!g_no_import) {
                 wcout << endl << "Creating MYSQL database \"" << utf8_to_wchar(db_name) << "\"" << endl << endl << flush;
@@ -1695,16 +1696,17 @@ int main(int argc, char* argv[])
             string db_dir = data_dir + db_name + "/";
             fs::remove_all(db_dir.c_str());
 
-            string file_to_del = string(g_outdir) + "/data/auto.cnf";
+            string file_to_del = data_dir + "/auto.cnf";
+            fs::remove(file_to_del);
+
+            file_to_del.assign(data_dir + "/mysql.ini");
             fs::remove(file_to_del);
 
 #ifdef MARIADB_BASE_VERSION
             file_to_del.assign(data_dir + "/aria_log.00000001");
             fs::remove(file_to_del);
             file_to_del.assign(data_dir + "/aria_log_control");
             fs::remove(file_to_del);
-            file_to_del.assign(data_dir + "/errors.log");
-            fs::remove(file_to_del);
 #endif
 
             if (fs::is_empty(data_dir)) {