YQL_UDF -> YQL_UDF_MODULE, YQL_UDF_MULTIMODULE -> YQL_UDF.
@@ -1462,12 +1462,12 @@ otherwise {
YQL_UDF_LINK_CMD=$LINK_DYN_LIB && ${tool:"yql/tools/udf_probe"} $TARGET ${kv;hide:"p UD"}
}
-### @usage: YQL_UDF(name)
+### @usage: YQL_UDF_MODULE(name)
### Definition of the project YQL with C++ UDF (User Defined Function YQL)
### https://wiki.yandex-team.ru/yql/udf/cpp/
###
### Module declaration must be finished with the macro END().
-module YQL_UDF: UDF_BASE {
+module YQL_UDF_MODULE: UDF_BASE {
.CMD=YQL_UDF_LINK_CMD
@@ -1527,12 +1527,12 @@ macro ALL_SRCS(GLOBAL?"GLOBAL":"", Files...) {
module _DLL_COMPATIBLE_LIBRARY: LIBRARY {
}
-### @usage: YQL_UDF_MULTIMODULE(name)
-### YQL_UDF in case of a shared build target or static library otherwise.
+### @usage: YQL_UDF(name)
+### YQL_UDF_MODULE in case of a shared build target or static library otherwise.
###
### Module declaration must be finished with the macro END().
-multimodule YQL_UDF_MULTIMODULE {
- module YQL_UDF_SHARED: YQL_UDF {
+multimodule YQL_UDF {
+ module YQL_UDF_SHARED: YQL_UDF_MODULE {
}
module YQL_UDF_STATIC: _DLL_COMPATIBLE_LIBRARY {
.ALIASES=SRCS=GLOBAL_SRCS
@@ -1548,7 +1548,7 @@ macro YQL_ABI_VERSION(Major, Minor, Patch) {
SET_APPEND(USER_CXXFLAGS $YQL_ABI_FLAGS)
}
-module YQL_PYTHON_UDF: YQL_UDF {
+module YQL_PYTHON_UDF: YQL_UDF_MODULE {
.IGNORED=PYTHON_ADDINCL USE_PYTHON
.RESTRICTED=PYTHON3_ADDINCL USE_PYTHON3
_ARCADIA_PYTHON_ADDINCL()
@@ -1565,7 +1565,7 @@ module YQL_PYTHON_UDF: YQL_UDF {
SET(EXPORTS_FILE $YQL_PYTHON_UDF_EXPORT)
}
-module YQL_PYTHON3_UDF: YQL_UDF {
+module YQL_PYTHON3_UDF: YQL_UDF_MODULE {
.IGNORED=PYTHON_ADDINCL PYTHON3_ADDINCL USE_PYTHON USE_PYTHON3
_ARCADIA_PYTHON3_ADDINCL()
PEERDIR(build/platform/python/ldflags)
@@ -2816,7 +2816,7 @@ macro PY3_COMPILE_BYTECODE(SrcX, Src) {
### 1. works faster and it is better to use for large files.
### 2. Different syntax (see examples in codesearch or users/pg/tests/archive_test)
macro ARCHIVE_ASM(NAME="", DONTCOMPRESS?"-p":"", Files...) {
- .CMD=$ARCH_TOOL -q $DONTCOMPRESS ${input;join=\: :Files}: -o ${output;chksum;suf=.rodata:NAME} ${kv;hide:"p AR"} ${kv;hide:"pc light-cyan"}
+ .CMD=$ARCH_TOOL -q $DONTCOMPRESS ${input;join=\: :Files}: -o ${output;chksum;suf=$OBJ_SUF.rodata:NAME} ${kv;hide:"p AR"} ${kv;hide:"pc light-cyan"}
}
### yweb specific
