buildsystem refacor & added tests

sc0ty · Jun 10, 2017 · ccd3cbd · ccd3cbd
1 parent 6073c9c
commit ccd3cbd
Show file tree

Hide file tree

Showing 55 changed files with 529 additions and 118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,9 @@
 *.bak
 *.vim
 .grip
-grip
-egrip
-fgrip
-gripgen
+/src/grip/grip
+/src/grip/egrip
+/src/grip/fgrip
+/src/gripgen/gripgen
+/src/test/test
 tags
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
@@ -39,7 +39,7 @@ You may need to add `-pthread` to `BOOST_LDFLAGS` if you are linking against mul
 ### Configuration
 Makefile accepts several configuration variables:
 * `STATIC=yes` - static linking with libraries;
-* `USE_BOOST=yes/mt/manual` - use boost library instead of POSIX functions, `mt` should be used against multi-threaded boost build, `manual` allows to configure compiler and linker flags manualli with `BOOST_CXXFLAGS` and `BOOST_LDFLAGS`;
+* `USE_BOOST=yes/manual` - use boost library instead of POSIX functions, `manual` allows to configure compiler and linker flags manualli with `BOOST_CXXFLAGS` and `BOOST_LDFLAGS`;
 * `CXX` - override compiler program;
 * `CXXFLAGS` and `LDFLAGS` - override compiler and linker flags.
 

diff --git a/src/Makefile b/src/Makefile
@@ -1,52 +1,49 @@
 PREFIX   ?= /usr/local
+OBJDIR   ?= obj
 
 ifeq ($(OS),Windows_NT)
 	SUFFIX  ?= .exe
-	RM      = cmd /C del /Q
+	RM      = scripts\rm.cmd
+	MKDIR   = scripts\mkdir.cmd
+	INSTALL = scripts\install.cmd
+else
+	MKDIR   = mkdir -p
+	INSTALL = install -m 0755
 endif
 
 CXXFLAGS ?= \
 			--std=c++11 \
 			-Wall \
 			-Wextra \
 			-pedantic \
-			-pthread \
+			-I. \
 
 LDFLAGS ?= \
 		   --std=c++11 \
-		   -pthread \
 
 ifdef STATIC
-LDFLAGS += \
-			-static \
-			-static-libgcc \
-			-static-libstdc++ \
+	LDFLAGS += \
+			   -static \
+			   -static-libgcc \
+			   -static-libstdc++ \
 
 endif
 
 ifdef USE_BOOST
-CXXFLAGS += -DUSE_BOOST
+	CXXFLAGS += -DUSE_BOOST
 endif
 
 ifeq ($(USE_BOOST),yes)
-LDFLAGS  += \
-			-lboost_regex \
-			-lboost_system \
-			-lboost_filesystem \
-
-endif
-
-ifeq ($(USE_BOOST),mt)
-LDFLAGS  += \
-			-lboost_regex \
-			-lboost_system \
-			-lboost_filesystem \
+	LDFLAGS  += \
+				-lboost_regex \
+				-lboost_system \
+				-lboost_filesystem \
 
 endif
 
 ifeq ($(USE_BOOST),manual)
-CXXFLAGS += $(BOOST_CXXFLAGS)
-LDFLAGS  += $(BOOST_LDFLAGS)
+	CXXFLAGS += $(BOOST_CXXFLAGS)
+	LDFLAGS  += $(BOOST_LDFLAGS)
 endif
 
 VERSION  ?= $(shell git describe --tags)
@@ -55,104 +52,26 @@ ifneq ($(VERSION), )
 endif
 
 
-TARGETS = \
-		  grip \
-		  egrip \
-		  fgrip \
-		  gripgen \
-
-SOURCES = \
-		  indexer.cpp \
-		  dbreader.cpp \
-		  sortdb.cpp \
-		  filelist.cpp \
-		  ids.cpp \
-		  compressedids.cpp \
-		  grep.cpp \
-		  file.cpp \
-		  fileline.cpp \
-		  print.cpp \
-		  dir.cpp \
-		  dir-posix.cpp \
-		  dir-boost.cpp \
-		  glob.cpp \
-		  pattern.cpp \
-		  node.cpp \
-		  error.cpp \
-
-HEADERS = \
-		  indexer.h \
-		  dbreader.h \
-		  filelist.h \
-		  ids.h \
-		  compressedids.h \
-		  grep.h \
-		  index.h \
-		  file.h \
-		  fileline.h \
-		  print.h \
-		  dir.h \
-		  glob.h \
-		  pattern.h \
-		  globfilters.def \
-		  node.h \
-		  case.h \
-		  queue.h \
-		  sem.h \
-		  config.h \
-		  error.h \
-
-EXTERNAL = \
-		  external/fnmatch.c \
-		  external/fnmatch.h \
-		  external/ansidecl.h \
-		  external/getopt.c \
-		  external/getopt.h \
-		  external/getopt1.c \
-
-OBJECTS = $(SOURCES:.cpp=.o)
-
-TOBJECTS = $(TARGETS:=.o)
-
-TFILES = $(TARGETS:=$(SUFFIX))
-
 all: release
 
