build: update folder structure

Author: iboukhss

Makefile

@@ -1,8 +1,3 @@
-# Compiler settings
-CXX       = clang++
-CXXFLAGS  = -Wall -Wextra -Werror -std=c++98 -g3
-CPPFLAGS  = -MMD -MP
-
 # Executable name
 NAME      = webserv
 
@@ -16,25 +11,33 @@ BIN_DIR   = $(BUILD_DIR)/bin
 TARGET    = $(BIN_DIR)/$(NAME)
 
 # Source tree (keep in alphabetical order)
-SRCS      = src/Client.cpp \
-            src/Client.hpp \
-            src/HttpResponse.cpp \
-            src/HttpResponse.hpp \
-            src/main.cpp \
-            src/Server.cpp \
-            src/Server.hpp \
-            src/SyscallError.cpp \
-            src/SyscallError.hpp
+SRCS      = $(addprefix $(SRC_DIR)/, \
+            core/Client.cpp \
+            core/Client.hpp \
+            core/Server.cpp \
+            core/Server.hpp \
+            http/HttpResponse.cpp \
+            http/HttpResponse.hpp \
+            util/SyscallError.cpp \
+            util/SyscallError.hpp \
+            main.cpp \
+)
 
 # Separate .cpp and .hpp files
-CPPS = $(filter %.cpp,$(SRCS))
-HPPS = $(filter %.hpp,$(SRCS))
+CPPS      = $(filter %.cpp,$(SRCS))
+HPPS      = $(filter %.hpp,$(SRCS))
 
 # Objects and dependencies
-OBJS = $(patsubst src/%,build/obj/%,$(CPPS:.cpp=.o))
-DEPS = $(OBJS:.o=.d)
+OBJS      = $(patsubst $(SRC_DIR)/%,$(OBJ_DIR)/%,$(CPPS:.cpp=.o))
+DEPS      = $(OBJS:.o=.d)
+
+# Compiler settings
+CXX       = clang++
+CXXFLAGS  = -Wall -Wextra -Werror -std=c++98 -g3
+CPPFLAGS  = -I$(SRC_DIR) -MMD -MP
 
-.PHONY: all run val
+# Default target
+PHONY += all run val
 all: $(TARGET)
 
 run: all
@@ -51,11 +54,8 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	@mkdir -p $(dir $@)
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
 
--include $(DEPS)
-
 # Regular cleaning targets
-
-.PHONY: clean fclean re
+PHONY += clean fclean re
 clean:
 	rm -rf $(OBJ_DIR)
 
@@ -69,8 +69,7 @@ re: fclean all
 # If compiledb is not installed do `pipx install compiledb`.
 # compiledb is used to generate the compilation database (compile_commands.json)
 # used by clang-tidy.
-
-.PHONY: db format lint check
+PHONY += db format lint check
 db:
 	compiledb -n $(MAKE)
 
@@ -84,12 +83,16 @@ check: format lint
 
 # Careful, these targets will overwrite files.
 # Make sure to use `make check` before committing irreversible changes.
-
-.PHONY: format-fix lint-fix fix
+PHONY += format-fix lint-fix fix
 format-fix:
 	clang-format -style=file -i $(CPPS) $(HPPS)
 
 lint-fix: db
 	clang-tidy -p=. --header-filter=.* -fix $(CPPS)
 
 fix: format-fix lint-fix
+
+# Include dependencies
+-include $(DEPS)
+
+.PHONY: $(PHONY)

src/cgi/.gitkeep

@@ -9,8 +9,8 @@ What should the task do ?
 
 */
 
-#ifndef CONFIGPARSER_HPP_
-#define CONFIGPARSER_HPP_
+#ifndef CONFIG_CONFIG_PARSER_HPP_
+#define CONFIG_CONFIG_PARSER_HPP_
 
 #include <string>
 #include <vector>
@@ -31,4 +31,4 @@ class ConfigParser {
     ConfigParser();
 };
 
-#endif
+#endif // CONFIG_CONFIG_PARSER_HPP_

src/ConfigParser.hpp src/config/ConfigParser.hppsrc/ConfigParser.hpp renamed to src/config/ConfigParser.hpp

@@ -1,6 +1,6 @@
-#include "Client.hpp"
+#include "core/Client.hpp"
 
-#include "SyscallError.hpp"
+#include "util/SyscallError.hpp"
 
 #include <fcntl.h>
 #include <unistd.h>

src/Client.cpp src/core/Client.cppsrc/Client.cpp renamed to src/core/Client.cpp

@@ -1,5 +1,5 @@
-#ifndef CLIENT_HPP_
-#define CLIENT_HPP_
+#ifndef CORE_CLIENT_HPP_
+#define CORE_CLIENT_HPP_
 
 #include <netinet/in.h>
 
@@ -33,4 +33,4 @@ class Client {
     Client* next_;
 };
 
-#endif // CLIENT_HPP_
+#endif // CORE_CLIENT_HPP_

src/Client.hpp src/core/Client.hppsrc/Client.hpp renamed to src/core/Client.hpp

@@ -1,8 +1,8 @@
-#include "Server.hpp"
+#include "core/Server.hpp"
 
-#include "HttpResponse.hpp"
-#include "SyscallError.hpp"
-#include "structs_dev.hpp"
+#include "http/HttpResponse.hpp"
+#include "util/SyscallError.hpp"
+#include "util/structs_dev.hpp"
 
 #include <errno.h>
 #include <fcntl.h>

src/Server.cpp src/core/Server.cppsrc/Server.cpp renamed to src/core/Server.cpp

@@ -1,8 +1,8 @@
-#ifndef SERVER_H_
-#define SERVER_H_
+#ifndef CORE_SERVER_H_
+#define CORE_SERVER_H_
 
-#include "Client.hpp"
-#include "structs_dev.hpp"
+#include "core/Client.hpp"
+#include "util/structs_dev.hpp"
 
 #include <netinet/in.h>
 #include <sys/epoll.h>
@@ -49,4 +49,4 @@ class Server {
     const struct ServerConfig* config_;
 };
 
-#endif
+#endif // CORE_SERVER_HPP_

src/Server.hpp src/core/Server.hppsrc/Server.hpp renamed to src/core/Server.hpp

@@ -1,4 +1,4 @@
-#include "HttpResponse.hpp"
+#include "http/HttpResponse.hpp"
 
 #include <sstream>
 

src/HttpResponse.cpp src/http/HttpResponse.cppsrc/HttpResponse.cpp renamed to src/http/HttpResponse.cpp

@@ -1,5 +1,5 @@
-#ifndef HTTPRESPONSE_HPP_
-#define HTTPRESPONSE_HPP_
+#ifndef HTTP_HTTP_RESPONSE_HPP_
+#define HTTP_HTTP_RESPONSE_HPP_
 
 #include <string>
 
@@ -10,4 +10,4 @@ struct HttpResponse {
     std::string to_string() const;
 };
 
-#endif // HTTPRESPONSE_HPP_
+#endif // HTTP_HTTP_RESPONSE_HPP_

src/HttpResponse.hpp src/http/HttpResponse.hppsrc/HttpResponse.hpp renamed to src/http/HttpResponse.hpp

@@ -1,9 +1,9 @@
 
 
 // #include "ConfigParser.hpp"
-#include "Server.hpp"
-#include "SyscallError.hpp"
-#include "structs_dev.hpp" //to be removed
+#include "core/Server.hpp"
+#include "util/SyscallError.hpp"
+#include "util/structs_dev.hpp" //to be removed
 
 #include <iostream>