Move module/include/api.h to module/api.h

builtin/client_data/client_data.cpp

@@ -3,8 +3,8 @@
 #include "interface/server.h"
 #include "interface/event.h"
 #include "interface/fs.h"
-#include "client_file/include/api.h"
-#include "network/include/api.h"
+#include "client_file/api.h"
+#include "network/api.h"
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/string.hpp>
 #include <fstream>

builtin/client_file/api.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "interface/event.h"
-#include "network/include/api.h"
+#include "network/api.h"
 
 namespace client_file
 {

builtin/client_file/client_file.cpp

@@ -3,8 +3,8 @@
 #include "interface/server.h"
 #include "interface/event.h"
 #include "interface/sha1.h"
-#include "client_file/include/api.h"
-#include "network/include/api.h"
+#include "client_file/api.h"
+#include "network/api.h"
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/string.hpp>
 #include <fstream>

builtin/client_lua/client_lua.cpp

@@ -3,8 +3,8 @@
 #include "interface/server.h"
 #include "interface/event.h"
 #include "interface/fs.h"
-#include "client_file/include/api.h"
-#include "network/include/api.h"
+#include "client_file/api.h"
+#include "network/api.h"
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/string.hpp>
 #include <fstream>

builtin/network/network.cpp

@@ -3,7 +3,7 @@
 #include "interface/event.h"
 #include "interface/tcpsocket.h"
 #include "interface/packet_stream.h"
-#include "network/include/api.h"
+#include "network/api.h"
 #include "core/log.h"
 //#include <cereal/archives/binary.hpp>
 //#include <cereal/types/string.hpp>

design.txt

@@ -23,8 +23,7 @@ Module structure
 module
 |-- deps.txt      << Module and extension dependencies
 |-- <module>.cpp  << Server-side code
-|-- include
-|   `-- api.h     << Structures for interfacing between modules
+|-- api.h         << Structures for interfacing between modules
 |-- client_lua
 |   `-- init.lua  << Client-side code (by convention)
 `-- client_data

test/testmodules/test1/test1.cpp

@@ -1,10 +1,10 @@
 #include "interface/module.h"
 #include "interface/server.h"
 #include "interface/event.h"
-#include "test1/include/api.h"
-//#include "client_lua/include/api.h"
-#include "client_file/include/api.h"
-#include "network/include/api.h"
+#include "test1/api.h"
+//#include "client_lua/api.h"
+#include "client_file/api.h"
+#include "network/api.h"
 #include "core/log.h"
 
 using interface::Event;

test/testmodules/test2/test2.cpp

@@ -1,7 +1,7 @@
 #include "interface/module.h"
 #include "interface/server.h"
 #include "interface/event.h"
-#include "test1/include/api.h"
+#include "test1/api.h"
 #include "core/log.h"
 
 using interface::Event;

todo.txt

@@ -9,7 +9,6 @@ Buildat TODO
 - Modules should be run in threads.
 - Network should leave socket fds in m_server when destructing, and pick them up
   on core:continue.
-- Move module/include/api.h to module/api.h
 - Implement file modification tracking in client_lua or client_file, or somehow
   otherwise make newly connected clients get new file contents
 

util/codestyle.sh

@@ -5,7 +5,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 header_files="$script_dir"/../src/*/*.h
 cpp_files="$script_dir"/../src/*/*.cpp
 
-header_files+=" ""$script_dir"/../test/testmodules/*/*/*.h
+header_files+=" ""$script_dir"/../test/testmodules/*/*.h
 cpp_files+=" ""$script_dir"/../test/testmodules/*/*.cpp
 
 header_files+=" "$(find "$script_dir"/../builtin -name '*.h')