-debug: CXXFLAGS += -O0 -g
-debug: $(TFILES)
-
-release: CXXFLAGS += -O3 -DNDEBUG
-release: $(TFILES)
-
-clean:
-	$(RM) $(TFILES)
-	$(RM) $(TOBJECTS)
-	$(RM) $(OBJECTS)
+include general/general.mk
+include grip/grip.mk
+include gripgen/gripgen.mk
+include test/test.mk
 
 
-$(TFILES): %: $(OBJECTS)
-	$(CXX) -o $@ $^ $(LDFLAGS)
-
-grip$(SUFFIX): grip.o
-
-egrip$(SUFFIX): egrip.o
-egrip.o: grip.cpp
-
-fgrip$(SUFFIX): fgrip.o
-fgrip.o: grip.cpp
-
-gripgen$(SUFFIX): gripgen.o
-
-%.o: %.cpp $(HEADERS) $(EXTERNAL)
-	$(CXX) -c -o $@ $< $(CXXFLAGS)
+release: $(TARGETS)
+release: CXXFLAGS += -O3 -DNDEBUG
 
+debug:   $(TARGETS)
+debug:   CXXFLAGS += -O0 -g
 
-install: $(TFILES)
-	install -m 0755 $^ $(PREFIX)/bin
+install: $(TARGETS)
+	$(MKDIR) $(PREFIX)/bin
+	$(INSTALL) $^ $(PREFIX)/bin
 
 uninstall:
-	$(RM) $(addprefix $(PREFIX)/bin/, $(TFILES))
-
+	$(RM) $(addprefix $(PREFIX)/bin/, $(notdir $(TARGETS)))
 
-.PHONY: all clean debug release install uninstall
+.PHONY: all release debug clean install uninstall
 
diff --git a/src/case.h → src/general/case.h b/src/case.h → src/general/case.h
diff --git a/src/compressedids.cpp → src/general/compressedids.cpp b/src/compressedids.cpp → src/general/compressedids.cpp
diff --git a/src/compressedids.h → src/general/compressedids.h b/src/compressedids.h → src/general/compressedids.h
diff --git a/src/config.h → src/general/config.h b/src/config.h → src/general/config.h
diff --git a/src/dbreader.cpp → src/general/dbreader.cpp b/src/dbreader.cpp → src/general/dbreader.cpp
diff --git a/src/dbreader.h → src/general/dbreader.h b/src/dbreader.h → src/general/dbreader.h
diff --git a/src/dir-boost.cpp → src/general/dir-boost.cpp b/src/dir-boost.cpp → src/general/dir-boost.cpp
diff --git a/src/dir-posix.cpp → src/general/dir-posix.cpp b/src/dir-posix.cpp → src/general/dir-posix.cpp
diff --git a/src/dir.cpp → src/general/dir.cpp b/src/dir.cpp → src/general/dir.cpp
diff --git a/src/dir.h → src/general/dir.h b/src/dir.h → src/general/dir.h
diff --git a/src/error.cpp → src/general/error.cpp b/src/error.cpp → src/general/error.cpp
diff --git a/src/error.h → src/general/error.h b/src/error.h → src/general/error.h
diff --git a/src/file.cpp → src/general/file.cpp b/src/file.cpp → src/general/file.cpp
diff --git a/src/file.h → src/general/file.h b/src/file.h → src/general/file.h
diff --git a/src/fileline.cpp → src/general/fileline.cpp b/src/fileline.cpp → src/general/fileline.cpp
diff --git a/src/fileline.h → src/general/fileline.h b/src/fileline.h → src/general/fileline.h
diff --git a/src/filelist.cpp → src/general/filelist.cpp b/src/filelist.cpp → src/general/filelist.cpp
diff --git a/src/filelist.h → src/general/filelist.h b/src/filelist.h → src/general/filelist.h
diff --git a/src/general/general.mk b/src/general/general.mk
@@ -0,0 +1,40 @@
+GENERAL_SOURCES = \
+				  general/compressedids.cpp \
+				  general/dbreader.cpp \
+				  general/dir-boost.cpp \
+				  general/dir.cpp \
+				  general/dir-posix.cpp \
+				  general/error.cpp \
+				  general/file.cpp \
+				  general/fileline.cpp \
+				  general/filelist.cpp \
+				  general/ids.cpp \
+				  general/node.cpp \
+				  general/print.cpp \
+
+GENERAL_HEADERS = \
+				  general/case.h \
+				  general/compressedids.h \
+				  general/config.h \
+				  general/dbreader.h \
+				  general/dir.h \
+				  general/error.h \
+				  general/file.h \
+				  general/fileline.h \
+				  general/filelist.h \
+				  general/ids.h \
+				  general/index.h \
+				  general/node.h \
+				  general/print.h \
+				  general/queue.h \
+				  general/sem.h \
+				  external/catch.hpp \
+				  external/fnmatch.c \
+				  external/fnmatch.h \
+				  external/ansidecl.h \
+				  external/getopt.c \
+				  external/getopt.h \
+				  external/getopt1.c \
+
+CXXFLAGS += -Igeneral
+
diff --git a/src/ids.cpp → src/general/ids.cpp b/src/ids.cpp → src/general/ids.cpp
@@ -152,6 +152,9 @@ uint32_t *Ids::setData(size_t size)
 	return m_ids.data();
 }
 
