diff options
author | getsiu <getsiu@yandex-team.ru> | 2022-02-10 16:47:17 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:17 +0300 |
commit | 5c1eb9f48fd0ac41fd72519a8284ded6f0358f6f (patch) | |
tree | 9814fbd1c3effac9b8377c5d604b367b14e2db55 | |
parent | b7af6816e7f07e6271ae48e4ec76dabf1cfdbd11 (diff) | |
download | ydb-5c1eb9f48fd0ac41fd72519a8284ded6f0358f6f.tar.gz |
Restoring authorship annotation for <getsiu@yandex-team.ru>. Commit 2 of 2.
-rw-r--r-- | build/plugins/lj_archive.py | 64 | ||||
-rw-r--r-- | build/sanitize-blacklist.txt | 2 | ||||
-rw-r--r-- | build/ymake.core.conf | 14 | ||||
-rw-r--r-- | contrib/libs/ya.make | 2 | ||||
-rw-r--r-- | library/cpp/yson_pull/consumer.h | 2 | ||||
-rw-r--r-- | library/cpp/yson_pull/detail/cescape_encode.h | 2 | ||||
-rw-r--r-- | library/cpp/yson_pull/detail/number.h | 2 | ||||
-rw-r--r-- | library/cpp/yson_pull/detail/reader.h | 2 | ||||
-rw-r--r-- | library/cpp/yson_pull/detail/symbols.h | 4 | ||||
-rw-r--r-- | library/cpp/yson_pull/position_info.h | 2 | ||||
-rw-r--r-- | tools/archiver/main.cpp | 22 |
11 files changed, 59 insertions, 59 deletions
diff --git a/build/plugins/lj_archive.py b/build/plugins/lj_archive.py index 10d76f9c4d..1d80bb98f3 100644 --- a/build/plugins/lj_archive.py +++ b/build/plugins/lj_archive.py @@ -1,44 +1,44 @@ -def onlj_archive(unit, *args): +def onlj_archive(unit, *args): """ @usage: LJ_ARCHIVE(NAME Name LuaFiles...) Precompile .lua files using LuaJIT and archive both sources and results using sources names as keys """ - def iter_luas(l): - for a in l: - if a.endswith('.lua'): - yield a - - def iter_objs(l): - for a in l: - s = a[:-3] + 'raw' + def iter_luas(l): + for a in l: + if a.endswith('.lua'): + yield a + + def iter_objs(l): + for a in l: + s = a[:-3] + 'raw' unit.on_luajit_objdump(['OUT', s, a]) - yield s - - luas = list(iter_luas(args)) - objs = list(iter_objs(luas)) - + yield s + + luas = list(iter_luas(args)) + objs = list(iter_objs(luas)) + unit.onarchive_by_keys(['DONTCOMPRESS', 'NAME', 'LuaScripts.inc', 'KEYS', ':'.join(luas)] + objs) unit.onarchive_by_keys(['DONTCOMPRESS', 'NAME', 'LuaSources.inc', 'KEYS', ':'.join(luas)] + luas) - -def onlj_21_archive(unit, *args): + +def onlj_21_archive(unit, *args): """ @usage: LJ_21_ARCHIVE(NAME Name LuaFiles...) # deprecated Precompile .lua files using LuaJIT 2.1 and archive both sources and results using sources names as keys """ - def iter_luas(l): - for a in l: - if a.endswith('.lua'): - yield a - - def iter_objs(l): - for a in l: - s = a[:-3] + 'raw' + def iter_luas(l): + for a in l: + if a.endswith('.lua'): + yield a + + def iter_objs(l): + for a in l: + s = a[:-3] + 'raw' unit.on_luajit_21_objdump(['OUT', s, a]) - yield s - - luas = list(iter_luas(args)) - objs = list(iter_objs(luas)) - - unit.onarchive_by_keys(['DONTCOMPRESS', 'NAME', 'LuaScripts.inc', 'KEYS', ':'.join(luas)] + objs) - unit.onarchive_by_keys(['DONTCOMPRESS', 'NAME', 'LuaSources.inc', 'KEYS', ':'.join(luas)] + luas) - + yield s + + luas = list(iter_luas(args)) + objs = list(iter_objs(luas)) + + unit.onarchive_by_keys(['DONTCOMPRESS', 'NAME', 'LuaScripts.inc', 'KEYS', ':'.join(luas)] + objs) + unit.onarchive_by_keys(['DONTCOMPRESS', 'NAME', 'LuaSources.inc', 'KEYS', ':'.join(luas)] + luas) + diff --git a/build/sanitize-blacklist.txt b/build/sanitize-blacklist.txt index d8527c7396..c1fb5e539f 100644 --- a/build/sanitize-blacklist.txt +++ b/build/sanitize-blacklist.txt @@ -1,4 +1,4 @@ src:*contrib/tools/python/src* src:*contrib/tools/python3/src* -src:*contrib/libs/luajit* +src:*contrib/libs/luajit* type:std::__*::locale::id=init diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 6447e4a1d4..081833998b 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -6423,8 +6423,8 @@ macro PIRE_INLINE(FILES...) { ### Example: https://wiki.yandex-team.ru/yatool/howtowriteyamakefiles/#a1ispolzujjtekomanduarchive macro ARCHIVE(NAME="", DONTCOMPRESS?"-p":"", REQUIREMENTS[], Files...) { .CMD=$ARCH_TOOL -q -x $DONTCOMPRESS ${input;join=\: :Files}: -o ${output;chksum;addincl;noauto:NAME} ${requirements;hide:REQUIREMENTS} ${kv;hide:"p AR"} ${kv;hide:"pc light-red"} -} - +} + ### @usage: ARCHIVE_BY_KEYS(archive_name key [DONT_COMPRESS] files...) ### ### Add arbitrary data to a module be accessible by specified key. @@ -6776,14 +6776,14 @@ macro NO_CYTHON_COVERAGE() { LUAJIT_PATH=${ARCADIA_ROOT}/contrib/libs/luajit macro _LUAJIT_OBJDUMP(Src, OUT="") { .CMD=${cwd:LUAJIT_PATH} ${tool:"contrib/libs/luajit/compiler"} -b -g ${input:Src} ${output;noauto:OUT} ${kv;hide:"p LJ"} ${kv;hide:"pc light-cyan"} -} - +} + # tag:lua-specific LUAJIT_21_PATH=${ARCADIA_ROOT}/contrib/libs/luajit_21 macro _LUAJIT_21_OBJDUMP(Src, OUT="") { - .CMD=${cwd:LUAJIT_21_PATH} ${tool:"contrib/libs/luajit_21/compiler"} -b -g ${input:Src} ${output;noauto:OUT} ${kv;hide:"p LJ"} ${kv;hide:"pc light-cyan"} -} - + .CMD=${cwd:LUAJIT_21_PATH} ${tool:"contrib/libs/luajit_21/compiler"} -b -g ${input:Src} ${output;noauto:OUT} ${kv;hide:"p LJ"} ${kv;hide:"pc light-cyan"} +} + macro _MX_BIN_TO_INFO(Src) { .CMD=${tool:"tools/mx_bin2info"} ${input:Src} ${output;nopath;noext;noauto:Src.info} ${kv;hide:"p MX"} ${kv;hide:"pc yellow"} } diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make index 50ced517bc..9c4640fdcf 100644 --- a/contrib/libs/ya.make +++ b/contrib/libs/ya.make @@ -394,7 +394,7 @@ IF (OS_LINUX) ibdrv/ut proc luajit - luajit_21 + luajit_21 libaio libcap libmnl diff --git a/library/cpp/yson_pull/consumer.h b/library/cpp/yson_pull/consumer.h index c06f5a4077..f3b1398d4c 100644 --- a/library/cpp/yson_pull/consumer.h +++ b/library/cpp/yson_pull/consumer.h @@ -3,7 +3,7 @@ #include "event.h" #include <util/generic/strbuf.h> -#include <util/system/types.h> +#include <util/system/types.h> namespace NYsonPull { class IConsumer { diff --git a/library/cpp/yson_pull/detail/cescape_encode.h b/library/cpp/yson_pull/detail/cescape_encode.h index be2d70c0d7..bf5765f1d9 100644 --- a/library/cpp/yson_pull/detail/cescape_encode.h +++ b/library/cpp/yson_pull/detail/cescape_encode.h @@ -1,6 +1,6 @@ #pragma once -#include <util/system/types.h> +#include <util/system/types.h> // Whether to ensure strict ASCII compatibility // Turns UTF-8 strings into unreadable garbage for no known reason diff --git a/library/cpp/yson_pull/detail/number.h b/library/cpp/yson_pull/detail/number.h index 425c0487f9..5595f55e05 100644 --- a/library/cpp/yson_pull/detail/number.h +++ b/library/cpp/yson_pull/detail/number.h @@ -1,6 +1,6 @@ #pragma once -#include <util/system/types.h> +#include <util/system/types.h> namespace NYsonPull { namespace NDetail { diff --git a/library/cpp/yson_pull/detail/reader.h b/library/cpp/yson_pull/detail/reader.h index fcafc206b7..0e02396358 100644 --- a/library/cpp/yson_pull/detail/reader.h +++ b/library/cpp/yson_pull/detail/reader.h @@ -75,7 +75,7 @@ namespace NYsonPull { none = 3 + (5 << 2), // = 10111b }; -#define CHAR_SUBCLASS(x) (static_cast<ui8>(x) >> 2) +#define CHAR_SUBCLASS(x) (static_cast<ui8>(x) >> 2) inline char_class get_char_class(ui8 ch) { #define NN char_class::none diff --git a/library/cpp/yson_pull/detail/symbols.h b/library/cpp/yson_pull/detail/symbols.h index 4228281788..fe94bb9c41 100644 --- a/library/cpp/yson_pull/detail/symbols.h +++ b/library/cpp/yson_pull/detail/symbols.h @@ -1,12 +1,12 @@ #pragma once #include <util/generic/strbuf.h> -#include <util/system/types.h> +#include <util/system/types.h> namespace NYsonPull { namespace NDetail { namespace NSymbol { -#define SYM(name, value) constexpr ui8 name = value +#define SYM(name, value) constexpr ui8 name = value //! Indicates the beginning of a list. SYM(begin_list, '['); diff --git a/library/cpp/yson_pull/position_info.h b/library/cpp/yson_pull/position_info.h index d395c98a18..a65c4663a9 100644 --- a/library/cpp/yson_pull/position_info.h +++ b/library/cpp/yson_pull/position_info.h @@ -1,7 +1,7 @@ #pragma once #include <util/generic/maybe.h> -#include <util/system/types.h> +#include <util/system/types.h> namespace NYsonPull { struct TPositionInfo { diff --git a/tools/archiver/main.cpp b/tools/archiver/main.cpp index ab47c0b83a..6cda54c1ea 100644 --- a/tools/archiver/main.cpp +++ b/tools/archiver/main.cpp @@ -590,10 +590,10 @@ int main(int argc, char** argv) { .StoreResult(&cppBase); TString forceKeys; - opts.AddLongOption('k', "keys", "Set explicit list of keys for elements") - .RequiredArgument("<keys>") - .StoreResult(&forceKeys); - + opts.AddLongOption('k', "keys", "Set explicit list of keys for elements") + .RequiredArgument("<keys>") + .StoreResult(&forceKeys); + opts.SetFreeArgDefaultTitle("<file>"); opts.SetFreeArgsMin(1); NLastGetopt::TOptsParseResult optsRes(&opts, argc, argv); @@ -603,18 +603,18 @@ int main(int argc, char** argv) { TVector<TRec> recs; const auto& files = optsRes.GetFreeArgs(); - + TVector<TStringBuf> keys; if (forceKeys.size()) StringSplitter(forceKeys).Split(':').SkipEmpty().Collect(&keys); - + if (keys.size() && keys.size() != files.size()) { Cerr << "Invalid number of keys=" << keys.size() << " (!= number of files=" << files.size() << ")" << Endl; - return 1; - } - + return 1; + } + for (size_t i = 0; i < files.size(); ++i) { - const auto& path = files[i]; + const auto& path = files[i]; size_t off = 0; #ifdef _win_ if (path[0] > 0 && isalpha(path[0]) && path[1] == ':') @@ -626,7 +626,7 @@ int main(int argc, char** argv) { if (pos != TString::npos) cur.Prefix = path.substr(pos + 1); if (keys.size()) - cur.Key = keys[i]; + cur.Key = keys[i]; cur.Recursive = recursive; cur.Fix(); recs.push_back(cur); |