v0.9.3

Author: taronsarkisyan

.gitignore

@@ -7,15 +7,15 @@
 **/.vscode/
 
 # Main
-include/*
-build/*
+include/
+build/
 
 # Docker
 # /*.dockerfile
 # /*.yml
 
 # Make
-include/*
+include/
 
 # Misc
 **/.DS_Store

Makefile

@@ -7,10 +7,12 @@ ENGINE_WATCH = clang++
 ENGINE_FLAGS = -std=c++2b
 
 # PATH
-PATH_BIN = $(CURDIR)/build/index.so
-PATH_SRC = $(CURDIR)/src/ffi.cpp
-PATH_TEST_BIN = $(CURDIR)/src/tests/build/index
-PATH_TEST_SRC = $(CURDIR)/src/tests/index.cpp
+PATH_TEST_BIN = $(CURDIR)/build/main
+PATH_TEST_SRC_HTTP1 = $(CURDIR)/tests/tcp1/http1.cpp
+PATH_TEST_SRC_HTTP2 = $(CURDIR)/tests/tcp1/http2.cpp
+PATH_TEST_SRC_WS = $(CURDIR)/tests/tcp1/ws.cpp
+PATH_TEST_SRC_HTTP3 = $(CURDIR)/tests/tcp2/http3.cpp
+PATH_TEST_SRC_WT = $(CURDIR)/tests/tcp2/wt.cpp
 
 # INC
 INC_CPP = -I $(CURDIR)/src
@@ -20,17 +22,39 @@ INC_JSONCPP = -I /usr/include/jsoncpp/json
 INC = ${INC_CPP} ${INC_INCLUDE} ${INC_JSONCPP}
 
 # LINK
+LINK_NATIVE = -Lnative/target/release -larnelify_server -Wl,-rpath,native/target/release
 LINK_JSONCPP = -ljsoncpp
-LINK_ZLIB = -lz
-LINK = ${LINK_JSONCPP} ${LINK_ZLIB}
+LINK = ${LINK_NATIVE} ${LINK_JSONCPP}
 
-# SCRIPTS
 build:
+	clear && cd native \
+	&& cargo build --release \
+	&& cd ..
+
+test_http1:
+	clear && mkdir -p build && rm -rf build/*
+	${ENGINE_WATCH} $(ENGINE_FLAGS) ${INC} $(PATH_TEST_SRC_HTTP1) ${LINK} -o $(PATH_TEST_BIN) && $(PATH_TEST_BIN)
+
+test_http2:
 	clear && mkdir -p build && rm -rf build/*
-	${ENGINE_BUILD} ${ENGINE_FLAGS} ${INC} ${LINK} -fPIC -shared ${PATH_SRC} -o ${PATH_BIN}
+	${ENGINE_WATCH} $(ENGINE_FLAGS) ${INC} $(PATH_TEST_SRC_HTTP2) ${LINK} -o $(PATH_TEST_BIN) && $(PATH_TEST_BIN)
+	
+test_ws:
+	clear && mkdir -p build && rm -rf build/*
+	${ENGINE_WATCH} $(ENGINE_FLAGS) ${INC} $(PATH_TEST_SRC_WS) ${LINK} -o $(PATH_TEST_BIN) && $(PATH_TEST_BIN)
 
-test:
-	clear && mkdir -p src/tests/build && rm -rf src/tests/build/*
-	${ENGINE_WATCH} $(ENGINE_FLAGS) $(PATH_TEST_SRC) ${INC} ${LINK} -o $(PATH_TEST_BIN) && $(PATH_TEST_BIN)
+test_http3:
+	clear && mkdir -p build && rm -rf build/*
+	${ENGINE_WATCH} $(ENGINE_FLAGS) ${INC} $(PATH_TEST_SRC_HTTP3) ${LINK} -o $(PATH_TEST_BIN) && $(PATH_TEST_BIN)
 
-.PHONY: build test
+test_wt:
+	clear && mkdir -p build && rm -rf build/*
+	${ENGINE_WATCH} $(ENGINE_FLAGS) ${INC} $(PATH_TEST_SRC_WT) ${LINK} -o $(PATH_TEST_BIN) && $(PATH_TEST_BIN)
+
+.PHONY: \
+	build \
+	test_http1 \
+	test_http2 \
+	test_ws \
+	test_http3 \
+	test_wt