Merge coding_sloynik and coding.

coding/coding.pro

@@ -4,7 +4,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 ROOT_DIR = ..
-DEPENDENCIES = base
+DEPENDENCIES = bzip2 zlib base
 
 include($$ROOT_DIR/common.pri)
 
@@ -14,6 +14,9 @@ SOURCES += \
   file_writer.cpp \
   lodepng.cpp \
   file_container.cpp \
+  bzip2_compressor.cpp \
+  gzip_compressor.cpp \
+  timsort/timsort.c \
 
 
 HEADERS += \
@@ -61,3 +64,9 @@ HEADERS += \
   streams_sink.hpp \
   streams_common.hpp \
   file_container.hpp \
+  polymorph_reader.hpp \
+  coder.hpp \
+  coder_util.hpp \
+  bzip2_compressor.hpp \
+  gzip_compressor.hpp \
+  timsort/timsort.h \

coding/coding_tests/coding_tests.pro

@@ -5,7 +5,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = coding base
+DEPENDENCIES = bzip2 zlib base coding
 
 include($$ROOT_DIR/common.pri)
 
@@ -28,6 +28,10 @@ SOURCES += ../../testing/testingmain.cpp \
   reader_cache_test.cpp \
   file_container_test.cpp \
   strutil_test.cpp \
+  bzip2_test.cpp \
+  gzip_test.cpp \
+  coder_util_test.cpp \
 
 HEADERS += \
   reader_test.hpp \
+  coder_test.hpp \

coding_sloynik/coding_sloynik.pro

@@ -1,21 +0,0 @@
-TARGET = coding_sloynik
-TEMPLATE = lib
-CONFIG += staticlib
-
-ROOT_DIR = ..
-DEPENDENCIES = bzip2 zlib base coding
-
-include($$ROOT_DIR/common.pri)
-
-HEADERS += \
-  bzip2_compressor.hpp \
-  coder.hpp \
-  coder_util.hpp \
-  gzip_compressor.hpp \
-  polymorph_reader.hpp \
-  timsort/timsort.h \
-
-SOURCES += \
-  bzip2_compressor.cpp \
-  gzip_compressor.cpp \
-  timsort/timsort.c \

coding_sloynik/coding_sloynik_tests/coding_sloynik_tests.pro

@@ -1,18 +0,0 @@
-TARGET = coding_sloynik_tests
-TEMPLATE = app
-CONFIG += console
-CONFIG -= app_bundle
-
-ROOT_DIR = ../..
-DEPENDENCIES = bzip2 zlib base coding coding_sloynik
-
-include($$ROOT_DIR/common.pri)
-
-SOURCES += $$ROOT_DIR/testing/testingmain.cpp \
-    bzip2_test.cpp \
-    coder_util_test.cpp \
-    gzip_test.cpp \
-
-HEADERS += \
-    coder_test.hpp \
-

console_sloynik/console_sloynik.pro

@@ -4,7 +4,7 @@ CONFIG += console
 CONFIG -= app_bundle
 
 ROOT_DIR = ..
-DEPENDENCIES = gflags bzip2 zlib base coding coding_sloynik words
+DEPENDENCIES = gflags bzip2 zlib base coding words
 
 include($$ROOT_DIR/common.pri)
 

publisher/aard_dictionary.cpp

@@ -1,6 +1,6 @@
 #include "aard_dictionary.hpp"
-#include "../coding_sloynik/bzip2_compressor.hpp"
-#include "../coding_sloynik/gzip_compressor.hpp"
+#include "../coding/bzip2_compressor.hpp"
+#include "../coding/gzip_compressor.hpp"
 #include "../coding/endianness.hpp"
 #include "../coding/reader.hpp"
 #include "../base/logging.hpp"

publisher/main.cpp

@@ -1,6 +1,6 @@
 #include "aard_dictionary.hpp"
 #include "slof_indexer.hpp"
-#include "../coding_sloynik/bzip2_compressor.hpp"
+#include "../coding/bzip2_compressor.hpp"
 #include "../coding/file_reader.hpp"
 #include "../coding/file_writer.hpp"
 #include "../base/base.hpp"

publisher/publisher.pro

@@ -4,7 +4,7 @@ CONFIG += console
 CONFIG -= app_bundle
 
 ROOT_DIR = ..
-DEPENDENCIES = gflags bzip2 zlib jansson base coding coding_sloynik words
+DEPENDENCIES = gflags bzip2 zlib jansson base coding words
 
 include($$ROOT_DIR/common.pri)
 

publisher/publisher_tests/publisher_tests.pro

@@ -4,7 +4,7 @@ CONFIG += console
 CONFIG -= app_bundle
 
 ROOT_DIR = ../..
-DEPENDENCIES = gflags bzip2 zlib base coding coding_sloynik words
+DEPENDENCIES = gflags bzip2 zlib base coding words
 
 include($$ROOT_DIR/common.pri)
 

sloynik.pro

@@ -6,7 +6,6 @@ SUBDIRS = \
     3party \
     base base/base_tests \
     coding coding/coding_tests \
-    coding_sloynik coding_sloynik/coding_sloynik_tests \
     utils utils/utils_tests \
     words words/words_tests \
     publisher publisher/publisher_tests\

utils/utils.pro

@@ -3,7 +3,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 ROOT_DIR = ..
-DEPENDENCIES = base coding coding_sloynik
+DEPENDENCIES = base coding
 
 include($$ROOT_DIR/common.pri)
 

utils/utils_tests/utils_tests.pro

@@ -4,7 +4,7 @@ CONFIG += console
 CONFIG -= app_bundle
 
 ROOT_DIR = ../..
-DEPENDENCIES = protobuf base coding coding_sloynik utils
+DEPENDENCIES = protobuf base coding utils
 
 include($$ROOT_DIR/common.pri)
 

words/slof_dictionary.cpp

@@ -1,5 +1,5 @@
 #include "slof_dictionary.hpp"
-#include "../coding_sloynik/bzip2_compressor.hpp"
+#include "../coding/bzip2_compressor.hpp"
 #include "../coding/byte_stream.hpp"
 #include "../coding/endianness.hpp"
 #include "../coding/reader.hpp"

words/sloynik_index.cpp

@@ -7,7 +7,7 @@
 #include "../std/bind.hpp"
 
 extern "C" {
-  #include "../coding_sloynik/timsort/timsort.h"
+  #include "../coding/timsort/timsort.h"
 }
 
 

words/sloynik_index.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "common.hpp"
 #include "dictionary.hpp"
-#include "../coding_sloynik/polymorph_reader.hpp"
+#include "../coding/polymorph_reader.hpp"
 #include "../coding/dd_vector.hpp"
 #include "../coding/file_reader.hpp"
 #include "../base/base.hpp"

words/words.pro

@@ -3,7 +3,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 ROOT_DIR = ..
-DEPENDENCIES = bzip2 zlib base coding coding_sloynik
+DEPENDENCIES = bzip2 zlib base coding
 
 include($$ROOT_DIR/common.pri)
 

words/words_tests/words_tests.pro

@@ -4,7 +4,7 @@ CONFIG += console
 CONFIG -= app_bundle
 
 ROOT_DIR = ../..
-DEPENDENCIES = bzip2 zlib base coding coding_sloynik words
+DEPENDENCIES = bzip2 zlib base coding words
 
 include($$ROOT_DIR/common.pri)