Move "public" to "include/brotli"

2024-11-21 19:20:09 +00:00 · 2016-08-23 14:40:33 +02:00 · 2016-08-23 14:40:33 +02:00 · 8148001158
commit 8148001158
parent 2032f41ffa
60 changed files with 81 additions and 86 deletions
--- a/32
+++ b/32
@ -23,7 +23,7 @@ STRICT_C_OPTIONS = [

 filegroup(
    name = "public_headers",
-    srcs = glob(["public/*.h"]),
+    srcs = glob(["include/brotli/*.h"]),
 )

 filegroup(
@ -56,40 +56,34 @@ filegroup(
    srcs = glob(["enc/*.c"]),
 )

+cc_inc_library(
+    name = "brotli",
+    hdrs = [":public_headers"],
+    prefix = "include",
+)
+
 cc_library(
    name = "brotli_common",
    srcs = [":common_sources"],
-    hdrs = [
-        ":common_headers",
-        ":public_headers",
-    ],
+    hdrs = [":common_headers"],
+    deps = [":brotli"],
    copts = STRICT_C_OPTIONS,
 )

 cc_library(
    name = "brotli_dec",
    srcs = [":dec_sources"],
-    hdrs = [
-        ":dec_headers",
-        ":public_headers",
-    ],
+    hdrs = [":dec_headers"],
    copts = STRICT_C_OPTIONS,
-    deps = [
-        ":brotli_common",
-    ],
+    deps = [":brotli_common"],
 )

 cc_library(
    name = "brotli_enc",
    srcs = [":enc_sources"],
-    hdrs = [
-        ":enc_headers",
-        ":public_headers",
-    ],
+    hdrs = [":enc_headers"],
    copts = STRICT_C_OPTIONS,
-    deps = [
-        ":brotli_common",
-    ],
+    deps = [":brotli_common"],
 )

 cc_binary(
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -5,7 +5,7 @@ include dec/*.c
 include dec/*.h
 include enc/*.c
 include enc/*.h
-include public/*.h
+include include/brotli/*.h
 include LICENSE
 include MANIFEST.in
 include python/bro.py
--- a/2
+++ b/2
@ -23,7 +23,7 @@ $(DIRS):
 	mkdir -p $@

 $(OBJECTS): $(DIRS)
-	$(CC) $(CFLAGS) $(CPPFLAGS) \
+	$(CC) $(CFLAGS) $(CPPFLAGS) -Iinclude \
        -c $(patsubst %.o,%.c,$(patsubst $(OBJDIR)/%,%,$@)) -o $@

 $(EXECUTABLE): $(OBJECTS)
--- a/common/dictionary.h
+++ b/common/dictionary.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_COMMON_DICTIONARY_H_
 #define BROTLI_COMMON_DICTIONARY_H_

-#include "../public/types.h"
+#include <brotli/types.h>

 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
--- a/dec/bit_reader.c
+++ b/dec/bit_reader.c
@ -8,7 +8,7 @@

 #include "./bit_reader.h"

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/dec/bit_reader.h
+++ b/dec/bit_reader.h
@ -11,7 +11,7 @@

 #include <string.h>  /* memcpy */

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/dec/context.h
+++ b/dec/context.h
@ -99,7 +99,7 @@
 #ifndef BROTLI_DEC_CONTEXT_H_
 #define BROTLI_DEC_CONTEXT_H_

-#include "../public/types.h"
+#include <brotli/types.h>

 enum ContextType {
  CONTEXT_LSB6 = 0,
--- a/dec/decode.c
+++ b/dec/decode.c
@ -4,7 +4,7 @@
   See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
 */

-#include "../public/decode.h"
+#include <brotli/decode.h>

 #ifdef __ARM_NEON__
 #include <arm_neon.h>
--- a/dec/huffman.c
+++ b/dec/huffman.c
@ -11,7 +11,7 @@
 #include <string.h>  /* memcpy, memset */

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/dec/huffman.h
+++ b/dec/huffman.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_DEC_HUFFMAN_H_
 #define BROTLI_DEC_HUFFMAN_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/dec/prefix.h
+++ b/dec/prefix.h
@ -12,7 +12,7 @@
 #define BROTLI_DEC_PREFIX_H_

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>

 /* Represents the range of values belonging to a prefix code: */
 /* [offset, offset + 2^nbits) */
--- a/dec/state.c
+++ b/dec/state.c
@ -8,7 +8,7 @@

 #include <stdlib.h>  /* free, malloc */

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./huffman.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/dec/state.h
+++ b/dec/state.h
@ -10,7 +10,7 @@
 #define BROTLI_DEC_STATE_H_

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./bit_reader.h"
 #include "./huffman.h"
 #include "./port.h"
--- a/dec/transform.h
+++ b/dec/transform.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_DEC_TRANSFORM_H_
 #define BROTLI_DEC_TRANSFORM_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/backward_references.c
+++ b/enc/backward_references.c
@ -12,7 +12,7 @@
 #include <string.h>  /* memcpy, memset */

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./command.h"
 #include "./fast_log.h"
 #include "./find_match_length.h"
--- a/enc/backward_references.h
+++ b/enc/backward_references.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_BACKWARD_REFERENCES_H_
 #define BROTLI_ENC_BACKWARD_REFERENCES_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./command.h"
 #include "./hash.h"
 #include "./memory.h"
--- a/enc/bit_cost.c
+++ b/enc/bit_cost.c
@ -9,7 +9,7 @@
 #include "./bit_cost.h"

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./fast_log.h"
 #include "./histogram.h"
 #include "./port.h"
--- a/enc/bit_cost.h
+++ b/enc/bit_cost.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_BIT_COST_H_
 #define BROTLI_ENC_BIT_COST_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./fast_log.h"
 #include "./histogram.h"
 #include "./port.h"
--- a/enc/block_splitter.h
+++ b/enc/block_splitter.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_BLOCK_SPLITTER_H_
 #define BROTLI_ENC_BLOCK_SPLITTER_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./command.h"
 #include "./memory.h"
 #include "./port.h"
--- a/enc/brotli_bit_stream.c
+++ b/enc/brotli_bit_stream.c
@ -13,7 +13,7 @@
 #include <string.h>  /* memcpy, memset */

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./context.h"
 #include "./entropy_encode.h"
 #include "./entropy_encode_static.h"
--- a/enc/brotli_bit_stream.h
+++ b/enc/brotli_bit_stream.h
@ -16,7 +16,7 @@
 #ifndef BROTLI_ENC_BROTLI_BIT_STREAM_H_
 #define BROTLI_ENC_BROTLI_BIT_STREAM_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./command.h"
 #include "./context.h"
 #include "./entropy_encode.h"
--- a/enc/cluster.c
+++ b/enc/cluster.c
@ -8,7 +8,7 @@

 #include "./cluster.h"

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./bit_cost.h"  /* BrotliPopulationCost */
 #include "./fast_log.h"
 #include "./histogram.h"
--- a/enc/cluster.h
+++ b/enc/cluster.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_CLUSTER_H_
 #define BROTLI_ENC_CLUSTER_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./histogram.h"
 #include "./memory.h"
 #include "./port.h"
--- a/enc/command.h
+++ b/enc/command.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_COMMAND_H_
 #define BROTLI_ENC_COMMAND_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "../common/port.h"
 #include "./fast_log.h"
 #include "./prefix.h"
--- a/enc/compress_fragment.c
+++ b/enc/compress_fragment.c
@ -16,7 +16,7 @@

 #include <string.h>  /* memcmp, memcpy, memset */

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./brotli_bit_stream.h"
 #include "./entropy_encode.h"
 #include "./fast_log.h"
--- a/enc/compress_fragment.h
+++ b/enc/compress_fragment.h
@ -12,7 +12,7 @@
 #ifndef BROTLI_ENC_COMPRESS_FRAGMENT_H_
 #define BROTLI_ENC_COMPRESS_FRAGMENT_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./memory.h"
 #include "./port.h"

--- a/enc/compress_fragment_two_pass.c
+++ b/enc/compress_fragment_two_pass.c
@ -14,7 +14,7 @@

 #include <string.h>  /* memcmp, memcpy, memset */

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./bit_cost.h"
 #include "./brotli_bit_stream.h"
 #include "./entropy_encode.h"
--- a/enc/compress_fragment_two_pass.h
+++ b/enc/compress_fragment_two_pass.h
@ -13,7 +13,7 @@
 #ifndef BROTLI_ENC_COMPRESS_FRAGMENT_TWO_PASS_H_
 #define BROTLI_ENC_COMPRESS_FRAGMENT_TWO_PASS_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./memory.h"
 #include "./port.h"

--- a/enc/context.h
+++ b/enc/context.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_CONTEXT_H_
 #define BROTLI_ENC_CONTEXT_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "../common/port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/dictionary_hash.h
+++ b/enc/dictionary_hash.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_DICTIONARY_HASH_H_
 #define BROTLI_ENC_DICTIONARY_HASH_H_

-#include "../public/types.h"
+#include <brotli/types.h>

 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
--- a/enc/encode.c
+++ b/enc/encode.c
@ -6,7 +6,7 @@

 /* Implementation of Brotli compressor. */

-#include "../public/encode.h"
+#include <brotli/encode.h>

 #include <stdlib.h>  /* free, malloc */
 #include <string.h>  /* memcpy, memset */
--- a/enc/entropy_encode.c
+++ b/enc/entropy_encode.c
@ -11,7 +11,7 @@
 #include <string.h>  /* memset */

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/entropy_encode.h
+++ b/enc/entropy_encode.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_ENTROPY_ENCODE_H_
 #define BROTLI_ENC_ENTROPY_ENCODE_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/entropy_encode_static.h
+++ b/enc/entropy_encode_static.h
@ -11,7 +11,7 @@

 #include "../common/constants.h"
 #include "../common/port.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./write_bits.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/fast_log.h
+++ b/enc/fast_log.h
@ -11,7 +11,7 @@

 #include <math.h>

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "../common/port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/find_match_length.h
+++ b/enc/find_match_length.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_FIND_MATCH_LENGTH_H_
 #define BROTLI_ENC_FIND_MATCH_LENGTH_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/hash.h
+++ b/enc/hash.h
@ -14,7 +14,7 @@

 #include "../common/constants.h"
 #include "../common/dictionary.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./dictionary_hash.h"
 #include "./fast_log.h"
 #include "./find_match_length.h"
--- a/enc/histogram.h
+++ b/enc/histogram.h
@ -12,7 +12,7 @@
 #include <string.h>  /* memset */

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./block_splitter.h"
 #include "./command.h"
 #include "./context.h"
--- a/enc/literal_cost.c
+++ b/enc/literal_cost.c
@ -9,7 +9,7 @@

 #include "./literal_cost.h"

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./fast_log.h"
 #include "./port.h"
 #include "./utf8_util.h"
--- a/enc/literal_cost.h
+++ b/enc/literal_cost.h
@ -10,7 +10,7 @@
 #ifndef BROTLI_ENC_LITERAL_COST_H_
 #define BROTLI_ENC_LITERAL_COST_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/memory.c
+++ b/enc/memory.c
@ -13,7 +13,7 @@
 #include <stdlib.h>  /* exit, free, malloc */
 #include <string.h>  /* memcpy */

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/memory.h
+++ b/enc/memory.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_MEMORY_H_
 #define BROTLI_ENC_MEMORY_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/metablock.c
+++ b/enc/metablock.c
@ -10,7 +10,7 @@
 #include "./metablock.h"

 #include "../common/constants.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./bit_cost.h"
 #include "./block_splitter.h"
 #include "./cluster.h"
--- a/enc/metablock.h
+++ b/enc/metablock.h
@ -10,7 +10,7 @@
 #ifndef BROTLI_ENC_METABLOCK_H_
 #define BROTLI_ENC_METABLOCK_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./block_splitter.h"
 #include "./command.h"
 #include "./context.h"
--- a/enc/port.h
+++ b/enc/port.h
@ -13,7 +13,7 @@
 #include <string.h>  /* memcpy */

 #include "../common/port.h"
-#include "../public/types.h"
+#include <brotli/types.h>

 #if defined OS_LINUX || defined OS_CYGWIN
 #include <endian.h>
--- a/enc/prefix.h
+++ b/enc/prefix.h
@ -12,7 +12,7 @@

 #include "../common/constants.h"
 #include "../common/port.h"
-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./fast_log.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/quality.h
+++ b/enc/quality.h
@ -10,7 +10,7 @@
 #ifndef BROTLI_ENC_QUALITY_H_
 #define BROTLI_ENC_QUALITY_H_

-#include "../public/encode.h"
+#include <brotli/encode.h>

 #define FAST_ONE_PASS_COMPRESSION_QUALITY 0
 #define FAST_TWO_PASS_COMPRESSION_QUALITY 1
--- a/enc/ringbuffer.h
+++ b/enc/ringbuffer.h
@ -11,7 +11,7 @@

 #include <string.h>  /* memcpy */

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./memory.h"
 #include "./port.h"
 #include "./quality.h"
--- a/enc/static_dict.h
+++ b/enc/static_dict.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_STATIC_DICT_H_
 #define BROTLI_ENC_STATIC_DICT_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/static_dict_lut.h
+++ b/enc/static_dict_lut.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_STATIC_DICT_LUT_H_
 #define BROTLI_ENC_STATIC_DICT_LUT_H_

-#include "../public/types.h"
+#include <brotli/types.h>

 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
--- a/enc/utf8_util.c
+++ b/enc/utf8_util.c
@ -8,7 +8,7 @@

 #include "./utf8_util.h"

-#include "../public/types.h"
+#include <brotli/types.h>

 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
--- a/enc/utf8_util.h
+++ b/enc/utf8_util.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_UTF8_UTIL_H_
 #define BROTLI_ENC_UTF8_UTIL_H_

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/enc/write_bits.h
+++ b/enc/write_bits.h
@ -12,7 +12,7 @@
 #include <assert.h>
 #include <stdio.h>  /* printf */

-#include "../public/types.h"
+#include <brotli/types.h>
 #include "./port.h"

 #if defined(__cplusplus) || defined(c_plusplus)
--- a/include/brotli/decode.h
+++ b/include/brotli/decode.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_DEC_DECODE_H_
 #define BROTLI_DEC_DECODE_H_

-#include "./types.h"
+#include <brotli/types.h>

 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
--- a/include/brotli/encode.h
+++ b/include/brotli/encode.h
@ -9,7 +9,7 @@
 #ifndef BROTLI_ENC_ENCODE_H_
 #define BROTLI_ENC_ENCODE_H_

-#include "./types.h"
+#include <brotli/types.h>

 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
--- a/include/brotli/types.h
+++ b/include/brotli/types.h
--- a/premake5.lua
+++ b/premake5.lua
@ -4,6 +4,7 @@ configurations { "Release", "Debug" }
 targetdir "bin"
 location "buildfiles"
 flags "RelativeLinks"
+includedirs { "include" }

 filter "configurations:Release"
  optimize "Speed"
@ -28,38 +29,38 @@ configuration { "macosx" }
 project "brotli_common"
  kind "SharedLib"
  language "C"
-  files { "common/**.h", "common/**.c", "public/**.h" }
+  files { "common/**.h", "common/**.c" }

 project "brotli_common_static"
  kind "StaticLib"
  targetname "brotli_common"
  language "C"
-  files { "common/**.h", "common/**.c", "public/**.h" }
+  files { "common/**.h", "common/**.c" }

 project "brotli_dec"
  kind "SharedLib"
  language "C"
-  files { "dec/**.h", "dec/**.c", "public/**.h" }
+  files { "dec/**.h", "dec/**.c" }
  links "brotli_common"

 project "brotli_dec_static"
  kind "StaticLib"
  targetname "brotli_dec"
  language "C"
-  files { "dec/**.h", "dec/**.c", "public/**.h" }
+  files { "dec/**.h", "dec/**.c" }
  links "brotli_common_static"

 project "brotli_enc"
  kind "SharedLib"
  language "C"
-  files { "enc/**.h", "enc/**.c", "public/**.h" }
+  files { "enc/**.h", "enc/**.c" }
  links "brotli_common"

 project "brotli_enc_static"
  kind "StaticLib"
  targetname "brotli_enc"
  language "C"
-  files { "enc/**.h", "enc/**.c", "public/**.h" }
+  files { "enc/**.h", "enc/**.c" }
  links "brotli_common_static"

 project "bro"
--- a/python/brotlimodule.cc
+++ b/python/brotlimodule.cc
@ -4,8 +4,8 @@
 #include <cstdio>
 #include <vector>
 #include "../common/version.h"
-#include "../public/encode.h"
-#include "../public/decode.h"
+#include <brotli/decode.h>
+#include <brotli/encode.h>

 #if PY_MAJOR_VERSION >= 3
 #define PyInt_Check PyLong_Check
--- a/setup.py
+++ b/setup.py
@ -192,9 +192,9 @@ brotli = Extension("brotli",
                        "enc/static_dict_lut.h",
                        "enc/utf8_util.h",
                        "enc/write_bits.h",
-                        "public/decode.h",
-                        "public/encode.h",
-                        "public/types.h",
+                        "include/brotli/decode.h",
+                        "include/brotli/encode.h",
+                        "include/brotli/types.h",
                    ],
                    language="c++",
                    )
--- a/tools/bro.c
+++ b/tools/bro.c
@ -14,8 +14,8 @@
 #include <sys/types.h>
 #include <time.h>

-#include "../public/decode.h"
-#include "../public/encode.h"
+#include <brotli/decode.h>
+#include <brotli/encode.h>

 #if !defined(_WIN32)
 #include <unistd.h>