Author: baufo
Date: Sat Aug 16 14:47:34 2008
New Revision: 28645
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28645&view=rev
Log:
Moving the md5 files to the src directory
Added:
trunk/src/md5.cpp (props changed)
- copied unchanged from r28642, trunk/src/server/forum_auth/md5.cpp
trunk/src/md5.hpp (props changed)
- copied unchanged from r28642, trunk/src/server/forum_auth/md5.hpp
Removed:
trunk/src/server/forum_auth/
Modified:
trunk/src/CMakeLists.txt
trunk/src/Makefile.am
trunk/src/SConscript
trunk/src/multiplayer.cpp
trunk/src/server/forum_auth.cpp
trunk/src/server/forum_user_handler.hpp
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=28645&r1=28644&r2=28645&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Sat Aug 16 14:47:34 2008
@@ -114,6 +114,7 @@
gettext.cpp
log.cpp
map.cpp
+ md5.cpp
thread.cpp
tstring.cpp
util.cpp
@@ -304,7 +305,6 @@
widgets/combo_drag.cpp
widgets/drop_target.cpp
widgets/scrollpane.cpp
- server/forum_auth/md5.cpp
)
# used with editor2 option in the wesnoth target
@@ -398,7 +398,6 @@
server/jwsmtp/mailer.cpp
server/jwsmtp/compat.cpp
server/jwsmtp/base64.cpp
- server/forum_auth/md5.cpp
)
add_executable(wesnothd ${wesnothd_SRC})
Modified: trunk/src/Makefile.am
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=28645&r1=28644&r2=28645&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sat Aug 16 14:47:34 2008
@@ -129,7 +129,6 @@
replay_controller.cpp \
sha1.cpp \
settings.cpp \
- server/forum_auth/md5.cpp \
statistics.cpp \
statistics_dialog.cpp \
team.cpp \
@@ -226,7 +225,6 @@
server/jwsmtp/mailer.cpp \
server/jwsmtp/compat.cpp \
server/jwsmtp/base64.cpp \
- server/forum_auth/md5.cpp \
network.cpp \
network_worker.cpp \
time.cpp \
@@ -326,6 +324,7 @@
gettext.cpp \
log.cpp \
map.cpp \
+ md5.cpp \
thread.cpp \
tstring.cpp \
util.cpp \
Modified: trunk/src/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConscript?rev=28645&r1=28644&r2=28645&view=diff
==============================================================================
--- trunk/src/SConscript (original)
+++ trunk/src/SConscript Sat Aug 16 14:47:34 2008
@@ -18,6 +18,7 @@
gettext.cpp
log.cpp
map.cpp
+ md5.cpp
network.cpp
thread.cpp
tstring.cpp
@@ -233,7 +234,6 @@
gui/widgets/widget.cpp
gui/widgets/window.cpp
gui/widgets/window_builder.cpp
- server/forum_auth/md5.cpp
""")
wesnoth_sources.extend(env.Object("game_preferences_display.cpp", EXTRA_DEFINE
= env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None))
@@ -326,7 +326,6 @@
server/jwsmtp/mailer.cpp
server/jwsmtp/compat.cpp
server/jwsmtp/base64.cpp
- server/forum_auth/md5.cpp
""")
wesnothd_sources.extend(env.Object("server/server.cpp", EXTRA_DEFINE =
env['fifodir'] and "FIFODIR='\"$fifodir\"'" or None))
Propchange: trunk/src/md5.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/src/md5.cpp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: trunk/src/md5.cpp
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: trunk/src/md5.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/src/md5.hpp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: trunk/src/md5.hpp
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: trunk/src/multiplayer.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer.cpp?rev=28645&r1=28644&r2=28645&view=diff
==============================================================================
--- trunk/src/multiplayer.cpp (original)
+++ trunk/src/multiplayer.cpp Sat Aug 16 14:47:34 2008
@@ -22,6 +22,7 @@
#include "gui/dialogs/mp_create_game.hpp"
#include "gui/widgets/window.hpp"
#include "log.hpp"
+#include "md5.hpp"
#include "multiplayer.hpp"
#include "multiplayer_ui.hpp"
#include "multiplayer_connect.hpp"
@@ -40,8 +41,6 @@
#include "serialization/string_utils.hpp"
#include "upload_log.hpp"
#include "wml_separators.hpp"
-
-#include "server/forum_auth/md5.hpp"
#define LOG_NW LOG_STREAM(info, network)
Modified: trunk/src/server/forum_auth.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/forum_auth.cpp?rev=28645&r1=28644&r2=28645&view=diff
==============================================================================
--- trunk/src/server/forum_auth.cpp (original)
+++ trunk/src/server/forum_auth.cpp Sat Aug 16 14:47:34 2008
@@ -1,6 +1,6 @@
#include <string>
#include <iostream>
-#include "forum_auth/md5.hpp"
+#include "../md5.hpp"
#include <string.h>
#include <mysql++/mysql++.h>
Modified: trunk/src/server/forum_user_handler.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/forum_user_handler.hpp?rev=28645&r1=28644&r2=28645&view=diff
==============================================================================
--- trunk/src/server/forum_user_handler.hpp (original)
+++ trunk/src/server/forum_user_handler.hpp Sat Aug 16 14:47:34 2008
@@ -4,7 +4,7 @@
#include "user_handler.hpp"
#include <mysql++/mysql++.h>
-#include "forum_auth/md5.hpp"
+#include "../md5.hpp"
//! @class A user_handler implementation to link the server
//! with a phpbb3 forum.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
