Move base64simd into a 3rdparty folder

kovidgoyal · Nov 14, 2023 · 250aa3a · 250aa3a
1 parent f36f37b
commit 250aa3a
Show file tree

Hide file tree

Showing 61 changed files with 15 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -16,6 +16,7 @@ kittens/diff/options/types.py linguist-generated=true
 kittens/diff/options/parse.py linguist-generated=true
 glfw/*.c linguist-vendored=true
 glfw/*.h linguist-vendored=true
+3rdparty/** linguist-vendored=true
 kittens/unicode_input/names.h linguist-generated=true
 tools/wcswidth/std.go linguist-generated=true
 tools/unicode_names/names.txt linguist-generated=true

diff --git a/base64/LICENSE → 3rdparty/base64/LICENSE b/base64/LICENSE → 3rdparty/base64/LICENSE
diff --git a/base64/README.md → 3rdparty/base64/README.md b/base64/README.md → 3rdparty/base64/README.md
diff --git a/base64/config.h → 3rdparty/base64/config.h b/base64/config.h → 3rdparty/base64/config.h
diff --git a/base64/include/libbase64.h → 3rdparty/base64/include/libbase64.h b/base64/include/libbase64.h → 3rdparty/base64/include/libbase64.h
diff --git a/base64/lib/arch/avx/codec.c → 3rdparty/base64/lib/arch/avx/codec.c b/base64/lib/arch/avx/codec.c → 3rdparty/base64/lib/arch/avx/codec.c
diff --git a/base64/lib/arch/avx/enc_loop_asm.c → 3rdparty/base64/lib/arch/avx/enc_loop_asm.c b/base64/lib/arch/avx/enc_loop_asm.c → 3rdparty/base64/lib/arch/avx/enc_loop_asm.c
diff --git a/base64/lib/arch/avx2/codec.c → 3rdparty/base64/lib/arch/avx2/codec.c b/base64/lib/arch/avx2/codec.c → 3rdparty/base64/lib/arch/avx2/codec.c
diff --git a/base64/lib/arch/avx2/dec_loop.c → 3rdparty/base64/lib/arch/avx2/dec_loop.c b/base64/lib/arch/avx2/dec_loop.c → 3rdparty/base64/lib/arch/avx2/dec_loop.c
diff --git a/base64/lib/arch/avx2/dec_reshuffle.c → ...arty/base64/lib/arch/avx2/dec_reshuffle.c b/base64/lib/arch/avx2/dec_reshuffle.c → ...arty/base64/lib/arch/avx2/dec_reshuffle.c
diff --git a/base64/lib/arch/avx2/enc_loop.c → 3rdparty/base64/lib/arch/avx2/enc_loop.c b/base64/lib/arch/avx2/enc_loop.c → 3rdparty/base64/lib/arch/avx2/enc_loop.c
diff --git a/base64/lib/arch/avx2/enc_loop_asm.c → 3rdparty/base64/lib/arch/avx2/enc_loop_asm.c b/base64/lib/arch/avx2/enc_loop_asm.c → 3rdparty/base64/lib/arch/avx2/enc_loop_asm.c
diff --git a/base64/lib/arch/avx2/enc_reshuffle.c → ...arty/base64/lib/arch/avx2/enc_reshuffle.c b/base64/lib/arch/avx2/enc_reshuffle.c → ...arty/base64/lib/arch/avx2/enc_reshuffle.c
diff --git a/base64/lib/arch/avx2/enc_translate.c → ...arty/base64/lib/arch/avx2/enc_translate.c b/base64/lib/arch/avx2/enc_translate.c → ...arty/base64/lib/arch/avx2/enc_translate.c
diff --git a/base64/lib/arch/avx512/codec.c → 3rdparty/base64/lib/arch/avx512/codec.c b/base64/lib/arch/avx512/codec.c → 3rdparty/base64/lib/arch/avx512/codec.c
diff --git a/base64/lib/arch/avx512/enc_loop.c → 3rdparty/base64/lib/arch/avx512/enc_loop.c b/base64/lib/arch/avx512/enc_loop.c → 3rdparty/base64/lib/arch/avx512/enc_loop.c
diff --git a/...lib/arch/avx512/enc_reshuffle_translate.c → ...lib/arch/avx512/enc_reshuffle_translate.c b/...lib/arch/avx512/enc_reshuffle_translate.c → ...lib/arch/avx512/enc_reshuffle_translate.c
diff --git a/base64/lib/arch/generic/32/dec_loop.c → ...rty/base64/lib/arch/generic/32/dec_loop.c b/base64/lib/arch/generic/32/dec_loop.c → ...rty/base64/lib/arch/generic/32/dec_loop.c
diff --git a/base64/lib/arch/generic/32/enc_loop.c → ...rty/base64/lib/arch/generic/32/enc_loop.c b/base64/lib/arch/generic/32/enc_loop.c → ...rty/base64/lib/arch/generic/32/enc_loop.c
diff --git a/base64/lib/arch/generic/64/enc_loop.c → ...rty/base64/lib/arch/generic/64/enc_loop.c b/base64/lib/arch/generic/64/enc_loop.c → ...rty/base64/lib/arch/generic/64/enc_loop.c
diff --git a/base64/lib/arch/generic/codec.c → 3rdparty/base64/lib/arch/generic/codec.c b/base64/lib/arch/generic/codec.c → 3rdparty/base64/lib/arch/generic/codec.c
diff --git a/base64/lib/arch/generic/dec_head.c → 3rdparty/base64/lib/arch/generic/dec_head.c b/base64/lib/arch/generic/dec_head.c → 3rdparty/base64/lib/arch/generic/dec_head.c
diff --git a/base64/lib/arch/generic/dec_tail.c → 3rdparty/base64/lib/arch/generic/dec_tail.c b/base64/lib/arch/generic/dec_tail.c → 3rdparty/base64/lib/arch/generic/dec_tail.c
diff --git a/base64/lib/arch/generic/enc_head.c → 3rdparty/base64/lib/arch/generic/enc_head.c b/base64/lib/arch/generic/enc_head.c → 3rdparty/base64/lib/arch/generic/enc_head.c
diff --git a/base64/lib/arch/generic/enc_tail.c → 3rdparty/base64/lib/arch/generic/enc_tail.c b/base64/lib/arch/generic/enc_tail.c → 3rdparty/base64/lib/arch/generic/enc_tail.c
diff --git a/base64/lib/arch/neon32/codec.c → 3rdparty/base64/lib/arch/neon32/codec.c b/base64/lib/arch/neon32/codec.c → 3rdparty/base64/lib/arch/neon32/codec.c
diff --git a/base64/lib/arch/neon32/dec_loop.c → 3rdparty/base64/lib/arch/neon32/dec_loop.c b/base64/lib/arch/neon32/dec_loop.c → 3rdparty/base64/lib/arch/neon32/dec_loop.c
diff --git a/base64/lib/arch/neon32/enc_loop.c → 3rdparty/base64/lib/arch/neon32/enc_loop.c b/base64/lib/arch/neon32/enc_loop.c → 3rdparty/base64/lib/arch/neon32/enc_loop.c
diff --git a/base64/lib/arch/neon32/enc_reshuffle.c → ...ty/base64/lib/arch/neon32/enc_reshuffle.c b/base64/lib/arch/neon32/enc_reshuffle.c → ...ty/base64/lib/arch/neon32/enc_reshuffle.c
diff --git a/base64/lib/arch/neon32/enc_translate.c → ...ty/base64/lib/arch/neon32/enc_translate.c b/base64/lib/arch/neon32/enc_translate.c → ...ty/base64/lib/arch/neon32/enc_translate.c
diff --git a/base64/lib/arch/neon64/codec.c → 3rdparty/base64/lib/arch/neon64/codec.c b/base64/lib/arch/neon64/codec.c → 3rdparty/base64/lib/arch/neon64/codec.c
diff --git a/base64/lib/arch/neon64/dec_loop.c → 3rdparty/base64/lib/arch/neon64/dec_loop.c b/base64/lib/arch/neon64/dec_loop.c → 3rdparty/base64/lib/arch/neon64/dec_loop.c
diff --git a/base64/lib/arch/neon64/enc_loop.c → 3rdparty/base64/lib/arch/neon64/enc_loop.c b/base64/lib/arch/neon64/enc_loop.c → 3rdparty/base64/lib/arch/neon64/enc_loop.c
diff --git a/base64/lib/arch/neon64/enc_loop_asm.c → ...rty/base64/lib/arch/neon64/enc_loop_asm.c b/base64/lib/arch/neon64/enc_loop_asm.c → ...rty/base64/lib/arch/neon64/enc_loop_asm.c
diff --git a/base64/lib/arch/neon64/enc_reshuffle.c → ...ty/base64/lib/arch/neon64/enc_reshuffle.c b/base64/lib/arch/neon64/enc_reshuffle.c → ...ty/base64/lib/arch/neon64/enc_reshuffle.c
diff --git a/base64/lib/arch/sse41/codec.c → 3rdparty/base64/lib/arch/sse41/codec.c b/base64/lib/arch/sse41/codec.c → 3rdparty/base64/lib/arch/sse41/codec.c
diff --git a/base64/lib/arch/sse42/codec.c → 3rdparty/base64/lib/arch/sse42/codec.c b/base64/lib/arch/sse42/codec.c → 3rdparty/base64/lib/arch/sse42/codec.c
diff --git a/base64/lib/arch/ssse3/codec.c → 3rdparty/base64/lib/arch/ssse3/codec.c b/base64/lib/arch/ssse3/codec.c → 3rdparty/base64/lib/arch/ssse3/codec.c
diff --git a/base64/lib/arch/ssse3/dec_loop.c → 3rdparty/base64/lib/arch/ssse3/dec_loop.c b/base64/lib/arch/ssse3/dec_loop.c → 3rdparty/base64/lib/arch/ssse3/dec_loop.c
diff --git a/base64/lib/arch/ssse3/dec_reshuffle.c → ...rty/base64/lib/arch/ssse3/dec_reshuffle.c b/base64/lib/arch/ssse3/dec_reshuffle.c → ...rty/base64/lib/arch/ssse3/dec_reshuffle.c
diff --git a/base64/lib/arch/ssse3/enc_loop.c → 3rdparty/base64/lib/arch/ssse3/enc_loop.c b/base64/lib/arch/ssse3/enc_loop.c → 3rdparty/base64/lib/arch/ssse3/enc_loop.c
diff --git a/base64/lib/arch/ssse3/enc_loop_asm.c → ...arty/base64/lib/arch/ssse3/enc_loop_asm.c b/base64/lib/arch/ssse3/enc_loop_asm.c → ...arty/base64/lib/arch/ssse3/enc_loop_asm.c
diff --git a/base64/lib/arch/ssse3/enc_reshuffle.c → ...rty/base64/lib/arch/ssse3/enc_reshuffle.c b/base64/lib/arch/ssse3/enc_reshuffle.c → ...rty/base64/lib/arch/ssse3/enc_reshuffle.c
diff --git a/base64/lib/arch/ssse3/enc_translate.c → ...rty/base64/lib/arch/ssse3/enc_translate.c b/base64/lib/arch/ssse3/enc_translate.c → ...rty/base64/lib/arch/ssse3/enc_translate.c
diff --git a/base64/lib/codec_choose.c → 3rdparty/base64/lib/codec_choose.c b/base64/lib/codec_choose.c → 3rdparty/base64/lib/codec_choose.c
diff --git a/base64/lib/codecs.h → 3rdparty/base64/lib/codecs.h b/base64/lib/codecs.h → 3rdparty/base64/lib/codecs.h
diff --git a/base64/lib/env.h → 3rdparty/base64/lib/env.h b/base64/lib/env.h → 3rdparty/base64/lib/env.h
diff --git a/base64/lib/exports.txt → 3rdparty/base64/lib/exports.txt b/base64/lib/exports.txt → 3rdparty/base64/lib/exports.txt
diff --git a/base64/lib/lib.c → 3rdparty/base64/lib/lib.c b/base64/lib/lib.c → 3rdparty/base64/lib/lib.c
diff --git a/base64/lib/lib_openmp.c → 3rdparty/base64/lib/lib_openmp.c b/base64/lib/lib_openmp.c → 3rdparty/base64/lib/lib_openmp.c
diff --git a/base64/lib/tables/.gitignore → 3rdparty/base64/lib/tables/.gitignore b/base64/lib/tables/.gitignore → 3rdparty/base64/lib/tables/.gitignore
diff --git a/base64/lib/tables/Makefile → 3rdparty/base64/lib/tables/Makefile b/base64/lib/tables/Makefile → 3rdparty/base64/lib/tables/Makefile
diff --git a/base64/lib/tables/table_dec_32bit.h → 3rdparty/base64/lib/tables/table_dec_32bit.h b/base64/lib/tables/table_dec_32bit.h → 3rdparty/base64/lib/tables/table_dec_32bit.h
diff --git a/base64/lib/tables/table_enc_12bit.h → 3rdparty/base64/lib/tables/table_enc_12bit.h b/base64/lib/tables/table_enc_12bit.h → 3rdparty/base64/lib/tables/table_enc_12bit.h
diff --git a/base64/lib/tables/table_enc_12bit.py → ...arty/base64/lib/tables/table_enc_12bit.py b/base64/lib/tables/table_enc_12bit.py → ...arty/base64/lib/tables/table_enc_12bit.py
diff --git a/base64/lib/tables/table_generator.c → 3rdparty/base64/lib/tables/table_generator.c b/base64/lib/tables/table_generator.c → 3rdparty/base64/lib/tables/table_generator.c
diff --git a/base64/lib/tables/tables.c → 3rdparty/base64/lib/tables/tables.c b/base64/lib/tables/tables.c → 3rdparty/base64/lib/tables/tables.c
diff --git a/base64/lib/tables/tables.h → 3rdparty/base64/lib/tables/tables.h b/base64/lib/tables/tables.h → 3rdparty/base64/lib/tables/tables.h
diff --git a/count-lines-of-code b/count-lines-of-code
@@ -5,12 +5,13 @@ import subprocess
 ls_files = subprocess.check_output([ 'git', 'ls-files']).decode('utf-8')
 all_files = set(ls_files.splitlines())
 all_files.discard('')
-cp = subprocess.run(['git', 'check-attr', 'linguist-generated', '--stdin'],
-                    check=True, stdout=subprocess.PIPE, input='\n'.join(all_files).encode('utf-8'))
-for line in cp.stdout.decode().splitlines():
-    if line.endswith(' true'):
-        fname = line.split(':', 1)[0]
-        all_files.discard(fname)
+for attr in ('linguist-generated', 'linguist-vendored'):
+    cp = subprocess.run(['git', 'check-attr', attr, '--stdin'],
+                        check=True, stdout=subprocess.PIPE, input='\n'.join(all_files).encode('utf-8'))
+    for line in cp.stdout.decode().splitlines():
+        if line.endswith(' true'):
+            fname = line.split(':', 1)[0]
+            all_files.discard(fname)
 
 all_files -= {'gen/nerd-fonts-glyphs.txt', 'gen/rowcolumn-diacritics.txt'}
 cp = subprocess.run(['cloc', '--list-file', '-'], input='\n'.join(all_files).encode())

diff --git a/kitty/base64.h b/kitty/base64.h
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include "../base64/include/libbase64.h"
+#include "../3rdparty/base64/include/libbase64.h"
 
 static inline size_t required_buffer_size_for_base64_decode(size_t src_sz) { return (src_sz / 4 * 3 + 2); }
 static inline size_t required_buffer_size_for_base64_encode(size_t src_sz) { return ((src_sz + 2) / 3 * 4); }

diff --git a/setup.py b/setup.py
@@ -640,8 +640,8 @@ def get_source_specific_defines(env: Env, src: str) -> Tuple[str, List[str], Opt
         if not env.vcs_rev:
             env.vcs_rev = get_vcs_rev()
         return src, [], [f'KITTY_VCS_REV="{env.vcs_rev}"', f'WRAPPED_KITTENS="{wrapped_kittens()}"']
-    if src.startswith('base64/'):
-        return src, ['base64',], base64_defines()
+    if src.startswith('3rdparty/base64/'):
+        return src, ['3rdparty/base64',], base64_defines()
     try:
         return src, [], env.library_paths[src]
     except KeyError:
@@ -793,10 +793,10 @@ def find_c_files() -> Tuple[List[str], List[str]]:
     ans.append('kitty/vt-parser-dump.c')
 
     # base64
-    ans.extend(glob.glob('base64/lib/arch/*/codec.c'))
-    ans.append('base64/lib/tables/tables.c')
-    ans.append('base64/lib/codec_choose.c')
-    ans.append('base64/lib/lib.c')
+    ans.extend(glob.glob('3rdparty/base64/lib/arch/*/codec.c'))
+    ans.append('3rdparty/base64/lib/tables/tables.c')
+    ans.append('3rdparty/base64/lib/codec_choose.c')
+    ans.append('3rdparty/base64/lib/lib.c')
     return ans, headers