aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorgetsiu <getsiu@yandex-team.ru>2022-02-10 16:47:17 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:47:17 +0300
commitb7af6816e7f07e6271ae48e4ec76dabf1cfdbd11 (patch)
tree3f5d760d66bfcebfd0cb54e4fb79dbcbb5e7205f /build
parentc753751b693cf7c481c0292912e2b7536fa6d36a (diff)
downloadydb-b7af6816e7f07e6271ae48e4ec76dabf1cfdbd11.tar.gz
Restoring authorship annotation for <getsiu@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build')
-rw-r--r--build/plugins/lj_archive.py64
-rw-r--r--build/sanitize-blacklist.txt2
-rw-r--r--build/ymake.core.conf14
3 files changed, 40 insertions, 40 deletions
diff --git a/build/plugins/lj_archive.py b/build/plugins/lj_archive.py
index 1d80bb98f3..10d76f9c4d 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 c1fb5e539f..d8527c7396 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 081833998b..6447e4a1d4 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"}
}