+void Ids::validate() const
+{}
+
 Ids::iterator Ids::begin()
 {
 	return m_ids.begin();

diff --git a/src/ids.h → src/general/ids.h b/src/ids.h → src/general/ids.h
@@ -40,6 +40,7 @@ class Ids
 		const_iterator begin() const;
 		const_iterator end() const;
 
+		void validate() const;
 	private:
 		std::vector<uint32_t> m_ids;
 };

diff --git a/src/index.h → src/general/index.h b/src/index.h → src/general/index.h
diff --git a/src/node.cpp → src/general/node.cpp b/src/node.cpp → src/general/node.cpp
diff --git a/src/node.h → src/general/node.h b/src/node.h → src/general/node.h
diff --git a/src/print.cpp → src/general/print.cpp b/src/print.cpp → src/general/print.cpp
diff --git a/src/print.h → src/general/print.h b/src/print.h → src/general/print.h
diff --git a/src/queue.h → src/general/queue.h b/src/queue.h → src/general/queue.h
diff --git a/src/sem.h → src/general/sem.h b/src/sem.h → src/general/sem.h
diff --git a/src/egrip.cpp → src/grip/egrip.cpp b/src/egrip.cpp → src/grip/egrip.cpp
diff --git a/src/fgrip.cpp → src/grip/fgrip.cpp b/src/fgrip.cpp → src/grip/fgrip.cpp
diff --git a/src/glob.cpp → src/grip/glob.cpp b/src/glob.cpp → src/grip/glob.cpp
diff --git a/src/glob.h → src/grip/glob.h b/src/glob.h → src/grip/glob.h
diff --git a/src/globfilters.def → src/grip/globfilters.def b/src/globfilters.def → src/grip/globfilters.def
diff --git a/src/grep.cpp → src/grip/grep.cpp b/src/grep.cpp → src/grip/grep.cpp
diff --git a/src/grep.h → src/grip/grep.h b/src/grep.h → src/grip/grep.h
diff --git a/src/grip.cpp → src/grip/grip.cpp b/src/grip.cpp → src/grip/grip.cpp
diff --git a/src/grip/grip.mk b/src/grip/grip.mk
@@ -0,0 +1,48 @@
+GRIP_DIR     = grip
+
+GRIP_TARGETS = \
+			   $(GRIP_DIR)/grip$(SUFFIX) \
+			   $(GRIP_DIR)/egrip$(SUFFIX) \
+			   $(GRIP_DIR)/fgrip$(SUFFIX) \
+
+TARGETS     += $(GRIP_TARGETS)
+
+GRIP_SOURCES = \
+			   $(GRIP_DIR)/glob.cpp \
+			   $(GRIP_DIR)/grep.cpp \
+			   $(GRIP_DIR)/pattern.cpp \
+			   $(GENERAL_SOURCES) \
+
+GRIP_HEADERS = \
+			   $(GRIP_DIR)/glob.h \
+			   $(GRIP_DIR)/grep.h \
+			   $(GRIP_DIR)/pattern.h \
+			   $(GENERAL_HEADERS) \
+
+GRIP_CXXFLAGS = \
+				$(CXXFLAGS) \
+
+GRIP_OBJDIR   = $(OBJDIR)/$(GRIP_DIR)
+GRIP_OBJDIRS  = $(sort $(dir $(GRIP_OBJECTS) $(GRIP_TOBJECTS)))
+GRIP_OBJECTS  = $(addprefix $(GRIP_OBJDIR)/, $(GRIP_SOURCES:.cpp=.o))
+GRIP_TOBJECTS = $(addprefix $(GRIP_OBJDIR)/, $(GRIP_TARGETS:$(SUFFIX)=.o))
+
+
+$(GRIP_TARGETS): %$(SUFFIX): $(GRIP_OBJDIR)/%.o $(GRIP_OBJECTS)
+	$(CXX) -o $@ $^ $(LDFLAGS)
+
+$(GRIP_OBJECTS) $(GRIP_TOBJECTS): $(GRIP_OBJDIR)/%.o: %.cpp $(GRIP_HEADERS) | $(GRIP_OBJDIRS)
+	$(CXX) -c -o $@ $< $(GRIP_CXXFLAGS)
+
+$(GRIP_OBJDIRS):
+	$(MKDIR) $@
+
+grip-clean:
+	$(RM) $(GRIP_TARGETS)
+	$(RM) $(GRIP_TOBJECTS)
+	$(RM) $(GRIP_OBJECTS)
+
+clean: grip-clean
+
+.PHONY: grip-clean
+
diff --git a/src/pattern.cpp → src/grip/pattern.cpp b/src/pattern.cpp → src/grip/pattern.cpp
diff --git a/src/pattern.h → src/grip/pattern.h b/src/pattern.h → src/grip/pattern.h
diff --git a/src/gripgen.cpp → src/gripgen/gripgen.cpp b/src/gripgen.cpp → src/gripgen/gripgen.cpp
diff --git a/src/gripgen/gripgen.mk b/src/gripgen/gripgen.mk
@@ -0,0 +1,45 @@
+GEN_DIR    = gripgen
+GEN_TARGET = $(GEN_DIR)/gripgen$(SUFFIX)
+TARGETS   += $(GEN_TARGET)
+
+GEN_SOURCES = \
+			  $(GEN_DIR)/gripgen.cpp \
+			  $(GEN_DIR)/indexer.cpp \
+			  $(GEN_DIR)/sortdb.cpp \
+			  $(GENERAL_SOURCES) \
+
+GEN_HEADERS = \
+			  $(GEN_DIR)/indexer.h \
+			  $(GENERAL_HEADERS) \
+
+GEN_CXXFLAGS = \
+			   $(CXXFLAGS) \
+			   -pthread \
+
+GEN_LDFLAGS  = \
+			   $(LDFLAGS) \
+			   -pthread \
+
+
+GEN_OBJDIR   = $(OBJDIR)/$(GEN_DIR)
+GEN_OBJDIRS  = $(sort $(dir $(GEN_OBJECTS)))
+GEN_OBJECTS  = $(addprefix $(GEN_OBJDIR)/, $(GEN_SOURCES:.cpp=.o))
+
+
+$(GEN_TARGET): $(GEN_OBJECTS)
+	$(CXX) -o $@ $^ $(GEN_LDFLAGS)
+
+$(GEN_OBJECTS): $(GEN_OBJDIR)/%.o: %.cpp $(GEN_HEADERS) | $(GEN_OBJDIRS)
+	$(CXX) -c -o $@ $< $(GEN_CXXFLAGS)
+
+$(GEN_OBJDIRS):
+	$(MKDIR) $@
+
+gripgen-clean:
+	$(RM) $(GEN_TARGET)
+	$(RM) $(GEN_OBJECTS)
+
+clean: gripgen-clean
+
+.PHONY: gripgen-clean
+
diff --git a/src/indexer.cpp → src/gripgen/indexer.cpp b/src/indexer.cpp → src/gripgen/indexer.cpp
diff --git a/src/indexer.h → src/gripgen/indexer.h b/src/indexer.h → src/gripgen/indexer.h
diff --git a/src/sortdb.cpp → src/gripgen/sortdb.cpp b/src/sortdb.cpp → src/gripgen/sortdb.cpp
diff --git a/src/scripts/install.cmd b/src/scripts/install.cmd
@@ -0,0 +1,10 @@
+@echo off
+for %%a in (%*) do set "dst=%%a"
+set "dst=%dst:/=\%"
+
+:loop
+	set "src=%1"
+	set "src=%src:/=\%"
+	copy "%src%" %dst%"
+	shift
+if not "%~2"=="" goto loop
diff --git a/src/scripts/mkdir.cmd b/src/scripts/mkdir.cmd
@@ -0,0 +1,7 @@
+@echo off
+:loop
+	set "p=%1"
+	set "p=%p:/=\%"
+	if not exist "%p%" mkdir "%p%"
+	shift
+if not "%~1"=="" goto loop
diff --git a/src/scripts/rm.cmd b/src/scripts/rm.cmd
@@ -0,0 +1,7 @@
+@echo off
+:loop
+	set "p=%1"
+	set "p=%p:/=\%"
+	if exist "%p%" del /Q "%p%"
+	shift
+if not "%~1"=="" goto loop