From 6759a2534871fd3c25a0b7465f789989770ccc13 Mon Sep 17 00:00:00 2001 From: Yury Melnichek Date: Sun, 6 Mar 2011 13:35:18 +0100 Subject: [PATCH] Merge coding_sloynik and coding. --- .../bzip2_compressor.cpp | 0 .../bzip2_compressor.hpp | 0 {coding_sloynik => coding}/coder.hpp | 0 {coding_sloynik => coding}/coder_util.hpp | 0 coding/coding.pro | 11 +++++++++- .../coding_tests}/bzip2_test.cpp | 0 .../coding_tests}/coder_test.hpp | 0 .../coding_tests}/coder_util_test.cpp | 0 coding/coding_tests/coding_tests.pro | 6 +++++- .../coding_tests}/gzip_test.cpp | 0 .../gzip_compressor.cpp | 0 .../gzip_compressor.hpp | 0 .../polymorph_reader.hpp | 0 {coding_sloynik => coding}/timsort/timsort.c | 0 {coding_sloynik => coding}/timsort/timsort.h | 0 coding_sloynik/coding_sloynik.pro | 21 ------------------- .../coding_sloynik_tests.pro | 18 ---------------- console_sloynik/console_sloynik.pro | 2 +- publisher/aard_dictionary.cpp | 4 ++-- publisher/main.cpp | 2 +- publisher/publisher.pro | 2 +- publisher/publisher_tests/publisher_tests.pro | 2 +- sloynik.pro | 1 - utils/utils.pro | 2 +- utils/utils_tests/utils_tests.pro | 2 +- words/slof_dictionary.cpp | 2 +- words/sloynik_index.cpp | 2 +- words/sloynik_index.hpp | 2 +- words/words.pro | 2 +- words/words_tests/words_tests.pro | 2 +- 30 files changed, 28 insertions(+), 55 deletions(-) rename {coding_sloynik => coding}/bzip2_compressor.cpp (100%) rename {coding_sloynik => coding}/bzip2_compressor.hpp (100%) rename {coding_sloynik => coding}/coder.hpp (100%) rename {coding_sloynik => coding}/coder_util.hpp (100%) rename {coding_sloynik/coding_sloynik_tests => coding/coding_tests}/bzip2_test.cpp (100%) rename {coding_sloynik/coding_sloynik_tests => coding/coding_tests}/coder_test.hpp (100%) rename {coding_sloynik/coding_sloynik_tests => coding/coding_tests}/coder_util_test.cpp (100%) rename {coding_sloynik/coding_sloynik_tests => coding/coding_tests}/gzip_test.cpp (100%) rename {coding_sloynik => coding}/gzip_compressor.cpp (100%) rename {coding_sloynik => coding}/gzip_compressor.hpp (100%) rename {coding_sloynik => coding}/polymorph_reader.hpp (100%) rename {coding_sloynik => coding}/timsort/timsort.c (100%) rename {coding_sloynik => coding}/timsort/timsort.h (100%) delete mode 100644 coding_sloynik/coding_sloynik.pro delete mode 100644 coding_sloynik/coding_sloynik_tests/coding_sloynik_tests.pro diff --git a/coding_sloynik/bzip2_compressor.cpp b/coding/bzip2_compressor.cpp similarity index 100% rename from coding_sloynik/bzip2_compressor.cpp rename to coding/bzip2_compressor.cpp diff --git a/coding_sloynik/bzip2_compressor.hpp b/coding/bzip2_compressor.hpp similarity index 100% rename from coding_sloynik/bzip2_compressor.hpp rename to coding/bzip2_compressor.hpp diff --git a/coding_sloynik/coder.hpp b/coding/coder.hpp similarity index 100% rename from coding_sloynik/coder.hpp rename to coding/coder.hpp diff --git a/coding_sloynik/coder_util.hpp b/coding/coder_util.hpp similarity index 100% rename from coding_sloynik/coder_util.hpp rename to coding/coder_util.hpp diff --git a/coding/coding.pro b/coding/coding.pro index ccdd44f9e7..df457d44fc 100644 --- a/coding/coding.pro +++ b/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 \ diff --git a/coding_sloynik/coding_sloynik_tests/bzip2_test.cpp b/coding/coding_tests/bzip2_test.cpp similarity index 100% rename from coding_sloynik/coding_sloynik_tests/bzip2_test.cpp rename to coding/coding_tests/bzip2_test.cpp diff --git a/coding_sloynik/coding_sloynik_tests/coder_test.hpp b/coding/coding_tests/coder_test.hpp similarity index 100% rename from coding_sloynik/coding_sloynik_tests/coder_test.hpp rename to coding/coding_tests/coder_test.hpp diff --git a/coding_sloynik/coding_sloynik_tests/coder_util_test.cpp b/coding/coding_tests/coder_util_test.cpp similarity index 100% rename from coding_sloynik/coding_sloynik_tests/coder_util_test.cpp rename to coding/coding_tests/coder_util_test.cpp diff --git a/coding/coding_tests/coding_tests.pro b/coding/coding_tests/coding_tests.pro index 9d2f423deb..b98d1d8106 100644 --- a/coding/coding_tests/coding_tests.pro +++ b/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 \ diff --git a/coding_sloynik/coding_sloynik_tests/gzip_test.cpp b/coding/coding_tests/gzip_test.cpp similarity index 100% rename from coding_sloynik/coding_sloynik_tests/gzip_test.cpp rename to coding/coding_tests/gzip_test.cpp diff --git a/coding_sloynik/gzip_compressor.cpp b/coding/gzip_compressor.cpp similarity index 100% rename from coding_sloynik/gzip_compressor.cpp rename to coding/gzip_compressor.cpp diff --git a/coding_sloynik/gzip_compressor.hpp b/coding/gzip_compressor.hpp similarity index 100% rename from coding_sloynik/gzip_compressor.hpp rename to coding/gzip_compressor.hpp diff --git a/coding_sloynik/polymorph_reader.hpp b/coding/polymorph_reader.hpp similarity index 100% rename from coding_sloynik/polymorph_reader.hpp rename to coding/polymorph_reader.hpp diff --git a/coding_sloynik/timsort/timsort.c b/coding/timsort/timsort.c similarity index 100% rename from coding_sloynik/timsort/timsort.c rename to coding/timsort/timsort.c diff --git a/coding_sloynik/timsort/timsort.h b/coding/timsort/timsort.h similarity index 100% rename from coding_sloynik/timsort/timsort.h rename to coding/timsort/timsort.h diff --git a/coding_sloynik/coding_sloynik.pro b/coding_sloynik/coding_sloynik.pro deleted file mode 100644 index 2e42cdd933..0000000000 --- a/coding_sloynik/coding_sloynik.pro +++ /dev/null @@ -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 \ diff --git a/coding_sloynik/coding_sloynik_tests/coding_sloynik_tests.pro b/coding_sloynik/coding_sloynik_tests/coding_sloynik_tests.pro deleted file mode 100644 index cc7408685a..0000000000 --- a/coding_sloynik/coding_sloynik_tests/coding_sloynik_tests.pro +++ /dev/null @@ -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 \ - diff --git a/console_sloynik/console_sloynik.pro b/console_sloynik/console_sloynik.pro index 12d7fd84f5..f29c2f865d 100644 --- a/console_sloynik/console_sloynik.pro +++ b/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) diff --git a/publisher/aard_dictionary.cpp b/publisher/aard_dictionary.cpp index 47e98a9001..b6a663cd62 100644 --- a/publisher/aard_dictionary.cpp +++ b/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" diff --git a/publisher/main.cpp b/publisher/main.cpp index 52fdbf64f6..ed33d92831 100644 --- a/publisher/main.cpp +++ b/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" diff --git a/publisher/publisher.pro b/publisher/publisher.pro index e629b513b5..5480e5cf8a 100644 --- a/publisher/publisher.pro +++ b/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) diff --git a/publisher/publisher_tests/publisher_tests.pro b/publisher/publisher_tests/publisher_tests.pro index b3ea6bb6b2..fb2784cd3a 100644 --- a/publisher/publisher_tests/publisher_tests.pro +++ b/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) diff --git a/sloynik.pro b/sloynik.pro index 073a44b0ef..7efdf0341c 100644 --- a/sloynik.pro +++ b/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\ diff --git a/utils/utils.pro b/utils/utils.pro index 2c836614be..81f7cc895f 100644 --- a/utils/utils.pro +++ b/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) diff --git a/utils/utils_tests/utils_tests.pro b/utils/utils_tests/utils_tests.pro index 26cfd9bf5c..42468aee82 100644 --- a/utils/utils_tests/utils_tests.pro +++ b/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) diff --git a/words/slof_dictionary.cpp b/words/slof_dictionary.cpp index bf1ff8543e..d0212c099e 100644 --- a/words/slof_dictionary.cpp +++ b/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" diff --git a/words/sloynik_index.cpp b/words/sloynik_index.cpp index ff81a7a84d..bcf9529388 100644 --- a/words/sloynik_index.cpp +++ b/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" } diff --git a/words/sloynik_index.hpp b/words/sloynik_index.hpp index 192a1bddae..f0fa9d5a98 100644 --- a/words/sloynik_index.hpp +++ b/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" diff --git a/words/words.pro b/words/words.pro index 6d37071956..e5e02b172f 100644 --- a/words/words.pro +++ b/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) diff --git a/words/words_tests/words_tests.pro b/words/words_tests/words_tests.pro index 345836734a..069186b771 100644 --- a/words/words_tests/words_tests.pro +++ b/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)