Move files & update paths (#541)

* Move files & update paths

* Rename build to scripts.

* Fix paths

* Fix script.

1 files changed, 74 insertions, 73 deletions

diff --git a/setup.py b/setup.py
index ce39a47..6dd513f 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ CURR_DIR = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
 
 def get_version():
     """ Return BROTLI_VERSION string as defined in 'common/version.h' file. """
-    version_file_path = os.path.join(CURR_DIR, 'common', 'version.h')
+    version_file_path = os.path.join(CURR_DIR, 'c', 'common', 'version.h')
     version = 0
     with open(version_file_path, 'r') as f:
         for line in f:
@@ -164,82 +164,83 @@ EXT_MODULES = [
         '_brotli',
         sources=[
             'python/_brotli.cc',
-            'common/dictionary.c',
-            'dec/bit_reader.c',
-            'dec/decode.c',
-            'dec/huffman.c',
-            'dec/state.c',
-            'enc/backward_references.c',
-            'enc/backward_references_hq.c',
-            'enc/bit_cost.c',
-            'enc/block_splitter.c',
-            'enc/brotli_bit_stream.c',
-            'enc/cluster.c',
-            'enc/compress_fragment.c',
-            'enc/compress_fragment_two_pass.c',
-            'enc/dictionary_hash.c',
-            'enc/encode.c',
-            'enc/entropy_encode.c',
-            'enc/histogram.c',
-            'enc/literal_cost.c',
-            'enc/memory.c',
-            'enc/metablock.c',
-            'enc/static_dict.c',
-            'enc/utf8_util.c',
+            'c/common/dictionary.c',
+            'c/dec/bit_reader.c',
+            'c/dec/decode.c',
+            'c/dec/huffman.c',
+            'c/dec/state.c',
+            'c/enc/backward_references.c',
+            'c/enc/backward_references_hq.c',
+            'c/enc/bit_cost.c',
+            'c/enc/block_splitter.c',
+            'c/enc/brotli_bit_stream.c',
+            'c/enc/cluster.c',
+            'c/enc/compress_fragment.c',
+            'c/enc/compress_fragment_two_pass.c',
+            'c/enc/dictionary_hash.c',
+            'c/enc/encode.c',
+            'c/enc/entropy_encode.c',
+            'c/enc/histogram.c',
+            'c/enc/literal_cost.c',
+            'c/enc/memory.c',
+            'c/enc/metablock.c',
+            'c/enc/static_dict.c',
+            'c/enc/utf8_util.c',
         ],
         depends=[
-            'common/constants.h',
-            'common/dictionary.h',
-            'common/port.h',
-            'common/version.h',
-            'dec/bit_reader.h',
-            'dec/context.h',
-            'dec/huffman.h',
-            'dec/port.h',
-            'dec/prefix.h',
-            'dec/state.h',
-            'dec/streams.h',
-            'dec/transform.h',
-            'enc/backward_references.h',
-            'enc/backward_references_hq.h',
-            'enc/backward_references_inc.h',
-            'enc/bit_cost.h',
-            'enc/bit_cost_inc.h',
-            'enc/block_splitter.h',
-            'enc/block_splitter_inc.h',
-            'enc/brotli_bit_stream.h',
-            'enc/cluster.h',
-            'enc/cluster_inc.h',
-            'enc/command.h',
-            'enc/compress_fragment.h',
-            'enc/compress_fragment_two_pass.h'
-            'enc/context.h',
-            'enc/dictionary_hash.h',
-            'enc/entropy_encode.h',
-            'enc/entropy_encode_static.h',
-            'enc/fast_log.h',
-            'enc/find_match_length.h',
-            'enc/hash.h',
-            'enc/hash_to_binary_tree_inc.h',
-            'enc/hash_longest_match64_inc.h',
-            'enc/hash_longest_match_inc.h',
-            'enc/hash_longest_match_quickly_inc.h',
-            'enc/histogram.h',
-            'enc/histogram_inc.h',
-            'enc/literal_cost.h',
-            'enc/memory.h',
-            'enc/metablock.h',
-            'enc/metablock_inc.h',
-            'enc/port.h',
-            'enc/prefix.h',
-            'enc/ringbuffer.h',
-            'enc/static_dict.h',
-            'enc/static_dict_lut.h',
-            'enc/utf8_util.h',
-            'enc/write_bits.h',
+            'c/common/constants.h',
+            'c/common/dictionary.h',
+            'c/common/version.h',
+            'c/dec/bit_reader.h',
+            'c/dec/context.h',
+            'c/dec/huffman.h',
+            'c/dec/port.h',
+            'c/dec/prefix.h',
+            'c/dec/state.h',
+            'c/dec/transform.h',
+            'c/enc/backward_references.h',
+            'c/enc/backward_references_hq.h',
+            'c/enc/backward_references_inc.h',
+            'c/enc/bit_cost.h',
+            'c/enc/bit_cost_inc.h',
+            'c/enc/block_encoder_inc.h',
+            'c/enc/block_splitter.h',
+            'c/enc/block_splitter_inc.h',
+            'c/enc/brotli_bit_stream.h',
+            'c/enc/cluster.h',
+            'c/enc/cluster_inc.h',
+            'c/enc/command.h',
+            'c/enc/compress_fragment.h',
+            'c/enc/compress_fragment_two_pass.h'
+            'c/enc/context.h',
+            'c/enc/dictionary_hash.h',
+            'c/enc/entropy_encode.h',
+            'c/enc/entropy_encode_static.h',
+            'c/enc/fast_log.h',
+            'c/enc/find_match_length.h',
+            'c/enc/hash.h',
+            'c/enc/hash_forgetful_chain_inc.h',
+            'c/enc/hash_longest_match64_inc.h',
+            'c/enc/hash_longest_match_inc.h',
+            'c/enc/hash_longest_match_quickly_inc.h',
+            'c/enc/hash_to_binary_tree_inc.h',
+            'c/enc/histogram.h',
+            'c/enc/histogram_inc.h',
+            'c/enc/literal_cost.h',
+            'c/enc/memory.h',
+            'c/enc/metablock.h',
+            'c/enc/metablock_inc.h',
+            'c/enc/port.h',
+            'c/enc/prefix.h',
+            'c/enc/quality.h',
+            'c/enc/ringbuffer.h',
+            'c/enc/static_dict.h',
+            'c/enc/static_dict_lut.h',
+            'c/enc/utf8_util.h',
+            'c/enc/write_bits.h',
         ],
         include_dirs=[
-            'include',
+            'c/include',
         ],
         language='c++'),
 ]