From 56dcbca238458f4c384fb69d24df134d4bc45a00 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 14 Nov 2023 10:12:03 +0530 Subject: [PATCH] Move base64simd into a 3rdparty folder --- .gitattributes | 1 + {base64 => 3rdparty/base64}/LICENSE | 0 {base64 => 3rdparty/base64}/README.md | 0 {base64 => 3rdparty/base64}/config.h | 0 {base64 => 3rdparty/base64}/include/libbase64.h | 0 {base64 => 3rdparty/base64}/lib/arch/avx/codec.c | 0 .../base64}/lib/arch/avx/enc_loop_asm.c | 0 {base64 => 3rdparty/base64}/lib/arch/avx2/codec.c | 0 .../base64}/lib/arch/avx2/dec_loop.c | 0 .../base64}/lib/arch/avx2/dec_reshuffle.c | 0 .../base64}/lib/arch/avx2/enc_loop.c | 0 .../base64}/lib/arch/avx2/enc_loop_asm.c | 0 .../base64}/lib/arch/avx2/enc_reshuffle.c | 0 .../base64}/lib/arch/avx2/enc_translate.c | 0 {base64 => 3rdparty/base64}/lib/arch/avx512/codec.c | 0 .../base64}/lib/arch/avx512/enc_loop.c | 0 .../lib/arch/avx512/enc_reshuffle_translate.c | 0 .../base64}/lib/arch/generic/32/dec_loop.c | 0 .../base64}/lib/arch/generic/32/enc_loop.c | 0 .../base64}/lib/arch/generic/64/enc_loop.c | 0 .../base64}/lib/arch/generic/codec.c | 0 .../base64}/lib/arch/generic/dec_head.c | 0 .../base64}/lib/arch/generic/dec_tail.c | 0 .../base64}/lib/arch/generic/enc_head.c | 0 .../base64}/lib/arch/generic/enc_tail.c | 0 {base64 => 3rdparty/base64}/lib/arch/neon32/codec.c | 0 .../base64}/lib/arch/neon32/dec_loop.c | 0 .../base64}/lib/arch/neon32/enc_loop.c | 0 .../base64}/lib/arch/neon32/enc_reshuffle.c | 0 .../base64}/lib/arch/neon32/enc_translate.c | 0 {base64 => 3rdparty/base64}/lib/arch/neon64/codec.c | 0 .../base64}/lib/arch/neon64/dec_loop.c | 0 .../base64}/lib/arch/neon64/enc_loop.c | 0 .../base64}/lib/arch/neon64/enc_loop_asm.c | 0 .../base64}/lib/arch/neon64/enc_reshuffle.c | 0 {base64 => 3rdparty/base64}/lib/arch/sse41/codec.c | 0 {base64 => 3rdparty/base64}/lib/arch/sse42/codec.c | 0 {base64 => 3rdparty/base64}/lib/arch/ssse3/codec.c | 0 .../base64}/lib/arch/ssse3/dec_loop.c | 0 .../base64}/lib/arch/ssse3/dec_reshuffle.c | 0 .../base64}/lib/arch/ssse3/enc_loop.c | 0 .../base64}/lib/arch/ssse3/enc_loop_asm.c | 0 .../base64}/lib/arch/ssse3/enc_reshuffle.c | 0 .../base64}/lib/arch/ssse3/enc_translate.c | 0 {base64 => 3rdparty/base64}/lib/codec_choose.c | 0 {base64 => 3rdparty/base64}/lib/codecs.h | 0 {base64 => 3rdparty/base64}/lib/env.h | 0 {base64 => 3rdparty/base64}/lib/exports.txt | 0 {base64 => 3rdparty/base64}/lib/lib.c | 0 {base64 => 3rdparty/base64}/lib/lib_openmp.c | 0 {base64 => 3rdparty/base64}/lib/tables/.gitignore | 0 {base64 => 3rdparty/base64}/lib/tables/Makefile | 0 .../base64}/lib/tables/table_dec_32bit.h | 0 .../base64}/lib/tables/table_enc_12bit.h | 0 .../base64}/lib/tables/table_enc_12bit.py | 0 .../base64}/lib/tables/table_generator.c | 0 {base64 => 3rdparty/base64}/lib/tables/tables.c | 0 {base64 => 3rdparty/base64}/lib/tables/tables.h | 0 count-lines-of-code | 13 +++++++------ kitty/base64.h | 2 +- setup.py | 12 ++++++------ 61 files changed, 15 insertions(+), 13 deletions(-) rename {base64 => 3rdparty/base64}/LICENSE (100%) rename {base64 => 3rdparty/base64}/README.md (100%) rename {base64 => 3rdparty/base64}/config.h (100%) rename {base64 => 3rdparty/base64}/include/libbase64.h (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx/enc_loop_asm.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx2/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx2/dec_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx2/dec_reshuffle.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx2/enc_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx2/enc_loop_asm.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx2/enc_reshuffle.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx2/enc_translate.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx512/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx512/enc_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/avx512/enc_reshuffle_translate.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/32/dec_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/32/enc_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/64/enc_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/dec_head.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/dec_tail.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/enc_head.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/generic/enc_tail.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon32/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon32/dec_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon32/enc_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon32/enc_reshuffle.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon32/enc_translate.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon64/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon64/dec_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon64/enc_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon64/enc_loop_asm.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/neon64/enc_reshuffle.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/sse41/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/sse42/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/ssse3/codec.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/ssse3/dec_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/ssse3/dec_reshuffle.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/ssse3/enc_loop.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/ssse3/enc_loop_asm.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/ssse3/enc_reshuffle.c (100%) rename {base64 => 3rdparty/base64}/lib/arch/ssse3/enc_translate.c (100%) rename {base64 => 3rdparty/base64}/lib/codec_choose.c (100%) rename {base64 => 3rdparty/base64}/lib/codecs.h (100%) rename {base64 => 3rdparty/base64}/lib/env.h (100%) rename {base64 => 3rdparty/base64}/lib/exports.txt (100%) rename {base64 => 3rdparty/base64}/lib/lib.c (100%) rename {base64 => 3rdparty/base64}/lib/lib_openmp.c (100%) rename {base64 => 3rdparty/base64}/lib/tables/.gitignore (100%) rename {base64 => 3rdparty/base64}/lib/tables/Makefile (100%) rename {base64 => 3rdparty/base64}/lib/tables/table_dec_32bit.h (100%) rename {base64 => 3rdparty/base64}/lib/tables/table_enc_12bit.h (100%) rename {base64 => 3rdparty/base64}/lib/tables/table_enc_12bit.py (100%) rename {base64 => 3rdparty/base64}/lib/tables/table_generator.c (100%) rename {base64 => 3rdparty/base64}/lib/tables/tables.c (100%) rename {base64 => 3rdparty/base64}/lib/tables/tables.h (100%) diff --git a/.gitattributes b/.gitattributes index 886324bbf..da21b2931 100644 --- 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 b/3rdparty/base64/LICENSE similarity index 100% rename from base64/LICENSE rename to 3rdparty/base64/LICENSE diff --git a/base64/README.md b/3rdparty/base64/README.md similarity index 100% rename from base64/README.md rename to 3rdparty/base64/README.md diff --git a/base64/config.h b/3rdparty/base64/config.h similarity index 100% rename from base64/config.h rename to 3rdparty/base64/config.h diff --git a/base64/include/libbase64.h b/3rdparty/base64/include/libbase64.h similarity index 100% rename from base64/include/libbase64.h rename to 3rdparty/base64/include/libbase64.h diff --git a/base64/lib/arch/avx/codec.c b/3rdparty/base64/lib/arch/avx/codec.c similarity index 100% rename from base64/lib/arch/avx/codec.c rename to 3rdparty/base64/lib/arch/avx/codec.c diff --git a/base64/lib/arch/avx/enc_loop_asm.c b/3rdparty/base64/lib/arch/avx/enc_loop_asm.c similarity index 100% rename from base64/lib/arch/avx/enc_loop_asm.c rename to 3rdparty/base64/lib/arch/avx/enc_loop_asm.c diff --git a/base64/lib/arch/avx2/codec.c b/3rdparty/base64/lib/arch/avx2/codec.c similarity index 100% rename from base64/lib/arch/avx2/codec.c rename to 3rdparty/base64/lib/arch/avx2/codec.c diff --git a/base64/lib/arch/avx2/dec_loop.c b/3rdparty/base64/lib/arch/avx2/dec_loop.c similarity index 100% rename from base64/lib/arch/avx2/dec_loop.c rename to 3rdparty/base64/lib/arch/avx2/dec_loop.c diff --git a/base64/lib/arch/avx2/dec_reshuffle.c b/3rdparty/base64/lib/arch/avx2/dec_reshuffle.c similarity index 100% rename from base64/lib/arch/avx2/dec_reshuffle.c rename to 3rdparty/base64/lib/arch/avx2/dec_reshuffle.c diff --git a/base64/lib/arch/avx2/enc_loop.c b/3rdparty/base64/lib/arch/avx2/enc_loop.c similarity index 100% rename from base64/lib/arch/avx2/enc_loop.c rename to 3rdparty/base64/lib/arch/avx2/enc_loop.c diff --git a/base64/lib/arch/avx2/enc_loop_asm.c b/3rdparty/base64/lib/arch/avx2/enc_loop_asm.c similarity index 100% rename from base64/lib/arch/avx2/enc_loop_asm.c rename to 3rdparty/base64/lib/arch/avx2/enc_loop_asm.c diff --git a/base64/lib/arch/avx2/enc_reshuffle.c b/3rdparty/base64/lib/arch/avx2/enc_reshuffle.c similarity index 100% rename from base64/lib/arch/avx2/enc_reshuffle.c rename to 3rdparty/base64/lib/arch/avx2/enc_reshuffle.c diff --git a/base64/lib/arch/avx2/enc_translate.c b/3rdparty/base64/lib/arch/avx2/enc_translate.c similarity index 100% rename from base64/lib/arch/avx2/enc_translate.c rename to 3rdparty/base64/lib/arch/avx2/enc_translate.c diff --git a/base64/lib/arch/avx512/codec.c b/3rdparty/base64/lib/arch/avx512/codec.c similarity index 100% rename from base64/lib/arch/avx512/codec.c rename to 3rdparty/base64/lib/arch/avx512/codec.c diff --git a/base64/lib/arch/avx512/enc_loop.c b/3rdparty/base64/lib/arch/avx512/enc_loop.c similarity index 100% rename from base64/lib/arch/avx512/enc_loop.c rename to 3rdparty/base64/lib/arch/avx512/enc_loop.c diff --git a/base64/lib/arch/avx512/enc_reshuffle_translate.c b/3rdparty/base64/lib/arch/avx512/enc_reshuffle_translate.c similarity index 100% rename from base64/lib/arch/avx512/enc_reshuffle_translate.c rename to 3rdparty/base64/lib/arch/avx512/enc_reshuffle_translate.c diff --git a/base64/lib/arch/generic/32/dec_loop.c b/3rdparty/base64/lib/arch/generic/32/dec_loop.c similarity index 100% rename from base64/lib/arch/generic/32/dec_loop.c rename to 3rdparty/base64/lib/arch/generic/32/dec_loop.c diff --git a/base64/lib/arch/generic/32/enc_loop.c b/3rdparty/base64/lib/arch/generic/32/enc_loop.c similarity index 100% rename from base64/lib/arch/generic/32/enc_loop.c rename to 3rdparty/base64/lib/arch/generic/32/enc_loop.c diff --git a/base64/lib/arch/generic/64/enc_loop.c b/3rdparty/base64/lib/arch/generic/64/enc_loop.c similarity index 100% rename from base64/lib/arch/generic/64/enc_loop.c rename to 3rdparty/base64/lib/arch/generic/64/enc_loop.c diff --git a/base64/lib/arch/generic/codec.c b/3rdparty/base64/lib/arch/generic/codec.c similarity index 100% rename from base64/lib/arch/generic/codec.c rename to 3rdparty/base64/lib/arch/generic/codec.c diff --git a/base64/lib/arch/generic/dec_head.c b/3rdparty/base64/lib/arch/generic/dec_head.c similarity index 100% rename from base64/lib/arch/generic/dec_head.c rename to 3rdparty/base64/lib/arch/generic/dec_head.c diff --git a/base64/lib/arch/generic/dec_tail.c b/3rdparty/base64/lib/arch/generic/dec_tail.c similarity index 100% rename from base64/lib/arch/generic/dec_tail.c rename to 3rdparty/base64/lib/arch/generic/dec_tail.c diff --git a/base64/lib/arch/generic/enc_head.c b/3rdparty/base64/lib/arch/generic/enc_head.c similarity index 100% rename from base64/lib/arch/generic/enc_head.c rename to 3rdparty/base64/lib/arch/generic/enc_head.c diff --git a/base64/lib/arch/generic/enc_tail.c b/3rdparty/base64/lib/arch/generic/enc_tail.c similarity index 100% rename from base64/lib/arch/generic/enc_tail.c rename to 3rdparty/base64/lib/arch/generic/enc_tail.c diff --git a/base64/lib/arch/neon32/codec.c b/3rdparty/base64/lib/arch/neon32/codec.c similarity index 100% rename from base64/lib/arch/neon32/codec.c rename to 3rdparty/base64/lib/arch/neon32/codec.c diff --git a/base64/lib/arch/neon32/dec_loop.c b/3rdparty/base64/lib/arch/neon32/dec_loop.c similarity index 100% rename from base64/lib/arch/neon32/dec_loop.c rename to 3rdparty/base64/lib/arch/neon32/dec_loop.c diff --git a/base64/lib/arch/neon32/enc_loop.c b/3rdparty/base64/lib/arch/neon32/enc_loop.c similarity index 100% rename from base64/lib/arch/neon32/enc_loop.c rename to 3rdparty/base64/lib/arch/neon32/enc_loop.c diff --git a/base64/lib/arch/neon32/enc_reshuffle.c b/3rdparty/base64/lib/arch/neon32/enc_reshuffle.c similarity index 100% rename from base64/lib/arch/neon32/enc_reshuffle.c rename to 3rdparty/base64/lib/arch/neon32/enc_reshuffle.c diff --git a/base64/lib/arch/neon32/enc_translate.c b/3rdparty/base64/lib/arch/neon32/enc_translate.c similarity index 100% rename from base64/lib/arch/neon32/enc_translate.c rename to 3rdparty/base64/lib/arch/neon32/enc_translate.c diff --git a/base64/lib/arch/neon64/codec.c b/3rdparty/base64/lib/arch/neon64/codec.c similarity index 100% rename from base64/lib/arch/neon64/codec.c rename to 3rdparty/base64/lib/arch/neon64/codec.c diff --git a/base64/lib/arch/neon64/dec_loop.c b/3rdparty/base64/lib/arch/neon64/dec_loop.c similarity index 100% rename from base64/lib/arch/neon64/dec_loop.c rename to 3rdparty/base64/lib/arch/neon64/dec_loop.c diff --git a/base64/lib/arch/neon64/enc_loop.c b/3rdparty/base64/lib/arch/neon64/enc_loop.c similarity index 100% rename from base64/lib/arch/neon64/enc_loop.c rename to 3rdparty/base64/lib/arch/neon64/enc_loop.c diff --git a/base64/lib/arch/neon64/enc_loop_asm.c b/3rdparty/base64/lib/arch/neon64/enc_loop_asm.c similarity index 100% rename from base64/lib/arch/neon64/enc_loop_asm.c rename to 3rdparty/base64/lib/arch/neon64/enc_loop_asm.c diff --git a/base64/lib/arch/neon64/enc_reshuffle.c b/3rdparty/base64/lib/arch/neon64/enc_reshuffle.c similarity index 100% rename from base64/lib/arch/neon64/enc_reshuffle.c rename to 3rdparty/base64/lib/arch/neon64/enc_reshuffle.c diff --git a/base64/lib/arch/sse41/codec.c b/3rdparty/base64/lib/arch/sse41/codec.c similarity index 100% rename from base64/lib/arch/sse41/codec.c rename to 3rdparty/base64/lib/arch/sse41/codec.c diff --git a/base64/lib/arch/sse42/codec.c b/3rdparty/base64/lib/arch/sse42/codec.c similarity index 100% rename from base64/lib/arch/sse42/codec.c rename to 3rdparty/base64/lib/arch/sse42/codec.c diff --git a/base64/lib/arch/ssse3/codec.c b/3rdparty/base64/lib/arch/ssse3/codec.c similarity index 100% rename from base64/lib/arch/ssse3/codec.c rename to 3rdparty/base64/lib/arch/ssse3/codec.c diff --git a/base64/lib/arch/ssse3/dec_loop.c b/3rdparty/base64/lib/arch/ssse3/dec_loop.c similarity index 100% rename from base64/lib/arch/ssse3/dec_loop.c rename to 3rdparty/base64/lib/arch/ssse3/dec_loop.c diff --git a/base64/lib/arch/ssse3/dec_reshuffle.c b/3rdparty/base64/lib/arch/ssse3/dec_reshuffle.c similarity index 100% rename from base64/lib/arch/ssse3/dec_reshuffle.c rename to 3rdparty/base64/lib/arch/ssse3/dec_reshuffle.c diff --git a/base64/lib/arch/ssse3/enc_loop.c b/3rdparty/base64/lib/arch/ssse3/enc_loop.c similarity index 100% rename from base64/lib/arch/ssse3/enc_loop.c rename to 3rdparty/base64/lib/arch/ssse3/enc_loop.c diff --git a/base64/lib/arch/ssse3/enc_loop_asm.c b/3rdparty/base64/lib/arch/ssse3/enc_loop_asm.c similarity index 100% rename from base64/lib/arch/ssse3/enc_loop_asm.c rename to 3rdparty/base64/lib/arch/ssse3/enc_loop_asm.c diff --git a/base64/lib/arch/ssse3/enc_reshuffle.c b/3rdparty/base64/lib/arch/ssse3/enc_reshuffle.c similarity index 100% rename from base64/lib/arch/ssse3/enc_reshuffle.c rename to 3rdparty/base64/lib/arch/ssse3/enc_reshuffle.c diff --git a/base64/lib/arch/ssse3/enc_translate.c b/3rdparty/base64/lib/arch/ssse3/enc_translate.c similarity index 100% rename from base64/lib/arch/ssse3/enc_translate.c rename to 3rdparty/base64/lib/arch/ssse3/enc_translate.c diff --git a/base64/lib/codec_choose.c b/3rdparty/base64/lib/codec_choose.c similarity index 100% rename from base64/lib/codec_choose.c rename to 3rdparty/base64/lib/codec_choose.c diff --git a/base64/lib/codecs.h b/3rdparty/base64/lib/codecs.h similarity index 100% rename from base64/lib/codecs.h rename to 3rdparty/base64/lib/codecs.h diff --git a/base64/lib/env.h b/3rdparty/base64/lib/env.h similarity index 100% rename from base64/lib/env.h rename to 3rdparty/base64/lib/env.h diff --git a/base64/lib/exports.txt b/3rdparty/base64/lib/exports.txt similarity index 100% rename from base64/lib/exports.txt rename to 3rdparty/base64/lib/exports.txt diff --git a/base64/lib/lib.c b/3rdparty/base64/lib/lib.c similarity index 100% rename from base64/lib/lib.c rename to 3rdparty/base64/lib/lib.c diff --git a/base64/lib/lib_openmp.c b/3rdparty/base64/lib/lib_openmp.c similarity index 100% rename from base64/lib/lib_openmp.c rename to 3rdparty/base64/lib/lib_openmp.c diff --git a/base64/lib/tables/.gitignore b/3rdparty/base64/lib/tables/.gitignore similarity index 100% rename from base64/lib/tables/.gitignore rename to 3rdparty/base64/lib/tables/.gitignore diff --git a/base64/lib/tables/Makefile b/3rdparty/base64/lib/tables/Makefile similarity index 100% rename from base64/lib/tables/Makefile rename to 3rdparty/base64/lib/tables/Makefile diff --git a/base64/lib/tables/table_dec_32bit.h b/3rdparty/base64/lib/tables/table_dec_32bit.h similarity index 100% rename from base64/lib/tables/table_dec_32bit.h rename to 3rdparty/base64/lib/tables/table_dec_32bit.h diff --git a/base64/lib/tables/table_enc_12bit.h b/3rdparty/base64/lib/tables/table_enc_12bit.h similarity index 100% rename from base64/lib/tables/table_enc_12bit.h rename to 3rdparty/base64/lib/tables/table_enc_12bit.h diff --git a/base64/lib/tables/table_enc_12bit.py b/3rdparty/base64/lib/tables/table_enc_12bit.py similarity index 100% rename from base64/lib/tables/table_enc_12bit.py rename to 3rdparty/base64/lib/tables/table_enc_12bit.py diff --git a/base64/lib/tables/table_generator.c b/3rdparty/base64/lib/tables/table_generator.c similarity index 100% rename from base64/lib/tables/table_generator.c rename to 3rdparty/base64/lib/tables/table_generator.c diff --git a/base64/lib/tables/tables.c b/3rdparty/base64/lib/tables/tables.c similarity index 100% rename from base64/lib/tables/tables.c rename to 3rdparty/base64/lib/tables/tables.c diff --git a/base64/lib/tables/tables.h b/3rdparty/base64/lib/tables/tables.h similarity index 100% rename from base64/lib/tables/tables.h rename to 3rdparty/base64/lib/tables/tables.h diff --git a/count-lines-of-code b/count-lines-of-code index 45b9d163c..9fdedafca 100755 --- 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 index 951895a56..626a0b1b7 100644 --- a/kitty/base64.h +++ b/kitty/base64.h @@ -7,7 +7,7 @@ #include #include #include -#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 index d020c2b2f..43154ee7f 100755 --- a/setup.py +++ b/setup.py @@ -651,8 +651,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: @@ -804,10 +804,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