Skip to content

Commit

Permalink
Merge pull request ydb-platform#5113 from ydb-platform/mergelibs-2406…
Browse files Browse the repository at this point in the history 
…03-0842

Library import 240603-0842
  • Loading branch information
@alexv-smirnov
alexv-smirnov authored Jun 6, 2024
2 parents 4ffffe9 + dfe7b68 commit 5685e21
Show file tree
Hide file tree
Showing 5,808 changed files with 1,615,525 additions and 216,534 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 9 additions & 9 deletions build/conf/bison_lex.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
LEX_FLAGS=
BISON_FLAGS=-v

_BISON_DATA_DIR=contrib/tools/bison/bison/data
_BISON_DATA_DIR=contrib/tools/bison/data
_CPP_BISON_SKELS=\
${_BISON_DATA_DIR}/bison.m4 \
${_BISON_DATA_DIR}/c++-skel.m4 \
Expand Down Expand Up @@ -107,7 +107,7 @@ macro BISON_NO_HEADER() {
### Use `contrib/tools/flex` as flex tool. Default is `contrib/tools/flex-old`.
### @note: by default no header is emitted. Use `USE_MODERN_FLEX_WITH_HEADER` to add header emission.
macro USE_MODERN_FLEX() {
SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/bison/m4"})
SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/m4"})
SET(_FLEX_TOOL_DIR contrib/tools/flex)
}

Expand All @@ -118,7 +118,7 @@ macro USE_MODERN_FLEX() {
###
### @example: USE_MODERN_FLEX_WITH_HEADER(_lexer.h)
macro USE_MODERN_FLEX_WITH_HEADER(Suffix) {
SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/bison/m4"})
SET(_FLEX_TOOL \${tool:"contrib/tools/flex"} --m4=\${tool:"contrib/tools/m4"})
SET(_FLEX_TOOL_DIR contrib/tools/flex)
SET(_FLEX_HEADER --header-file=\${nopath;noext;output;main;addincl;norel;suf=$Suffix:SRC})
}
Expand All @@ -132,21 +132,21 @@ macro USE_OLD_FLEX() {
}

macro _SRC("y", SRC, SRCFLAGS...) {
.PEERDIR=contrib/tools/bison/bison/induced
.CMD=${tool:"contrib/tools/bison/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} $_BISON_HEADER -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
.SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"'
.PEERDIR=build/induced/by_bison
.CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
.SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' && target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
}

macro _SRC("ypp", SRC, SRCFLAGS...) {
.PEERDIR=contrib/tools/bison/bison/induced
.PEERDIR=build/induced/by_bison
.CMD=$_SRC(y $SRC $SRCFLAGS)
.SEM=$_SRC(y $SRC $SRCFLAGS)
}

macro _SRC("l", SRC, SRCFLAGS...) {
.CMD=$_FLEX_TOOL $LEX_FLAGS ${SRCFLAGS} $_FLEX_HEADER -o${output;suf=$_FLEX_GEN_EXT:SRC} ${output_include;hide:"util/system/compiler.h"} ${input:SRC} ${kv;hide:"p LX"} ${kv;hide:"pc yellow"}
.CMD=$_FLEX_TOOL $LEX_FLAGS ${SRCFLAGS} $_FLEX_HEADER ${hide:_FLEX_GEN_EXT} -o${output;suf=$_FLEX_GEN_EXT:SRC} ${output_include;hide:"util/system/compiler.h"} ${input:SRC} ${kv;hide:"p LX"} ${kv;hide:"pc yellow"}
.ADDINCL=$_FLEX_TOOL_DIR
.SEM=target_flex_lexers ${tool;hide:_FLEX_TOOL} ${output;hide;suf=${OBJ_SUF}.o:SRC} ${input:SRC} && set_global_flags LEX_FLAGS $LEX_FLAGS
.SEM=target_flex_lexers ${tool;hide:_FLEX_TOOL} ${output;hide;suf=${OBJ_SUF}.o:SRC} ${input:SRC} && target_macroses-ITEM && target_macroses-macro target_flex_lexers && target_macroses-args ${tool;hide:_FLEX_TOOL} ${output;hide;suf=${OBJ_SUF}.o:SRC} ${input:SRC} && set_global_flags LEX_FLAGS $LEX_FLAGS && platform_vars-LEX_FLAGS ${quo:LEX_FLAGS}
}

# tag:src-processing
Expand Down
23 changes: 17 additions & 6 deletions build/conf/compilers/gnu_compiler.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,25 @@ DEBUG_INFO_FLAGS=$_DEBUG_INFO_FLAGS
when ($NO_WSHADOW == "yes") {
C_WARNING_OPTS += -Wno-shadow
}
# Though -w is intended to switch off all the warnings,
# it does not switch at least -Wregister and -Wreserved-user-defined-literal under clang.
#
# Use -Wno-everything to force warning suppression.

when ($NO_COMPILER_WARNINGS == "yes") {
C_WARNING_OPTS = -Wno-everything
CXX_WARNING_OPTS = -Wno-everything
# Though -w is intended to switch off all the warnings,
# it does not switch at least -Wregister and -Wreserved-user-defined-literal under clang.
#
# Use -Wno-everything to force warning suppression.
when ($CLANG == "yes") {
C_WARNING_OPTS = -Wno-everything
CXX_WARNING_OPTS = -Wno-everything
}

# On gcc -Wno-everything is not supported, so we use -w
# see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
elsewhen ($GCC == "yes") {
C_WARNING_OPTS = -w
CXX_WARNING_OPTS = -w
}
}

when ($NO_OPTIMIZE == "yes") {
OPTIMIZE = -O0
}
Expand Down
2 changes: 1 addition & 1 deletion build/conf/compilers/msvc_compiler.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ _SRC_CPP_CMD_NEW_FORCED=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_C
_SRC_C_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER_OLD} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
_SRC_C_CMD_NEW=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
_SRC_M_CMD=$_EMPTY_CMD
_SRC_MASM_CMD=${cwd:ARCADIA_BUILD_ROOT} ${TOOLCHAIN_ENV} ${ML_WRAPPER} ${MASM_COMPILER_OLD} ${MASMFLAGS} ${SRCFLAGS} $_MASM_IO ${kv;hide:"p AS"} ${kv;hide:"pc yellow"}
_SRC_MASM_CMD=${cwd:ARCADIA_BUILD_ROOT} ${TOOLCHAIN_ENV} ${ML_WRAPPER} ${MASM_COMPILER_OLD} ${MASMFLAGS} ${SRCFLAGS} $_MASM_IO ${hide;kv:"p AS"} ${hide;kv:"pc yellow"}
2 changes: 1 addition & 1 deletion build/conf/fbs.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ _GO_FLATC_IMPORTS=\
# tag:fbs tag:cpp-specific
macro _CPP_FLATC_CMD(SRC, SRCFLAGS...) {
.CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/cpp_flatc_wrapper.py"} ${tool:FLATC} --no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} -o ${output;main;norel:SRC.h} ${output;hide;norel:SRC.cpp} ${input:SRC} ${output;hide;noext;norel:SRC.iter.fbs.h} ${output;noauto;hide;noext;norel:SRC.bfbs} ${kv;hide:"p FL"} ${kv;hide:"pc light-green"} ${hide:FBS_FAKEID}
.SEM=target_fbs_source PRIVATE ${input:SRC} ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} ${output;hide;norel:SRC.h} ${output;hide;norel:SRC.cpp} ${output;hide;noext;norel:SRC.iter.fbs.h} ${output;noauto;hide;noext;norel:SRC.bfbs} ${hide;tool:FLATC} && set_global_flags FBS_CPP_FLAGS --no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs ${input;hide:"build/scripts/cpp_flatc_wrapper.py"}
.SEM=target_fbs_source PRIVATE ${input:SRC} ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} ${output;hide;norel:SRC.h} ${output;hide;norel:SRC.cpp} ${output;hide;noext;norel:SRC.iter.fbs.h} ${output;noauto;hide;noext;norel:SRC.bfbs} ${hide;tool:FLATC} && target_macroses-ITEM && target_macroses-macro target_fbs_source && target_macroses-args PRIVATE ${input:SRC} ${FLATC_FLAGS_VALUE} ${pre=-I :_FLATC__INCLUDE} ${output;hide;norel:SRC.h} ${output;hide;norel:SRC.cpp} ${output;hide;noext;norel:SRC.iter.fbs.h} ${output;noauto;hide;noext;norel:SRC.bfbs} ${hide;tool:FLATC} && set_global_flags FBS_CPP_FLAGS --no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs && platform_vars-FBS_CPP_FLAGS "--no-warnings --cpp --keep-prefix --gen-mutable --schema -b --yandex-maps-iter --gen-object-api --filename-suffix .fbs" ${input;hide:"build/scripts/cpp_flatc_wrapper.py"}
.PEERDIR=contrib/libs/flatbuffers
}

Expand Down
2 changes: 1 addition & 1 deletion build/conf/java.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ JDK_VERSION=
when ($JDK_VERSION == "22") {
JDK_REAL_VERSION=22
}
when ($JDK_VERSION == "21") {
elsewhen ($JDK_VERSION == "21") {
JDK_REAL_VERSION=21
}
elsewhen ($JDK_VERSION == "20") {
Expand Down
Loading

0 comments on commit 5685e21

Please sign in to comment.