libs: removed libbareoscfg and libbareostatic

- moved all symbols into libbareos - inhibit DLL_IMP_EXP, CATS_IMP_EXP, SD_IMP_EXP
bareos · Sep 11, 2018 · 73b5d06 · 73b5d06
1 parent c6c4741
commit 73b5d06
Show file tree

Hide file tree

Showing 19 changed files with 5,991 additions and 96 deletions.
diff --git a/core/src/console/CMakeLists.txt b/core/src/console/CMakeLists.txt
@@ -27,10 +27,10 @@ add_executable(bconsole console.cc)
 
 add_library(console_objects STATIC ${BCONSSRCS})
 
-set(CONSOLE_LINK_LIBRARIES console_objects bareos bareoscfg ${Readline_LIBRARY})
+set(CONSOLE_LINK_LIBRARIES console_objects bareos ${Readline_LIBRARY})
 
 IF(HAVE_WIN32)
-  LIST(APPEND CONSOLE_LINK_LIBRARIES bareosstatic)
+  LIST(APPEND CONSOLE_LINK_LIBRARIES)
 ENDIF()
 
 target_link_libraries(bconsole ${CONSOLE_LINK_LIBRARIES})

diff --git a/core/src/dird/CMakeLists.txt b/core/src/dird/CMakeLists.txt
@@ -67,7 +67,6 @@ set(BAREOS_DIR_LIBRARIES
    dird_objects
    bareos
    bareoscats
-   bareoscfg
    bareossql
    bareosfind
    ${LMDB_LIBS}
@@ -76,7 +75,6 @@ set(BAREOS_DIR_LIBRARIES
 
 IF(HAVE_WIN32)
    LIST(APPEND BAREOS_DIR_LIBRARIES
-      bareosstatic
       comctl32
       )
 ENDIF()
@@ -85,10 +83,10 @@ target_link_libraries(bareos-dir ${BAREOS_DIR_LIBRARIES})
 
 
 add_executable(bareos-dbcheck ${DBCHKSRCS})
-SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscfg bareoscats)
+SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)
 
 IF(HAVE_WIN32)
-   LIST(APPEND DBCHECK_LIBRARIES bareosstatic)
+   LIST(APPEND DBCHECK_LIBRARIES)
 ENDIF()
 
 target_link_libraries(bareos-dbcheck
@@ -99,7 +97,7 @@ target_link_libraries(bareos-dbcheck
 # is not built by default
 
 #add_executable(testfind ${TSTFNDSRCS})
-#target_link_libraries(testfind bareos bareosfind bareoscfg
+#target_link_libraries(testfind bareos bareosfind 
 #                      jansson ${OPENSSL_LIBS} acl cap lzo2
 #)
 

diff --git a/core/src/filed/CMakeLists.txt b/core/src/filed/CMakeLists.txt
@@ -50,13 +50,13 @@ ENDIF()
 add_executable(bareos-fd ${FDSRCS})
 
 SET(BAREOS_FD_LIBRARIES
-         bareosfind bareoscfg bareos
+         bareosfind bareos
          pthread
          ${LMDB_LIBS}
          )
 IF(HAVE_WIN32)
    LIST(APPEND BAREOS_FD_LIBRARIES
-      comctl32 bareosstatic
+      comctl32
       )
 
    SET (FD_COMPILE_DEFINITIONS -DWIN32_VSS)

diff --git a/core/src/include/baconfig.h b/core/src/include/baconfig.h
@@ -105,31 +105,9 @@ void InitWinAPIWrapper();
 
 #define ClearThreadId(x) memset(&(x), 0, sizeof(x))
 
-#if defined(BUILDING_DLL)
-#define DLL_IMP_EXP _declspec(dllexport)
-#define CATS_IMP_EXP _declspec(dllexport)
-#define SD_IMP_EXP _declspec(dllexport)
-#define BAREOSCFG_DLL_IMP_EXP _declspec(dllimport)
-#elif defined(BUILDING_BAREOS_DLL)
-#define DLL_IMP_EXP _declspec(dllexport)
-#define CATS_IMP_EXP _declspec(dllexport)
-#define SD_IMP_EXP _declspec(dllexport)
-#define BAREOSCFG_DLL_IMP_EXP _declspec(dllimport)
-#elif defined(BUILDING_BAREOSCFG_DLL)
-#define DLL_IMP_EXP _declspec(dllexport)
-#define CATS_IMP_EXP _declspec(dllexport)
-#define SD_IMP_EXP _declspec(dllexport)
-#define BAREOSCFG_DLL_IMP_EXP _declspec(dllexport)
-#elif defined(USING_DLL)
-#define DLL_IMP_EXP _declspec(dllimport)
-#define CATS_IMP_EXP _declspec(dllimport)
-#define SD_IMP_EXP _declspec(dllimport)
-#else
-#define BAREOSCFG_DLL_IMP_EXP
 #define DLL_IMP_EXP
 #define CATS_IMP_EXP
 #define SD_IMP_EXP
-#endif
 
 #else  /* HAVE_WIN32 */
 

diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -33,7 +33,7 @@ set(INCLUDE_FILES ../include/baconfig.h ../include/bareos.h
 
 INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${includedir})
 
-add_subdirectory(bareoscfg)
+#add_subdirectory(bareoscfg)
 add_subdirectory(bareos)
 
 IF(NOT HAVE_WIN32 AND GTEST_FOUND)

diff --git a/core/src/lib/bareos/CMakeLists.txt b/core/src/lib/bareos/CMakeLists.txt
@@ -52,12 +52,14 @@ IF(HAVE_WIN32)
       ../../win32/compat/print.cc
       ../../win32/compat/winapi.cc
       )
-   set(BAREOSCFG_IMPORT_LIB bareoscfg_import_a)
 ELSE()
    LIST(APPEND BAREOS_SRCS
      scsi_tapealert.cc)
 ENDIF()
 
+set (BAREOSCFG_SRCS ini.cc lex.cc parse_bsr.cc res.cc parse_conf.cc res.cc qualified_resource_name_type_converter.cc)
+LIST(APPEND BAREOS_SRCS ${BAREOSCFG_SRCS})
+
 #link_directories(${PROJECT_BINARY_DIR}/src/lib/bareos)
 add_library(bareos SHARED ${BAREOS_SRCS})
 
@@ -73,20 +75,6 @@ set_target_properties(bareos PROPERTIES VERSION "${VERSION}"
 
 
 IF(HAVE_WIN32)
-   IF ("${WINDOWS_BITS}" STREQUAL "64")
-      set(DLLTOOL x86_64-w64-mingw32-dlltool)
-   ELSE() 
-      set(DLLTOOL i686-w64-mingw32-dlltool)
-   ENDIF()
-
-   ADD_CUSTOM_COMMAND(
-      PRE_LINK
-      TARGET bareos
-      DEPENDS libbareoscfg_${WINDOWS_BITS}.def
-      COMMAND ${DLLTOOL} -d ${CMAKE_CURRENT_SOURCE_DIR}/libbareoscfg_${WINDOWS_BITS}.def -l libbareoscfg_import_a 
-      COMMAND echo ${CMAKE_CURRENT_BINARY_DIR}
-      COMMAND cp libbareoscfg_import_a  ${WINDOWS_IMPORT_LIB_DIRECTORY}/libbareoscfg_import_a.a)
-
-   set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_BAREOS_DLL")
+   set_target_properties(bareos PROPERTIES DEFINE_SYMBOL "BUILDING_DLL")
 ENDIF()