Merge branch 'develop'

Author: hevake

modules/alarm/CMakeLists.txt

@@ -81,7 +81,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/alarm
 )
 
-
 # generate and install export file
 install(
     EXPORT ${TBOX_LIBRARY_NAME}_targets

modules/crypto/CMakeLists.txt

@@ -69,7 +69,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/crypto
 )
 
-
 # generate and install export file
 install(
     EXPORT ${TBOX_LIBRARY_NAME}_targets

modules/event/CMakeLists.txt

@@ -30,34 +30,34 @@ add_definitions(-DMODULE_ID="tbox.event")
 set(TBOX_LIBRARY_NAME tbox_event)
 
 set(TBOX_EVENT_HEADERS
-            forward.h
-            loop.h
-            event.h
-            fd_event.h
-            timer_event.h
-            signal_event.h
-            stat.h)
+    forward.h
+    loop.h
+    event.h
+    fd_event.h
+    timer_event.h
+    signal_event.h
+    stat.h)
 
 set(TBOX_EVENT_SOURCES
-            loop.cpp
-            common_loop.cpp
-            common_loop_timer.cpp
-            common_loop_signal.cpp
-            common_loop_run.cpp
-            timer_event_impl.cpp
-            signal_event_impl.cpp
-            misc.cpp
-            stat.cpp
-            engines/epoll/loop.cpp
-            engines/epoll/fd_event.cpp
-            engines/select/loop.cpp
-            engines/select/fd_event.cpp)
+    loop.cpp
+    common_loop.cpp
+    common_loop_timer.cpp
+    common_loop_signal.cpp
+    common_loop_run.cpp
+    timer_event_impl.cpp
+    signal_event_impl.cpp
+    misc.cpp
+    stat.cpp
+    engines/epoll/loop.cpp
+    engines/epoll/fd_event.cpp
+    engines/select/loop.cpp
+    engines/select/fd_event.cpp)
 
 set(TBOX_EVENT_TEST_SOURCES
-            common_loop_test.cpp
-            fd_event_test.cpp
-            timer_event_test.cpp
-            signal_event_test.cpp)
+    common_loop_test.cpp
+    fd_event_test.cpp
+    timer_event_test.cpp
+    signal_event_test.cpp)
 
 add_library(${TBOX_LIBRARY_NAME} ${TBOX_BUILD_LIB_TYPE} ${TBOX_EVENT_SOURCES})
 add_library(tbox::${TBOX_LIBRARY_NAME} ALIAS ${TBOX_LIBRARY_NAME})
@@ -91,7 +91,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/event
 )
 
-
 # generate and install export file
 install(
     EXPORT ${TBOX_LIBRARY_NAME}_targets

modules/log/CMakeLists.txt

@@ -83,7 +83,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/log
 )
 
-
 # generate and install export file
 install(
     EXPORT ${TBOX_LIBRARY_NAME}_targets

modules/network/CMakeLists.txt

@@ -103,7 +103,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/network
 )
 
-
 # generate and install export file
 install(
     EXPORT ${TBOX_LIBRARY_NAME}_targets

modules/terminal/CMakeLists.txt

@@ -29,17 +29,6 @@ add_definitions(-DMODULE_ID="tbox.terminal")
 
 set(TBOX_LIBRARY_NAME tbox_terminal)
 
-set(TBOX_TERMINAL_HEADERS
-    types.h
-    connection.h
-    terminal_interact.h
-    terminal_nodes.h
-    session.h
-    terminal.h
-	helper.h
-    service/telnetd.h
-    service/tcp_rpc.h)
-
 set(TBOX_TERMINAL_SOURCES
     terminal.cpp
     session.cpp
@@ -86,10 +75,23 @@ install(
 
 # install header file
 install(
-    FILES ${TBOX_TERMINAL_HEADERS}
+    FILES
+    types.h
+    connection.h
+    terminal_interact.h
+    terminal_nodes.h
+    session.h
+    terminal.h
+    helper.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/terminal
 )
 
+install(
+    FILES
+    service/telnetd.h
+    service/tcp_rpc.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/terminal/service
+)
 
 # generate and install export file
 install(

modules/trace/CMakeLists.txt

@@ -29,14 +29,11 @@ add_definitions(-DMODULE_ID="tbox.trace")
 
 set(TBOX_LIBRARY_NAME tbox_trace)
 
-set(TBOX_LOG_HEADERS
-    sink.h)
+set(TBOX_LOG_HEADERS sink.h)
 
-set(TBOX_LOG_SOURCES
-    sink.cpp)
+set(TBOX_LOG_SOURCES sink.cpp)
 
-set(TBOX_LOG_TEST_SOURCES
-    sink_test.cpp)
+set(TBOX_LOG_TEST_SOURCES sink_test.cpp)
 
 add_library(${TBOX_LIBRARY_NAME} ${TBOX_BUILD_LIB_TYPE} ${TBOX_LOG_SOURCES})
 add_library(tbox::${TBOX_LIBRARY_NAME} ALIAS ${TBOX_LIBRARY_NAME})

modules/util/CMakeLists.txt

@@ -121,7 +121,6 @@ install(
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tbox/util
 )
 
-
 # generate and install export file
 install(
     EXPORT ${TBOX_LIBRARY_NAME}_targets

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 12
-TBOX_VERSION_REVISION := 1
+TBOX_VERSION_REVISION := 2