Renamed C++ module directories to match the name of their exposed module.

Removed a few items from .gitignore since we now use the Build directory to build the solution instead of just being in the src directory.

Author: satoon101

.gitignore

@@ -20,19 +20,6 @@ turtledemo/
 unittest/
 test/
 tests/
-src/CMakeFiles/*
-src/core.dir/*
-src/Release/*
-src/Debug/*
-src/Win32/*
-src/ALL_BUILD*
-src/ZERO_CHECK*
-src/core.*
-src/source-python*
-src/CMakeCache.txt
-src/cmake_install.cmake
-src/Makefile
-src/lib*
 src/Build/*
 src/sdks/*
 !src/sdks/readme.txt

src/CMakeLists.txt

@@ -110,17 +110,17 @@ Set(SOURCEPYTHON_BOT_MODULE_SOURCES
 # Command module.
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_COMMAND_MODULE_HEADERS
-    core/modules/commands/client_command_wrap.h
-    core/modules/commands/command_wrap.h
-    core/modules/commands/say_command_wrap.h
-    core/modules/commands/server_command_wrap.h
+    core/modules/command/client_command_wrap.h
+    core/modules/command/command_wrap.h
+    core/modules/command/say_command_wrap.h
+    core/modules/command/server_command_wrap.h
 )
 
 Set(SOURCEPYTHON_COMMAND_MODULE_SOURCES
-    core/modules/commands/client_command_wrap.cpp
-    core/modules/commands/command_wrap_python.cpp
-    core/modules/commands/say_command_wrap.cpp
-    core/modules/commands/server_command_wrap.cpp
+    core/modules/command/client_command_wrap.cpp
+    core/modules/command/command_wrap_python.cpp
+    core/modules/command/say_command_wrap.cpp
+    core/modules/command/server_command_wrap.cpp
 )
 
 # ------------------------------------------------------------------
@@ -166,19 +166,19 @@ Set(SOURCEPYTHON_ENGINE_MODULE_SOURCES
 )
 
 # ------------------------------------------------------------------
-# Entities module
+# Entity module
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_ENTITY_MODULE_HEADERS
-    core/modules/entities/entities_wrap.h
-    core/modules/entities/entities_props.h
-    core/modules/entities/entities_generator_wrap.h
+    core/modules/entity/entity_wrap.h
+    core/modules/entity/entity_props.h
+    core/modules/entity/entity_generator_wrap.h
 )
 
 Set(SOURCEPYTHON_ENTITY_MODULE_SOURCES
-    core/modules/entities/entities_props.cpp
-    core/modules/entities/entities_wrap.cpp
-    core/modules/entities/entities_wrap_python.cpp
-    core/modules/entities/entities_generator_wrap.cpp
+    core/modules/entity/entity_props.cpp
+    core/modules/entity/entity_wrap.cpp
+    core/modules/entity/entity_wrap_python.cpp
+    core/modules/entity/entity_generator_wrap.cpp
 )
 
 # ------------------------------------------------------------------
@@ -188,7 +188,7 @@ Set(SOURCEPYTHON_EVENT_MODULE_HEADERS
 )
 
 Set(SOURCEPYTHON_EVENT_MODULE_SOURCES
-    core/modules/events/events_wrap_python.cpp
+    core/modules/event/event_wrap_python.cpp
 )
 
 # ------------------------------------------------------------------
@@ -217,12 +217,12 @@ Set(SOURCEPYTHON_KEYVALUES_MODULE_SOURCES
 # Listener module
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_LISTENERS_MODULE_HEADERS
-    core/modules/listeners/listenermanager.h
+    core/modules/listener/listenermanager.h
 )
 
 Set(SOURCEPYTHON_LISTENERS_MODULE_SOURCES
-    core/modules/listeners/listenermanager.cpp
-    core/modules/listeners/listeners_wrap_python.cpp
+    core/modules/listener/listenermanager.cpp
+    core/modules/listener/listener_wrap_python.cpp
 )
 
 # ------------------------------------------------------------------
@@ -258,24 +258,24 @@ Set(SOURCEPYTHON_MEMORY_MODULE_SOURCES
 # Players module
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_PLAYERS_MODULE_HEADERS
-    core/modules/players/players_generator_wrap.h
+    core/modules/player/player_generator_wrap.h
 )
 
 Set(SOURCEPYTHON_PLAYERS_MODULE_SOURCES
-    core/modules/players/players_wrap_python.cpp
-    core/modules/players/players_generator_wrap.cpp
+    core/modules/player/player_wrap_python.cpp
+    core/modules/player/player_generator_wrap.cpp
 )
 
 # ------------------------------------------------------------------
 # RecipientFilter module.
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_RECIPIENTFILTER_MODULE_HEADERS
-    core/modules/recipientfilters/mrecipientfilter.h
+    core/modules/recipientfilter/mrecipientfilter.h
 )
 
 Set(SOURCEPYTHON_RECIPIENTFILTER_MODULE_SOURCES
-    core/modules/recipientfilters/mrecipientfilter.cpp
-    core/modules/recipientfilters/mrecipientfilter_wrap_python.cpp
+    core/modules/recipientfilter/mrecipientfilter.cpp
+    core/modules/recipientfilter/recipientfilter_wrap_python.cpp
 )
 
 # ------------------------------------------------------------------

src/core/addons/sp_addon.cpp

@@ -33,8 +33,8 @@
 #include "filesystem.h"
 #include "core/sp_gamedir.h"
 #include "utility/wrap_macros.h"
-#include "modules/listeners/listenermanager.h"
-#include "modules/entities/entities_wrap.h"
+#include "modules/listener/listenermanager.h"
+#include "modules/entity/entity_wrap.h"
 
 //---------------------------------------------------------------------------------
 // External variables

src/core/modules/commands/client_command_wrap.cpp renamed to src/core/modules/command/client_command_wrap.cpp

@@ -32,11 +32,11 @@
 #include "edict.h"
 #include "convar.h"
 #include "engine/iserverplugin.h"
-#include "modules/entities/entities_wrap.h"
+#include "modules/entity/entity_wrap.h"
 #include "utility/call_python.h"
 #include "boost/python/call.hpp"
 #include "boost/shared_array.hpp"
-#include "modules/listeners/listenermanager.h"
+#include "modules/listener/listenermanager.h"
 
 //-----------------------------------------------------------------------------
 // Global Client command mapping.

src/core/modules/commands/client_command_wrap.h renamed to src/core/modules/command/client_command_wrap.h

@@ -37,7 +37,7 @@
 #include "edict.h"
 #include "convar.h"
 #include "command_wrap.h"
-#include "modules/entities/entities_wrap.h"
+#include "modules/entity/entity_wrap.h"
 
 //-----------------------------------------------------------------------------
 // Client Command Manager class.

src/core/modules/commands/command_wrap.h renamed to src/core/modules/command/command_wrap.h

@@ -37,7 +37,7 @@
 #include "boost/python/call.hpp"
 #include "boost/shared_array.hpp"
 #include "core/sp_main.h"
-#include "modules/listeners/listenermanager.h"
+#include "modules/listener/listenermanager.h"
 #include "modules/conversions/conversions_wrap.h"
 
 //-----------------------------------------------------------------------------

src/core/modules/commands/command_wrap_python.cpp renamed to src/core/modules/command/command_wrap_python.cpp

@@ -34,7 +34,7 @@
 #include "command_wrap.h"
 #include "utility/sp_util.h"
 #include "utility/wrap_macros.h"
-#include "modules/entities/entities_wrap.h"
+#include "modules/entity/entity_wrap.h"
 
 //-----------------------------------------------------------------------------
 // Say ConCommand instance class.

src/core/modules/commands/say_command_wrap.cpp renamed to src/core/modules/command/say_command_wrap.cpp

@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // Includes
 // ----------------------------------------------------------------------------
-#include "entities_generator_wrap.h"
-#include "entities_wrap.h"
+#include "entity_generator_wrap.h"
+#include "entity_wrap.h"
 #include "utility/sp_util.h"
 #include "boost/python/iterator.hpp"
 #include "modules/conversions/conversions_wrap.h"

src/core/modules/commands/say_command_wrap.h renamed to src/core/modules/command/say_command_wrap.h

@@ -27,7 +27,7 @@
 //---------------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------------
-#include "entities_props.h"
+#include "entity_props.h"
 
 //---------------------------------------------------------------------------------
 // Utility function to find send table props.

src/core/modules/commands/server_command_wrap.cpp renamed to src/core/modules/command/server_command_wrap.cpp

@@ -28,8 +28,8 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include <vector>
-#include "entities_props.h"
-#include "entities_wrap.h"
+#include "entity_props.h"
+#include "entity_wrap.h"
 #include "dt_common.h"
 #include "utility/sp_util.h"
 #include "edict.h"

src/core/modules/commands/server_command_wrap.h renamed to src/core/modules/command/server_command_wrap.h

@@ -29,8 +29,8 @@
 //-----------------------------------------------------------------------------
 #include "edict.h"
 
-#include "entities_generator_wrap.h"
-#include "entities_wrap.h"
+#include "entity_generator_wrap.h"
+#include "entity_wrap.h"
 #include "utility/sp_util.h"
 #include "modules/export_main.h"
 using namespace boost::python;

src/core/modules/entities/entities_generator_wrap.cpp renamed to src/core/modules/entity/entity_generator_wrap.cpp

@@ -27,7 +27,7 @@
 // ----------------------------------------------------------------------------
 // Includes
 // ----------------------------------------------------------------------------
-#include "players_generator_wrap.h"
+#include "player_generator_wrap.h"
 #include "utility/sp_util.h"
 #include "game/server/iplayerinfo.h"
 #include "boost/python/iterator.hpp"

src/core/modules/entities/entities_generator_wrap.h renamed to src/core/modules/entity/entity_generator_wrap.h

@@ -27,8 +27,8 @@
 // ----------------------------------------------------------------------------
 // Includes
 // ----------------------------------------------------------------------------
-#include "players_generator_wrap.h"
-#include "modules/entities/entities_wrap.h"
+#include "player_generator_wrap.h"
+#include "modules/entity/entity_wrap.h"
 #include "modules/export_main.h"
 
 #include "public/game/server/iplayerinfo.h"

src/core/modules/entities/entities_props.cpp renamed to src/core/modules/entity/entity_props.cpp

@@ -29,7 +29,7 @@
 
 #include "irecipientfilter.h"
 #include "eiface.h"
-#include "modules/recipientfilters/mrecipientfilter.h"
+#include "modules/recipientfilter/mrecipientfilter.h"
 
 extern IVEngineServer* engine;