From da65be58ac802d5881bdb7abff2d0ac467d46303 Mon Sep 17 00:00:00 2001 From: Ludovic 'Archivist' Lagouardette Date: Fri, 30 Aug 2019 07:46:51 +0200 Subject: [PATCH] Split the Proof of concept and the first version --- Makefile => V0/Makefile | 8 ++++---- {include => V0/include}/database.hpp | 0 {include => V0/include}/endian.hpp | 0 {include => V0/include}/fsized_map.h | 0 {include => V0/include}/network.hpp | 0 {src => V0/src}/db_stats.cpp | 0 {src => V0/src}/izaro-coordinate.cpp | 0 {src => V0/src}/izaro-storage.cpp | 0 {src => V0/src}/test_client.cpp | 0 {src => V0/src}/test_spam_version.cpp | 0 {tests => V0/tests}/time-client.cpp | 0 {tests => V0/tests}/time-server.cpp | 0 V1/Makefile | 0 13 files changed, 4 insertions(+), 4 deletions(-) rename Makefile => V0/Makefile (93%) rename {include => V0/include}/database.hpp (100%) rename {include => V0/include}/endian.hpp (100%) rename {include => V0/include}/fsized_map.h (100%) rename {include => V0/include}/network.hpp (100%) rename {src => V0/src}/db_stats.cpp (100%) rename {src => V0/src}/izaro-coordinate.cpp (100%) rename {src => V0/src}/izaro-storage.cpp (100%) rename {src => V0/src}/test_client.cpp (100%) rename {src => V0/src}/test_spam_version.cpp (100%) rename {tests => V0/tests}/time-client.cpp (100%) rename {tests => V0/tests}/time-server.cpp (100%) create mode 100644 V1/Makefile diff --git a/Makefile b/V0/Makefile similarity index 93% rename from Makefile rename to V0/Makefile index 7b9de6e..d999636 100644 --- a/Makefile +++ b/V0/Makefile @@ -30,20 +30,20 @@ BUILD := build OBJ_DIR := $(BUILD)/objects APP_DIR := $(BUILD)/apps TARGET := izaro-storage.cpp -INCLUDE := -Iinclude/ -I./CommandEr/src -I./json/single_include -Itiny-js/ +INCLUDE := -Iinclude/ -I../CommandEr/src -I../json/single_include -I../tiny-js/ SRC := \ TJS_SRC := #pool_allocator.cpp TinyJS.cpp TinyJS_Functions.cpp TinyJS_MathFunctions.cpp TinyJS_StringFunctions.cpp TinyJS_Threading.cpp TJS_OBJECTS := $(TJS_SRC:%.cpp=$(OBJ_DIR)/%.tjs.o) -OBJECTS := $(SRC:%.cpp=$(OBJ_DIR)/%.o) ./CommandEr/build/commander.o +OBJECTS := $(SRC:%.cpp=$(OBJ_DIR)/%.o) ../CommandEr/build/commander.o TEST_OBJECTS := $(SRC:%.cpp=$(OBJ_DIR)/%.test.o) TARGETNAME := $(TARGET:%.cpp=%) all: build $(TARGET) -$(OBJ_DIR)/%.tjs.o: tiny-js/%.cpp +$(OBJ_DIR)/%.tjs.o: ../tiny-js/%.cpp @mkdir -p $(@D) $(CXX) $(CXXFLAGS) -fpermissive -w -Wno-pedantic $(INCLUDE) -o $@ -c $< @@ -56,7 +56,7 @@ $(OBJ_DIR)/%.o: %.cpp $(CXX) $(CXXFLAGS) $(INCLUDE) -o $@ -c $< $(TARGET): $(OBJECTS) $(TJS_OBJECTS) build - make -C CommandEr + make -C ../CommandEr @mkdir -p $(@D) $(CXX) $(CXXFLAGS) -pthread $(INCLUDE) $(LDFLAGS) -o $(APP_DIR)/$(TARGETNAME) src/$(TARGET) $(OBJECTS) $(TJS_OBJECTS) $(CXX) $(CXXFLAGS) $(INCLUDE) $(LDFLAGS) -o $(APP_DIR)/test_client src/test_client.cpp diff --git a/include/database.hpp b/V0/include/database.hpp similarity index 100% rename from include/database.hpp rename to V0/include/database.hpp diff --git a/include/endian.hpp b/V0/include/endian.hpp similarity index 100% rename from include/endian.hpp rename to V0/include/endian.hpp diff --git a/include/fsized_map.h b/V0/include/fsized_map.h similarity index 100% rename from include/fsized_map.h rename to V0/include/fsized_map.h diff --git a/include/network.hpp b/V0/include/network.hpp similarity index 100% rename from include/network.hpp rename to V0/include/network.hpp diff --git a/src/db_stats.cpp b/V0/src/db_stats.cpp similarity index 100% rename from src/db_stats.cpp rename to V0/src/db_stats.cpp diff --git a/src/izaro-coordinate.cpp b/V0/src/izaro-coordinate.cpp similarity index 100% rename from src/izaro-coordinate.cpp rename to V0/src/izaro-coordinate.cpp diff --git a/src/izaro-storage.cpp b/V0/src/izaro-storage.cpp similarity index 100% rename from src/izaro-storage.cpp rename to V0/src/izaro-storage.cpp diff --git a/src/test_client.cpp b/V0/src/test_client.cpp similarity index 100% rename from src/test_client.cpp rename to V0/src/test_client.cpp diff --git a/src/test_spam_version.cpp b/V0/src/test_spam_version.cpp similarity index 100% rename from src/test_spam_version.cpp rename to V0/src/test_spam_version.cpp diff --git a/tests/time-client.cpp b/V0/tests/time-client.cpp similarity index 100% rename from tests/time-client.cpp rename to V0/tests/time-client.cpp diff --git a/tests/time-server.cpp b/V0/tests/time-server.cpp similarity index 100% rename from tests/time-server.cpp rename to V0/tests/time-server.cpp diff --git a/V1/Makefile b/V1/Makefile new file mode 100644 index 0000000..e69de29