Move campaignd and wesnothd files into more descriptive locations.

Also fix a few cases of not specifying the full path to header files.

.gitignore

@@ -96,9 +96,7 @@ stamp-h1
 # build directories
 /wesnoth*
 /wesnothd*
-wesnothd/
 /campaignd*
-campaignd/
 /cutter*
 cutter/
 /exploder*

source_lists/campaignd

@@ -1,7 +1,7 @@
 addon/validation.cpp
-campaign_server/addon_utils.cpp
-campaign_server/blacklist.cpp
-campaign_server/campaign_server.cpp
-campaign_server/fs_commit.cpp
-server/server_base.cpp
-server/simple_wml.cpp
+server/common/server_base.cpp
+server/common/simple_wml.cpp
+server/campaignd/addon_utils.cpp
+server/campaignd/blacklist.cpp
+server/campaignd/fs_commit.cpp
+server/campaignd/server.cpp

source_lists/wesnothd

@@ -1,14 +1,14 @@
-server/ban.cpp
-server/forum_user_handler.cpp
-server/game.cpp
-server/metrics.cpp
-server/dbconn.cpp
-server/player.cpp
-server/player_connection.cpp
-server/player_network.cpp
-server/server.cpp
-server/server_base.cpp
-server/simple_wml.cpp
-server/user_handler.cpp
-server/resultsets/tournaments.cpp
-server/resultsets/ban_check.cpp
+server/common/dbconn.cpp
+server/common/user_handler.cpp
+server/common/forum_user_handler.cpp
+server/common/resultsets/ban_check.cpp
+server/common/resultsets/tournaments.cpp
+server/common/server_base.cpp
+server/common/simple_wml.cpp
+server/wesnothd/ban.cpp
+server/wesnothd/game.cpp
+server/wesnothd/metrics.cpp
+server/wesnothd/player.cpp
+server/wesnothd/player_connection.cpp
+server/wesnothd/player_network.cpp
+server/wesnothd/server.cpp

src/server/campaignd/addon_utils.cpp

@@ -13,7 +13,7 @@
    See the COPYING file for more details.
 */
 
-#include "campaign_server/addon_utils.hpp"
+#include "server/campaignd/addon_utils.hpp"
 
 #include "config.hpp"
 #include "filesystem.hpp"

src/server/campaignd/blacklist.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "campaign_server/blacklist.hpp"
+#include "server/campaignd/blacklist.hpp"
 
 #include "log.hpp"
 #include "serialization/string_utils.hpp"

src/server/campaignd/fs_commit.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "campaign_server/fs_commit.hpp"
+#include "server/campaignd/fs_commit.hpp"
 
 #include "log.hpp"
 #include "serialization/parser.hpp"

src/server/campaignd/server.cpp

@@ -19,7 +19,7 @@
  * and saves addons under data/.
  */
 
-#include "campaign_server/campaign_server.hpp"
+#include "server/campaignd/server.hpp"
 
 #include "filesystem.hpp"
 #include "lexical_cast.hpp"
@@ -31,10 +31,10 @@
 #include "serialization/unicode.hpp"
 #include "game_config.hpp"
 #include "addon/validation.hpp"
-#include "campaign_server/addon_utils.hpp"
-#include "campaign_server/blacklist.hpp"
-#include "campaign_server/control.hpp"
-#include "campaign_server/fs_commit.hpp"
+#include "server/campaignd/addon_utils.hpp"
+#include "server/campaignd/blacklist.hpp"
+#include "server/campaignd/control.hpp"
+#include "server/campaignd/fs_commit.hpp"
 #include "game_version.hpp"
 #include "hash.hpp"
 
@@ -63,7 +63,7 @@ static lg::log_domain log_config("config");
 static lg::log_domain log_server("server");
 #define ERR_SERVER LOG_STREAM(err, log_server)
 
