aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-08 12:23:16 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-08 12:23:16 +0300
commitef32d236e2c477e41005becadfa89e80a124491c (patch)
treebfd91afc5cc9444237c68d1c0d71b6d0ae9182aa
parent2475432dcbb88486205a48c162a576361196f8be (diff)
downloadydb-ef32d236e2c477e41005becadfa89e80a124491c.tar.gz
intermediate changes
ref:fe861bc3674df2541917fa13025b2658af891e35
-rw-r--r--build/ya.conf.json16
-rw-r--r--build/ymake.core.conf4
-rw-r--r--contrib/libs/double-conversion/ya.make6
-rw-r--r--contrib/libs/protobuf/ya.make2
-rw-r--r--contrib/python/protobuf/py3/.yandex_meta/devtools.copyrights.report2
-rw-r--r--contrib/python/protobuf/py3/.yandex_meta/devtools.licenses.report2
6 files changed, 15 insertions, 17 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 92c4e647e3..01f9664b04 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -7137,7 +7137,7 @@
},
"horadric": {
"formula": {
- "sandbox_id": 1204623165,
+ "sandbox_id": 1208360447,
"match": "horadric"
},
"executable": {
@@ -7280,7 +7280,7 @@
},
"apphost": {
"formula": {
- "sandbox_id": 1205658794,
+ "sandbox_id": 1208360113,
"match": "app_host_launcher"
},
"executable": {
@@ -7908,7 +7908,7 @@
},
"bigb_request": {
"formula": {
- "sandbox_id": 1205658862,
+ "sandbox_id": 1208360052,
"match": "bb_requester"
},
"executable": {
@@ -7919,7 +7919,7 @@
},
"bigb_hitlog_analyser": {
"formula": {
- "sandbox_id": 1204623172,
+ "sandbox_id": 1208360802,
"match": "hitlog_analyser"
},
"executable": {
@@ -7952,7 +7952,7 @@
},
"bigb_yt_profiles_dumper": {
"formula": {
- "sandbox_id": 1205657009,
+ "sandbox_id": 1208359267,
"match": "yt_profiles_dumper"
},
"executable": {
@@ -7963,7 +7963,7 @@
},
"bigb_ab": {
"formula": {
- "sandbox_id": 1207217219,
+ "sandbox_id": 1208360238,
"match": "ab"
},
"executable": {
@@ -7987,7 +7987,7 @@
},
"caesar_yt_sync": {
"formula": {
- "sandbox_id": 1205657532,
+ "sandbox_id": 1208360234,
"match": "yt_sync"
},
"executable": {
@@ -8020,7 +8020,7 @@
},
"caesar_profile_size_analyzer": {
"formula": {
- "sandbox_id": 1205656696,
+ "sandbox_id": 1208360876,
"match": "profile_size_analyzer"
},
"executable": {
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 06d6696fa6..d898a03a80 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -2400,11 +2400,11 @@ module _LIBRARY: _BASE_UNIT {
}
CPP_LIBRARY_SEM=add_library ${MODDIR} $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} \
+ && library_fake_marker FAKE_MODULE ${FAKE_MODULE} \
&& consumer_link_library PUBLIC $CMAKE_LINK_TARGET \
&& target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \
&& target_include_directories PRIVATE $_C__INCLUDE_OWNED \
- && target_compile_definitions PRIVATE $USER_CFLAGS $USER_CXXFLAGS \
- && library_fake_marker FAKE_MODULE ${FAKE_MODULE}
+ && target_compile_definitions PRIVATE $USER_CFLAGS $USER_CXXFLAGS
CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:REALPRJNAME} $REALPRJNAME ${hide:GLOBAL_TARGET} ${hide:AUTO_INPUT} \
&& target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \
&& target_include_directories PRIVATE $_C__INCLUDE_OWNED \
diff --git a/contrib/libs/double-conversion/ya.make b/contrib/libs/double-conversion/ya.make
index a848575f33..52e59b0989 100644
--- a/contrib/libs/double-conversion/ya.make
+++ b/contrib/libs/double-conversion/ya.make
@@ -12,12 +12,6 @@ OWNER(
g:cpp-contrib
)
-OPENSOURCE_EXPORT_REPLACEMENT(
- CMAKE double-conversion
- CMAKE_TARGET double-conversion::double-conversion
- CONAN double-conversion/3.1.4
-)
-
NO_COMPILER_WARNINGS()
NO_UTIL()
diff --git a/contrib/libs/protobuf/ya.make b/contrib/libs/protobuf/ya.make
index 723ff27044..044e24badd 100644
--- a/contrib/libs/protobuf/ya.make
+++ b/contrib/libs/protobuf/ya.make
@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs fd439109430066a67799aaecc535bd0150ac0d27.
+# Generated by devtools/yamaker from nixpkgs 21.11.
LIBRARY()
diff --git a/contrib/python/protobuf/py3/.yandex_meta/devtools.copyrights.report b/contrib/python/protobuf/py3/.yandex_meta/devtools.copyrights.report
index 90d0362951..42ef206e89 100644
--- a/contrib/python/protobuf/py3/.yandex_meta/devtools.copyrights.report
+++ b/contrib/python/protobuf/py3/.yandex_meta/devtools.copyrights.report
@@ -4,6 +4,8 @@
# $ # =======================
# $ # comments (all commentaries should starts with some number of spaces and # symbol)
# $ IGNORE_FILES {file1.ext1} {file2.ext2} - (optional) ignore listed files when generating license macro and credits
+# $ RENAME {original license id} TO {new license id} # user comments - (optional) use {new license id} instead {original license id} in ya.make files
+# $ # user comments
# $
# ${action} {license id} {license text hash}
# $BELONGS ./ya/make/file/relative/path/1/ya.make ./ya/make/2/ya.make
diff --git a/contrib/python/protobuf/py3/.yandex_meta/devtools.licenses.report b/contrib/python/protobuf/py3/.yandex_meta/devtools.licenses.report
index 008ecfdee6..0b960d4f1f 100644
--- a/contrib/python/protobuf/py3/.yandex_meta/devtools.licenses.report
+++ b/contrib/python/protobuf/py3/.yandex_meta/devtools.licenses.report
@@ -4,6 +4,8 @@
# $ # =======================
# $ # comments (all commentaries should starts with some number of spaces and # symbol)
# $ IGNORE_FILES {file1.ext1} {file2.ext2} - (optional) ignore listed files when generating license macro and credits
+# $ RENAME {original license id} TO {new license id} # user comments - (optional) use {new license id} instead {original license id} in ya.make files
+# $ # user comments
# $
# ${action} {license id} {license text hash}
# $BELONGS ./ya/make/file/relative/path/1/ya.make ./ya/make/2/ya.make