Changeset 4883 for branches/erijo-dev

Show
Ignore:
Timestamp:
04/02/07 05:29:13 (20 months ago)
Author:
erijo
Message:

Restructure by moving event stuff to its own directory

Location:
branches/erijo-dev/licq
Files:
4 added
8 modified
1 copied
12 moved

Legend:

Unmodified
Added
Removed

  • branches/erijo-dev/licq/CMakeLists.txt

    r4881 r4883  
    66if (NOT CMAKE_BUILD_TYPE) 
    77  set(CMAKE_BUILD_TYPE Debug CACHE STRING 
    8     "Choose the type of build, options are: " 
    9     "None Debug Release RelWithDebInfo MinSizeRel Maintainer." 
     8    "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." 
    109    FORCE) 
    1110endif (NOT CMAKE_BUILD_TYPE) 
    … …  
    2120# Added as part of the default target 
    2221add_custom_target(tests ALL COMMAND ctest 
    23   DEPENDS licqutilstest licqplugintest licqdaemontest 
     22  DEPENDS 
     23  daemontest 
     24  eventtest 
     25  plugintest 
     26  utilstest 
    2427  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) 
    2528 
    … …  
    4952link_directories(${Boost_LIBRARY_DIRS}) 
    5053 
    51 # To find licq directory 
    52 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 
     54# To find licq directory (public headers) 
     55include_directories(BEFORE ${PROJECT_SOURCE_DIR}) 
     56 
     57# Base directory for all internal headers 
     58include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src) 
    5359 
    5460# To find config.h 
    55 include_directories(${CMAKE_CURRENT_BINARY_DIR}) 
     61include_directories(BEFORE ${PROJECT_BINARY_DIR}) 
    5662 
    5763# Generate config.h 
    5864configure_file( 
    59   ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake 
    60   ${CMAKE_CURRENT_BINARY_DIR}/config.h 
     65  ${PROJECT_SOURCE_DIR}/config.h.cmake 
     66  ${PROJECT_BINARY_DIR}/config.h 
    6167) 
    6268 

  • branches/erijo-dev/licq/src/CMakeLists.txt

    r4881 r4883  
    1 set(licqdaemon_SRCS 
     1set(daemon_SRCS 
    22  daemon.cpp 
    3   event.cpp 
    4   eventloop.cpp 
    5   eventqueue.cpp 
    63  logfile.cpp 
    74  version.cpp 
    85) 
    96 
    10 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 
    11  
    12 add_library(licqdaemon STATIC ${licqdaemon_SRCS}) 
    13 target_link_libraries(licqdaemon licqutils) 
    14 target_link_libraries(licqdaemon licqplugin) 
    15 target_link_libraries(licqdaemon boost_filesystem) 
     7add_library(daemon STATIC ${daemon_SRCS}) 
     8target_link_libraries(daemon boost_filesystem) 
     9target_link_libraries(daemon utils) 
    1610 
    1711add_executable(licq main.cpp) 
    18 target_link_libraries(licq licqdaemon) 
     12target_link_libraries(licq daemon) 
     13target_link_libraries(licq event) 
     14target_link_libraries(licq plugin) 
     15target_link_libraries(licq utils) 
    1916 
     17add_subdirectory(event) 
     18add_subdirectory(plugin) 
    2019add_subdirectory(tests) 
    2120add_subdirectory(utils) 
    22 add_subdirectory(plugin) 

  • branches/erijo-dev/licq/src/daemon.h

    r4881 r4883  
    2424#include "licq/eventloop.h" 
    2525 
    26 #include "eventqueue.h" 
     26#include "event/eventqueue.h" 
    2727#include "logfile.h" 
    2828#include "plugin/pluginrepository.h" 

  • branches/erijo-dev/licq/src/event/event.cpp

    r4882 r4883  
    1818 */ 
    1919 
    20 #include "event.h" 
     20#include "event/event.h" 
    2121 
    2222Licq::IEventPtr Licq::IEvent::create(TPluginId sender, const std::string& eventName) 

  • branches/erijo-dev/licq/src/event/eventloop.cpp

    r4881 r4883  
    2222#include "licq/interface/eventhandler.h" 
    2323#include "licq/interface/eventqueue.h" 
    24 #include "utils/fdset.h" 
    25 #include "utils/timerset.h" 
     24#include "event/fdset.h" 
     25#include "event/timerset.h" 
    2626 
    2727#include <cerrno> 

  • branches/erijo-dev/licq/src/event/eventqueue.cpp

    r4875 r4883  
    1818 */ 
    1919 
    20 #include "eventqueue.h" 
     20#include "event/eventqueue.h" 
    2121#include "utils/mutexlocker.h" 
    2222 

  • branches/erijo-dev/licq/src/event/fdset.cpp

    r4880 r4883  
    1818 */ 
    1919 
    20 #include "utils/fdset.h" 
     20#include "event/fdset.h" 
    2121#include "utils/misc.h" 
    2222 

  • branches/erijo-dev/licq/src/event/tests/eventqueuetest.cpp

    r4882 r4883  
    2020#include <boost/test/auto_unit_test.hpp> 
    2121 
    22 #include "eventqueue.h" 
     22#include "event/eventqueue.h" 
    2323 
    2424BOOST_AUTO_UNIT_TEST( tc_version ) 
    … …  
    6161  BOOST_CHECK_EQUAL(ret1->getName(), "event-1"); 
    6262 
    63   int answer; 
     63  int answer = 0; 
    6464  BOOST_CHECK_EQUAL(ret1->getProperty("answer", &answer), true); 
    6565  BOOST_CHECK_EQUAL(answer, 42); 

  • branches/erijo-dev/licq/src/event/tests/eventtest.cpp

    r4882 r4883  
    2121#include <boost/test/floating_point_comparison.hpp> 
    2222 
    23 #include "event.h" 
     23#include "event/event.h" 
    2424 
    2525class TCopyCounter 

  • branches/erijo-dev/licq/src/event/tests/timersettest.cpp

    r4880 r4883  
    2020#include <boost/test/auto_unit_test.hpp> 
    2121 
    22 #include "utils/timerset.h" 
     22#include "event/timerset.h" 
    2323 
    2424BOOST_AUTO_UNIT_TEST( tc_timerset ) 

  • branches/erijo-dev/licq/src/event/timerset.cpp

    r4880 r4883  
    1818 */ 
    1919 
     20#include "event/timerset.h" 
    2021#include "utils/misc.h" 
    21 #include "utils/timerset.h" 
    2222 
    2323#include <algorithm> 

  • branches/erijo-dev/licq/src/plugin/CMakeLists.txt

    r4869 r4883  
    1 set(licqplugin_SRCS 
     1set(plugin_SRCS 
    22  pluginloader.cpp 
    33  pluginrepository.cpp 
    44) 
    55 
    6 add_library(licqplugin STATIC ${licqplugin_SRCS}) 
    7 target_link_libraries(licqplugin licqutils) 
     6add_library(plugin STATIC ${plugin_SRCS}) 
     7target_link_libraries(plugin utils) 
    88 
    99add_subdirectory(tests) 

  • branches/erijo-dev/licq/src/plugin/tests/CMakeLists.txt

    r4869 r4883  
    1 set(licqplugintest_SRCS 
     1set(plugintest_SRCS 
    22  main.cpp 
    33  pluginfactorytest.cpp 
    44) 
    55 
    6 add_executable(licqplugintest ${licqplugintest_SRCS}) 
    7 target_link_libraries(licqplugintest licqplugin) 
    8 target_link_libraries(licqplugintest boost_unit_test_framework) 
     6add_executable(plugintest ${plugintest_SRCS}) 
     7target_link_libraries(plugintest boost_unit_test_framework) 
     8target_link_libraries(plugintest plugin) 
    99 
    10 add_test(plugin licqplugintest) 
     10add_test(plugin plugintest) 

  • branches/erijo-dev/licq/src/tests/CMakeLists.txt

    r4839 r4883  
    1 set(licqdaemontest_SRCS 
    2   eventqueuetest.cpp 
    3   eventtest.cpp 
     1set(daemontest_SRCS 
    42  logfiletest.cpp 
    53  logserializertest.cpp 
    … …  
    86) 
    97 
    10 add_executable(licqdaemontest ${licqdaemontest_SRCS}) 
    11 target_link_libraries(licqdaemontest licqdaemon) 
    12 target_link_libraries(licqdaemontest boost_unit_test_framework) 
     8add_executable(daemontest ${daemontest_SRCS}) 
     9target_link_libraries(daemontest boost_unit_test_framework) 
     10target_link_libraries(daemontest daemon) 
    1311 
    14 add_test(daemon licqdaemontest) 
     12add_test(daemon daemontest) 

  • branches/erijo-dev/licq/src/utils/CMakeLists.txt

    r4880 r4883  
    1 set(licqutils_SRCS 
     1set(utils_SRCS 
    22  dynamiclibrary.cpp 
    3   fdset.cpp 
    43  mutex.cpp 
    54  mutexlocker.cpp 
    … …  
    76  thread.cpp 
    87  timer.cpp 
    9   timerset.cpp 
    108) 
    119 
    12 add_library(licqutils STATIC ${licqutils_SRCS}) 
    13 target_link_libraries(licqutils dl) 
     10add_library(utils STATIC ${utils_SRCS}) 
     11target_link_libraries(utils dl) 
    1412 
    1513add_subdirectory(tests) 

  • branches/erijo-dev/licq/src/utils/tests/CMakeLists.txt

    r4880 r4883  
    1 set(licqutilstest_SRCS 
     1set(utilstest_SRCS 
    22  dynamiclibrarytest.cpp 
    33  main.cpp 
    … …  
    77  pipetest.cpp 
    88  timertest.cpp 
    9   timersettest.cpp 
    109) 
    1110 
    12 add_executable(licqutilstest ${licqutilstest_SRCS}) 
    13 target_link_libraries(licqutilstest licqutils) 
    14 target_link_libraries(licqutilstest boost_unit_test_framework) 
     11add_executable(utilstest ${utilstest_SRCS}) 
     12target_link_libraries(utilstest boost_unit_test_framework) 
     13target_link_libraries(utilstest utils) 
    1514 
    16 add_test(utils licqutilstest) 
     15add_test(utils utilstest)