-#include "server/send_receive_wml_helpers.ipp"
+#include "server/common/send_receive_wml_helpers.ipp"
 
 namespace {
 

src/server/campaignd/server.hpp

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "campaign_server/blacklist.hpp"
-#include "server/server_base.hpp"
-#include "server/simple_wml.hpp"
+#include "server/campaignd/blacklist.hpp"
+#include "server/common/server_base.hpp"
+#include "server/common/simple_wml.hpp"
 
 #include "utils/functional.hpp"
 #include <boost/unordered_map.hpp>

src/server/common/dbconn.cpp

@@ -13,9 +13,9 @@
 
 #ifdef HAVE_MYSQLPP
 
-#include "dbconn.hpp"
-#include "resultsets/tournaments.hpp"
-#include "resultsets/ban_check.hpp"
+#include "server/common/dbconn.hpp"
+#include "server/common/resultsets/tournaments.hpp"
+#include "server/common/resultsets/ban_check.hpp"
 #include "log.hpp"
 
 static lg::log_domain log_sql_handler("sql_executor");

src/server/common/dbconn.hpp

@@ -14,8 +14,8 @@
 #pragma once
 
 #include "config.hpp"
-#include "resultsets/rs_base.hpp"
-#include "resultsets/ban_check.hpp"
+#include "server/common/resultsets/rs_base.hpp"
+#include "server/common/resultsets/ban_check.hpp"
 
 #include <mysql/mysql.h>
 #include "mariadb++/account.hpp"

src/server/common/forum_user_handler.cpp

@@ -14,7 +14,7 @@
 
 #ifdef HAVE_MYSQLPP
 
-#include "server/forum_user_handler.hpp"
+#include "server/common/forum_user_handler.hpp"
 #include "hash.hpp"
 #include "log.hpp"
 #include "config.hpp"

src/server/common/forum_user_handler.hpp

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "server/user_handler.hpp"
-#include "dbconn.hpp"
+#include "server/common/user_handler.hpp"
+#include "server/common/dbconn.hpp"
 
 #include <vector>
 #include <memory>

src/server/common/resultsets/ban_check.cpp

@@ -15,8 +15,8 @@
 
 #include <ctime>
 
-#include "ban_check.hpp"
-#include "server/user_handler.hpp"
+#include "server/common/resultsets/ban_check.hpp"
+#include "server/common/user_handler.hpp"
 
 ban_check::ban_check()
 {

src/server/common/resultsets/ban_check.hpp

@@ -15,7 +15,7 @@
 
 #include "mariadb++/result_set.hpp"
 
-#include "rs_base.hpp"
+#include "server/common/resultsets/rs_base.hpp"
 
 class ban_check : public rs_base
 {
@@ -32,4 +32,4 @@ class ban_check : public rs_base
         int ban_duration;
         int user_id;
         std::string email;
-};
+};

src/server/common/resultsets/tournaments.cpp

@@ -13,7 +13,7 @@
 
 #ifdef HAVE_MYSQLPP
 
-#include "tournaments.hpp"
+#include "server/common/resultsets/tournaments.hpp"
 
 void tournaments::read(mariadb::result_set_ref rslt)
 {

src/server/common/resultsets/tournaments.hpp

@@ -15,7 +15,7 @@
 
 #include "mariadb++/result_set.hpp"
 
-#include "rs_base.hpp"
+#include "server/common/resultsets/rs_base.hpp"
 
 #include <vector>
 
@@ -34,4 +34,4 @@ class tournaments : public rs_base
     
     private:
         std::vector<data> rows;
-};
+};

src/server/common/send_receive_wml_helpers.ipp

@@ -27,8 +27,8 @@
 #include <windows.h>
 #endif
 
-#include "server/server_base.hpp"
-#include "server/simple_wml.hpp"
+#include "server/common/server_base.hpp"
+#include "server/common/simple_wml.hpp"
 #include "filesystem.hpp"
 #include "serialization/unicode_cast.hpp" //only used in windows specific code.
 

src/server/common/server_base.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "server/server_base.hpp"
+#include "server/common/server_base.hpp"
 
 #include "lexical_cast.hpp"
 #include "log.hpp"
@@ -28,7 +28,7 @@ static lg::log_domain log_config("config");
 #define ERR_CONFIG LOG_STREAM(err, log_config)
 #define WRN_CONFIG LOG_STREAM(warn, log_config)
 
-#include "server/send_receive_wml_helpers.ipp"
+#include "server/common/send_receive_wml_helpers.ipp"
 
 server_base::server_base(unsigned short port, bool keep_alive) :
 	port_(port),

src/server/common/simple_wml.cpp

@@ -21,7 +21,7 @@
 #include <boost/iostreams/filter/counter.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
 
-#include "server/simple_wml.hpp"
+#include "server/common/simple_wml.hpp"
 
 #include "log.hpp"
 

src/server/common/user_handler.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "server/user_handler.hpp"
+#include "server/common/user_handler.hpp"
 #include "config.hpp"
 #include "random.hpp"
 #include "serialization/base64.hpp"

src/server/wesnothd/ban.cpp

@@ -21,7 +21,7 @@
 #include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
 
-#include "server/ban.hpp"
+#include "server/wesnothd/ban.hpp"
 
 #include "utils/functional.hpp"
 

src/server/wesnothd/game.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "server/game.hpp"
+#include "server/wesnothd/game.hpp"
 
 #include "filesystem.hpp"
 #include "game_config.hpp" // game_config::observer_team_name
@@ -20,8 +20,8 @@
 #include "log.hpp"
 #include "preferences/credentials.hpp"
 #include "serialization/string_utils.hpp"
-#include "server/player_network.hpp"
-#include "server/server.hpp"
+#include "server/wesnothd/player_network.hpp"
+#include "server/wesnothd/server.hpp"
 
 #include <cstdio>
 #include <iomanip>

src/server/wesnothd/game.hpp

@@ -15,9 +15,9 @@
 #pragma once
 
 #include "mt_rng.hpp"
