diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c42a93..053ea5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,5 +39,5 @@ add_subdirectory(externals) add_subdirectory(src) add_subdirectory(tests) -configure_file(extras/logger.cfg.dist src/logger.cfg COPYONLY) -configure_file(extras/swgchat.cfg.dist src/swgchat.cfg COPYONLY) +configure_file(extras/logger.cfg.dist src/stationchat/logger.cfg COPYONLY) +configure_file(extras/swgchat.cfg.dist src/stationchat/swgchat.cfg COPYONLY) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 53452f9..79583ca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,100 +1,2 @@ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/externals/easyloggingpp - ${Boost_INCLUDE_DIRS} - ${SQLite3_INCLUDE_DIR}) - -if(HAVE_UDPLIBRARY) - include_directories(${PROJECT_SOURCE_DIR}/externals/udplibrary) -endif() - -set(SOURCES - protocol/AddBan.hpp - protocol/AddFriend.hpp - protocol/AddIgnore.hpp - protocol/AddInvite.hpp - protocol/AddModerator.hpp - protocol/CreateRoom.hpp - protocol/DestroyAvatar.hpp - protocol/DestroyRoom.hpp - protocol/EnterRoom.hpp - protocol/FailoverReLoginAvatar.hpp - protocol/FriendStatus.hpp - protocol/GetAnyAvatar.hpp - protocol/GetPersistentHeaders.hpp - protocol/GetPersistentMessage.hpp - protocol/GetRoom.hpp - protocol/GetRoomSummaries.hpp - protocol/IgnoreStatus.hpp - protocol/KickAvatar.hpp - protocol/LeaveRoom.hpp - protocol/LoginAvatar.hpp - protocol/LogoutAvatar.hpp - protocol/Protocol.cpp - protocol/RegistrarGetChatServer.hpp - protocol/RemoveBan.hpp - protocol/RemoveFriend.hpp - protocol/RemoveIgnore.hpp - protocol/RemoveInvite.hpp - protocol/RemoveModerator.hpp - protocol/SendInstantMessage.hpp - protocol/SendPersistentMessage.hpp - protocol/SendRoomMessage.hpp - protocol/SetApiVersion.hpp - protocol/SetAvatarAttributes.hpp - protocol/UpdatePersistentMessage.hpp - - ChatAvatar.cpp - ChatAvatar.hpp - ChatAvatarService.cpp - ChatAvatarService.hpp - ChatEnums.cpp - ChatEnums.hpp - ChatRoom.cpp - ChatRoom.hpp - ChatRoomService.cpp - ChatRoomService.hpp - GatewayClient.cpp - GatewayClient.hpp - GatewayNode.cpp - GatewayNode.hpp - Message.hpp - Node.hpp - NodeClient.cpp - NodeClient.hpp - PersistentMessage.hpp - PersistentMessageService.cpp - PersistentMessageService.hpp - RegistrarClient.cpp - RegistrarClient.hpp - RegistrarNode.cpp - RegistrarNode.hpp - Serialization.hpp - SQLite3.hpp - StreamUtils.cpp - StreamUtils.hpp - StringUtils.cpp - StringUtils.hpp) - -add_library(stationapi ${SOURCES}) - -GroupSourceByFilesystem("${SOURCES}") - -add_executable(stationchat - main.cpp - StationChatApp.cpp - StationChatApp.hpp - StationChatConfig.hpp) - -target_link_libraries(stationchat - stationapi - ${Boost_LIBRARIES} - ${SQLite3_LIBRARY}) - -if (HAVE_UDPLIBRARY) - target_link_libraries(stationchat udplibrary) -endif() - -if(WIN32) - target_link_libraries(stationchat ws2_32) -endif() +add_subdirectory(stationapi) +add_subdirectory(stationchat) diff --git a/src/stationapi/CMakeLists.txt b/src/stationapi/CMakeLists.txt new file mode 100644 index 0000000..61670ef --- /dev/null +++ b/src/stationapi/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/externals/easyloggingpp + ${PROJECT_SOURCE_DIR}/externals/udplibrary + ${Boost_INCLUDE_DIRS} + ${SQLite3_INCLUDE_DIR}) + +set(SOURCES + Node.hpp + NodeClient.cpp + NodeClient.hpp + Serialization.hpp + SQLite3.hpp + StreamUtils.cpp + StreamUtils.hpp + StringUtils.cpp + StringUtils.hpp) + +add_library(stationapi ${SOURCES}) + +GroupSourceByFilesystem("${SOURCES}") diff --git a/src/Node.hpp b/src/stationapi/Node.hpp similarity index 100% rename from src/Node.hpp rename to src/stationapi/Node.hpp diff --git a/src/NodeClient.cpp b/src/stationapi/NodeClient.cpp similarity index 100% rename from src/NodeClient.cpp rename to src/stationapi/NodeClient.cpp diff --git a/src/NodeClient.hpp b/src/stationapi/NodeClient.hpp similarity index 100% rename from src/NodeClient.hpp rename to src/stationapi/NodeClient.hpp diff --git a/src/SQLite3.hpp b/src/stationapi/SQLite3.hpp similarity index 100% rename from src/SQLite3.hpp rename to src/stationapi/SQLite3.hpp diff --git a/src/Serialization.hpp b/src/stationapi/Serialization.hpp similarity index 100% rename from src/Serialization.hpp rename to src/stationapi/Serialization.hpp diff --git a/src/StreamUtils.cpp b/src/stationapi/StreamUtils.cpp similarity index 100% rename from src/StreamUtils.cpp rename to src/stationapi/StreamUtils.cpp diff --git a/src/StreamUtils.hpp b/src/stationapi/StreamUtils.hpp similarity index 100% rename from src/StreamUtils.hpp rename to src/stationapi/StreamUtils.hpp diff --git a/src/StringUtils.cpp b/src/stationapi/StringUtils.cpp similarity index 100% rename from src/StringUtils.cpp rename to src/stationapi/StringUtils.cpp diff --git a/src/StringUtils.hpp b/src/stationapi/StringUtils.hpp similarity index 100% rename from src/StringUtils.hpp rename to src/stationapi/StringUtils.hpp diff --git a/src/stationchat/CMakeLists.txt b/src/stationchat/CMakeLists.txt new file mode 100644 index 0000000..68af2a0 --- /dev/null +++ b/src/stationchat/CMakeLists.txt @@ -0,0 +1,84 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/src/stationapi + ${PROJECT_SOURCE_DIR}/externals/easyloggingpp + ${PROJECT_SOURCE_DIR}/externals/udplibrary + ${Boost_INCLUDE_DIRS} + ${SQLite3_INCLUDE_DIR}) + +set(SOURCES + protocol/AddBan.hpp + protocol/AddFriend.hpp + protocol/AddIgnore.hpp + protocol/AddInvite.hpp + protocol/AddModerator.hpp + protocol/CreateRoom.hpp + protocol/DestroyAvatar.hpp + protocol/DestroyRoom.hpp + protocol/EnterRoom.hpp + protocol/FailoverReLoginAvatar.hpp + protocol/FriendStatus.hpp + protocol/GetAnyAvatar.hpp + protocol/GetPersistentHeaders.hpp + protocol/GetPersistentMessage.hpp + protocol/GetRoom.hpp + protocol/GetRoomSummaries.hpp + protocol/IgnoreStatus.hpp + protocol/KickAvatar.hpp + protocol/LeaveRoom.hpp + protocol/LoginAvatar.hpp + protocol/LogoutAvatar.hpp + protocol/Protocol.cpp + protocol/RegistrarGetChatServer.hpp + protocol/RemoveBan.hpp + protocol/RemoveFriend.hpp + protocol/RemoveIgnore.hpp + protocol/RemoveInvite.hpp + protocol/RemoveModerator.hpp + protocol/SendInstantMessage.hpp + protocol/SendPersistentMessage.hpp + protocol/SendRoomMessage.hpp + protocol/SetApiVersion.hpp + protocol/SetAvatarAttributes.hpp + protocol/UpdatePersistentMessage.hpp + + ChatAvatar.cpp + ChatAvatar.hpp + ChatAvatarService.cpp + ChatAvatarService.hpp + ChatEnums.cpp + ChatEnums.hpp + ChatRoom.cpp + ChatRoom.hpp + ChatRoomService.cpp + ChatRoomService.hpp + GatewayClient.cpp + GatewayClient.hpp + GatewayNode.cpp + GatewayNode.hpp + main.cpp + Message.hpp + PersistentMessage.hpp + PersistentMessageService.cpp + PersistentMessageService.hpp + RegistrarClient.cpp + RegistrarClient.hpp + RegistrarNode.cpp + RegistrarNode.hpp + StationChatApp.cpp + StationChatApp.hpp + StationChatConfig.hpp) + +add_executable(stationchat ${SOURCES}) + +GroupSourceByFilesystem("${SOURCES}") + +target_link_libraries(stationchat + stationapi + udplibrary + ${Boost_LIBRARIES} + ${SQLite3_LIBRARY}) + +if(WIN32) + target_link_libraries(stationchat ws2_32) +endif() diff --git a/src/ChatAvatar.cpp b/src/stationchat/ChatAvatar.cpp similarity index 100% rename from src/ChatAvatar.cpp rename to src/stationchat/ChatAvatar.cpp diff --git a/src/ChatAvatar.hpp b/src/stationchat/ChatAvatar.hpp similarity index 100% rename from src/ChatAvatar.hpp rename to src/stationchat/ChatAvatar.hpp diff --git a/src/ChatAvatarService.cpp b/src/stationchat/ChatAvatarService.cpp similarity index 100% rename from src/ChatAvatarService.cpp rename to src/stationchat/ChatAvatarService.cpp diff --git a/src/ChatAvatarService.hpp b/src/stationchat/ChatAvatarService.hpp similarity index 100% rename from src/ChatAvatarService.hpp rename to src/stationchat/ChatAvatarService.hpp diff --git a/src/ChatEnums.cpp b/src/stationchat/ChatEnums.cpp similarity index 100% rename from src/ChatEnums.cpp rename to src/stationchat/ChatEnums.cpp diff --git a/src/ChatEnums.hpp b/src/stationchat/ChatEnums.hpp similarity index 100% rename from src/ChatEnums.hpp rename to src/stationchat/ChatEnums.hpp diff --git a/src/ChatRoom.cpp b/src/stationchat/ChatRoom.cpp similarity index 100% rename from src/ChatRoom.cpp rename to src/stationchat/ChatRoom.cpp diff --git a/src/ChatRoom.hpp b/src/stationchat/ChatRoom.hpp similarity index 100% rename from src/ChatRoom.hpp rename to src/stationchat/ChatRoom.hpp diff --git a/src/ChatRoomService.cpp b/src/stationchat/ChatRoomService.cpp similarity index 100% rename from src/ChatRoomService.cpp rename to src/stationchat/ChatRoomService.cpp diff --git a/src/ChatRoomService.hpp b/src/stationchat/ChatRoomService.hpp similarity index 100% rename from src/ChatRoomService.hpp rename to src/stationchat/ChatRoomService.hpp diff --git a/src/Contact.hpp b/src/stationchat/Contact.hpp similarity index 100% rename from src/Contact.hpp rename to src/stationchat/Contact.hpp diff --git a/src/GatewayClient.cpp b/src/stationchat/GatewayClient.cpp similarity index 100% rename from src/GatewayClient.cpp rename to src/stationchat/GatewayClient.cpp diff --git a/src/GatewayClient.hpp b/src/stationchat/GatewayClient.hpp similarity index 100% rename from src/GatewayClient.hpp rename to src/stationchat/GatewayClient.hpp diff --git a/src/GatewayNode.cpp b/src/stationchat/GatewayNode.cpp similarity index 100% rename from src/GatewayNode.cpp rename to src/stationchat/GatewayNode.cpp diff --git a/src/GatewayNode.hpp b/src/stationchat/GatewayNode.hpp similarity index 100% rename from src/GatewayNode.hpp rename to src/stationchat/GatewayNode.hpp diff --git a/src/Message.hpp b/src/stationchat/Message.hpp similarity index 100% rename from src/Message.hpp rename to src/stationchat/Message.hpp diff --git a/src/PersistentMessage.hpp b/src/stationchat/PersistentMessage.hpp similarity index 100% rename from src/PersistentMessage.hpp rename to src/stationchat/PersistentMessage.hpp diff --git a/src/PersistentMessageService.cpp b/src/stationchat/PersistentMessageService.cpp similarity index 100% rename from src/PersistentMessageService.cpp rename to src/stationchat/PersistentMessageService.cpp diff --git a/src/PersistentMessageService.hpp b/src/stationchat/PersistentMessageService.hpp similarity index 100% rename from src/PersistentMessageService.hpp rename to src/stationchat/PersistentMessageService.hpp diff --git a/src/RegistrarClient.cpp b/src/stationchat/RegistrarClient.cpp similarity index 100% rename from src/RegistrarClient.cpp rename to src/stationchat/RegistrarClient.cpp diff --git a/src/RegistrarClient.hpp b/src/stationchat/RegistrarClient.hpp similarity index 100% rename from src/RegistrarClient.hpp rename to src/stationchat/RegistrarClient.hpp diff --git a/src/RegistrarNode.cpp b/src/stationchat/RegistrarNode.cpp similarity index 100% rename from src/RegistrarNode.cpp rename to src/stationchat/RegistrarNode.cpp diff --git a/src/RegistrarNode.hpp b/src/stationchat/RegistrarNode.hpp similarity index 100% rename from src/RegistrarNode.hpp rename to src/stationchat/RegistrarNode.hpp diff --git a/src/StationChatApp.cpp b/src/stationchat/StationChatApp.cpp similarity index 100% rename from src/StationChatApp.cpp rename to src/stationchat/StationChatApp.cpp diff --git a/src/StationChatApp.hpp b/src/stationchat/StationChatApp.hpp similarity index 100% rename from src/StationChatApp.hpp rename to src/stationchat/StationChatApp.hpp diff --git a/src/StationChatConfig.hpp b/src/stationchat/StationChatConfig.hpp similarity index 100% rename from src/StationChatConfig.hpp rename to src/stationchat/StationChatConfig.hpp diff --git a/src/main.cpp b/src/stationchat/main.cpp similarity index 100% rename from src/main.cpp rename to src/stationchat/main.cpp diff --git a/src/protocol/AddBan.hpp b/src/stationchat/protocol/AddBan.hpp similarity index 100% rename from src/protocol/AddBan.hpp rename to src/stationchat/protocol/AddBan.hpp diff --git a/src/protocol/AddFriend.hpp b/src/stationchat/protocol/AddFriend.hpp similarity index 100% rename from src/protocol/AddFriend.hpp rename to src/stationchat/protocol/AddFriend.hpp diff --git a/src/protocol/AddIgnore.hpp b/src/stationchat/protocol/AddIgnore.hpp similarity index 100% rename from src/protocol/AddIgnore.hpp rename to src/stationchat/protocol/AddIgnore.hpp diff --git a/src/protocol/AddInvite.hpp b/src/stationchat/protocol/AddInvite.hpp similarity index 100% rename from src/protocol/AddInvite.hpp rename to src/stationchat/protocol/AddInvite.hpp diff --git a/src/protocol/AddModerator.hpp b/src/stationchat/protocol/AddModerator.hpp similarity index 100% rename from src/protocol/AddModerator.hpp rename to src/stationchat/protocol/AddModerator.hpp diff --git a/src/protocol/CreateRoom.hpp b/src/stationchat/protocol/CreateRoom.hpp similarity index 100% rename from src/protocol/CreateRoom.hpp rename to src/stationchat/protocol/CreateRoom.hpp diff --git a/src/protocol/DestroyAvatar.hpp b/src/stationchat/protocol/DestroyAvatar.hpp similarity index 100% rename from src/protocol/DestroyAvatar.hpp rename to src/stationchat/protocol/DestroyAvatar.hpp diff --git a/src/protocol/DestroyRoom.hpp b/src/stationchat/protocol/DestroyRoom.hpp similarity index 100% rename from src/protocol/DestroyRoom.hpp rename to src/stationchat/protocol/DestroyRoom.hpp diff --git a/src/protocol/EnterRoom.hpp b/src/stationchat/protocol/EnterRoom.hpp similarity index 100% rename from src/protocol/EnterRoom.hpp rename to src/stationchat/protocol/EnterRoom.hpp diff --git a/src/protocol/FailoverReLoginAvatar.hpp b/src/stationchat/protocol/FailoverReLoginAvatar.hpp similarity index 100% rename from src/protocol/FailoverReLoginAvatar.hpp rename to src/stationchat/protocol/FailoverReLoginAvatar.hpp diff --git a/src/protocol/FriendStatus.hpp b/src/stationchat/protocol/FriendStatus.hpp similarity index 100% rename from src/protocol/FriendStatus.hpp rename to src/stationchat/protocol/FriendStatus.hpp diff --git a/src/protocol/GetAnyAvatar.hpp b/src/stationchat/protocol/GetAnyAvatar.hpp similarity index 100% rename from src/protocol/GetAnyAvatar.hpp rename to src/stationchat/protocol/GetAnyAvatar.hpp diff --git a/src/protocol/GetPersistentHeaders.hpp b/src/stationchat/protocol/GetPersistentHeaders.hpp similarity index 100% rename from src/protocol/GetPersistentHeaders.hpp rename to src/stationchat/protocol/GetPersistentHeaders.hpp diff --git a/src/protocol/GetPersistentMessage.hpp b/src/stationchat/protocol/GetPersistentMessage.hpp similarity index 100% rename from src/protocol/GetPersistentMessage.hpp rename to src/stationchat/protocol/GetPersistentMessage.hpp diff --git a/src/protocol/GetRoom.hpp b/src/stationchat/protocol/GetRoom.hpp similarity index 100% rename from src/protocol/GetRoom.hpp rename to src/stationchat/protocol/GetRoom.hpp diff --git a/src/protocol/GetRoomSummaries.hpp b/src/stationchat/protocol/GetRoomSummaries.hpp similarity index 100% rename from src/protocol/GetRoomSummaries.hpp rename to src/stationchat/protocol/GetRoomSummaries.hpp diff --git a/src/protocol/IgnoreStatus.hpp b/src/stationchat/protocol/IgnoreStatus.hpp similarity index 100% rename from src/protocol/IgnoreStatus.hpp rename to src/stationchat/protocol/IgnoreStatus.hpp diff --git a/src/protocol/KickAvatar.hpp b/src/stationchat/protocol/KickAvatar.hpp similarity index 100% rename from src/protocol/KickAvatar.hpp rename to src/stationchat/protocol/KickAvatar.hpp diff --git a/src/protocol/LeaveRoom.hpp b/src/stationchat/protocol/LeaveRoom.hpp similarity index 100% rename from src/protocol/LeaveRoom.hpp rename to src/stationchat/protocol/LeaveRoom.hpp diff --git a/src/protocol/LoginAvatar.hpp b/src/stationchat/protocol/LoginAvatar.hpp similarity index 100% rename from src/protocol/LoginAvatar.hpp rename to src/stationchat/protocol/LoginAvatar.hpp diff --git a/src/protocol/LogoutAvatar.hpp b/src/stationchat/protocol/LogoutAvatar.hpp similarity index 100% rename from src/protocol/LogoutAvatar.hpp rename to src/stationchat/protocol/LogoutAvatar.hpp diff --git a/src/protocol/Protocol.cpp b/src/stationchat/protocol/Protocol.cpp similarity index 100% rename from src/protocol/Protocol.cpp rename to src/stationchat/protocol/Protocol.cpp diff --git a/src/protocol/RegistrarGetChatServer.hpp b/src/stationchat/protocol/RegistrarGetChatServer.hpp similarity index 100% rename from src/protocol/RegistrarGetChatServer.hpp rename to src/stationchat/protocol/RegistrarGetChatServer.hpp diff --git a/src/protocol/RemoveBan.hpp b/src/stationchat/protocol/RemoveBan.hpp similarity index 100% rename from src/protocol/RemoveBan.hpp rename to src/stationchat/protocol/RemoveBan.hpp diff --git a/src/protocol/RemoveFriend.hpp b/src/stationchat/protocol/RemoveFriend.hpp similarity index 100% rename from src/protocol/RemoveFriend.hpp rename to src/stationchat/protocol/RemoveFriend.hpp diff --git a/src/protocol/RemoveIgnore.hpp b/src/stationchat/protocol/RemoveIgnore.hpp similarity index 100% rename from src/protocol/RemoveIgnore.hpp rename to src/stationchat/protocol/RemoveIgnore.hpp diff --git a/src/protocol/RemoveInvite.hpp b/src/stationchat/protocol/RemoveInvite.hpp similarity index 100% rename from src/protocol/RemoveInvite.hpp rename to src/stationchat/protocol/RemoveInvite.hpp diff --git a/src/protocol/RemoveModerator.hpp b/src/stationchat/protocol/RemoveModerator.hpp similarity index 100% rename from src/protocol/RemoveModerator.hpp rename to src/stationchat/protocol/RemoveModerator.hpp diff --git a/src/protocol/SendInstantMessage.hpp b/src/stationchat/protocol/SendInstantMessage.hpp similarity index 100% rename from src/protocol/SendInstantMessage.hpp rename to src/stationchat/protocol/SendInstantMessage.hpp diff --git a/src/protocol/SendPersistentMessage.hpp b/src/stationchat/protocol/SendPersistentMessage.hpp similarity index 100% rename from src/protocol/SendPersistentMessage.hpp rename to src/stationchat/protocol/SendPersistentMessage.hpp diff --git a/src/protocol/SendRoomMessage.hpp b/src/stationchat/protocol/SendRoomMessage.hpp similarity index 100% rename from src/protocol/SendRoomMessage.hpp rename to src/stationchat/protocol/SendRoomMessage.hpp diff --git a/src/protocol/SetApiVersion.hpp b/src/stationchat/protocol/SetApiVersion.hpp similarity index 100% rename from src/protocol/SetApiVersion.hpp rename to src/stationchat/protocol/SetApiVersion.hpp diff --git a/src/protocol/SetAvatarAttributes.hpp b/src/stationchat/protocol/SetAvatarAttributes.hpp similarity index 100% rename from src/protocol/SetAvatarAttributes.hpp rename to src/stationchat/protocol/SetAvatarAttributes.hpp diff --git a/src/protocol/UpdatePersistentMessage.hpp b/src/stationchat/protocol/UpdatePersistentMessage.hpp similarity index 100% rename from src/protocol/UpdatePersistentMessage.hpp rename to src/stationchat/protocol/UpdatePersistentMessage.hpp