-#include "server/player.hpp"
-#include "server/player_connection.hpp"
-#include "server/simple_wml.hpp"
+#include "server/wesnothd/player.hpp"
+#include "server/wesnothd/player_connection.hpp"
+#include "server/common/simple_wml.hpp"
 #include "utils/make_enum.hpp"
 
 #include <boost/ptr_container/ptr_vector.hpp>

src/server/wesnothd/metrics.cpp

@@ -17,7 +17,7 @@
  * Various server-statistics.
  */
 
-#include "server/metrics.hpp"
+#include "server/wesnothd/metrics.hpp"
 
 #include <algorithm>
 #include <iostream>

src/server/wesnothd/metrics.hpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <ctime>
 
-#include "server/simple_wml.hpp"
+#include "server/common/simple_wml.hpp"
 
 class metrics
 {

src/server/wesnothd/player.cpp

@@ -12,7 +12,7 @@
    See the COPYING file for more details.
 */
 
-#include "server/player.hpp"
+#include "server/wesnothd/player.hpp"
 #include "lexical_cast.hpp"
 
 wesnothd::player::player(const std::string& n, simple_wml::node& cfg,

src/server/wesnothd/player.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "server/simple_wml.hpp"
+#include "server/common/simple_wml.hpp"
 
 #include <ctime>
 #include <set>

src/server/wesnothd/player_connection.cpp

@@ -12,9 +12,9 @@
 	See the COPYING file for more details.
 */
 
-#include "server/player_connection.hpp"
+#include "server/wesnothd/player_connection.hpp"
 
-#include "server/game.hpp"
+#include "server/wesnothd/game.hpp"
 
 namespace wesnothd
 {

src/server/wesnothd/player_connection.hpp

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "server/player.hpp"
-#include "server/server_base.hpp"
-#include "server/simple_wml.hpp"
+#include "server/wesnothd/player.hpp"
+#include "server/common/server_base.hpp"
+#include "server/common/simple_wml.hpp"
 
 #ifndef _WIN32
 #define BOOST_ASIO_DISABLE_THREADS

src/server/wesnothd/player_network.cpp

@@ -13,7 +13,7 @@
    See the COPYING file for more details.
 */
 
-#include "server/player_network.hpp"
+#include "server/wesnothd/player_network.hpp"
 #include "log.hpp"
 #include "serialization/unicode.hpp"
 

src/server/wesnothd/player_network.hpp

@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "server/player.hpp"
-#include "server/simple_wml.hpp"
+#include "server/wesnothd/player.hpp"
+#include "server/common/simple_wml.hpp"
 
 #include "utils/functional.hpp"
 #include "log.hpp"

src/server/wesnothd/server.cpp

@@ -17,7 +17,7 @@
  * Wesnoth-Server, for multiplayer-games.
  */
 
-#include "server/server.hpp"
+#include "server/wesnothd/server.hpp"
 
 #include "config.hpp"
 #include "filesystem.hpp"
@@ -33,16 +33,16 @@
 #include "utils/iterable_pair.hpp"
 #include "game_version.hpp"
 
-#include "server/ban.hpp"
-#include "server/game.hpp"
-#include "server/metrics.hpp"
-#include "server/player.hpp"
-#include "server/player_network.hpp"
-#include "server/simple_wml.hpp"
-#include "server/user_handler.hpp"
+#include "server/wesnothd/ban.hpp"
+#include "server/wesnothd/game.hpp"
+#include "server/wesnothd/metrics.hpp"
+#include "server/wesnothd/player.hpp"
+#include "server/wesnothd/player_network.hpp"
+#include "server/common/simple_wml.hpp"
+#include "server/common/user_handler.hpp"
 
 #ifdef HAVE_MYSQLPP
-#include "server/forum_user_handler.hpp"
+#include "server/common/forum_user_handler.hpp"
 #endif
 
 #include <boost/algorithm/string.hpp>
@@ -78,7 +78,7 @@ static lg::log_domain log_config("config");
 #define ERR_CONFIG LOG_STREAM(err, log_config)
 #define WRN_CONFIG LOG_STREAM(warn, log_config)
 
-#include "server/send_receive_wml_helpers.ipp"
+#include "server/common/send_receive_wml_helpers.ipp"
 
 namespace wesnothd
 {

src/server/wesnothd/server.hpp

@@ -15,13 +15,13 @@
 #pragma once
 
 #include "config.hpp"
-#include "server/user_handler.hpp"
-#include "server/metrics.hpp"
-#include "server/ban.hpp"
-#include "server/player.hpp"
-#include "server/simple_wml.hpp"
-#include "server/server_base.hpp"
-#include "server/player_connection.hpp"
+#include "server/common/user_handler.hpp"
+#include "server/wesnothd/metrics.hpp"
+#include "server/wesnothd/ban.hpp"
+#include "server/wesnothd/player.hpp"
+#include "server/common/simple_wml.hpp"
+#include "server/common/server_base.hpp"
+#include "server/wesnothd/player_connection.hpp"
 
 #include <boost/shared_array.hpp>