aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimdim11 <dimdim11@yandex-team.com>2024-12-24 23:49:38 +0300
committerdimdim11 <dimdim11@yandex-team.com>2024-12-25 00:07:50 +0300
commitaf70a920aee1d35a10401ed5a54eb814a372e230 (patch)
treef91154eb22feb8b1a9ed607de65ffc607db55f44
parenta227b54ce2fdd48f2fe9e0eb6a93e79055631284 (diff)
downloadydb-af70a920aee1d35a10401ed5a54eb814a372e230.tar.gz
Patches for exporting to Gradle
Patches for exporting to Gradle commit_hash:051371b11d92fc9461a2dc0cdb70a2e0624ab530
-rw-r--r--build/conf/opensource.conf6
-rw-r--r--build/conf/proto.conf5
2 files changed, 10 insertions, 1 deletions
diff --git a/build/conf/opensource.conf b/build/conf/opensource.conf
index b37af16b23..95253b4c63 100644
--- a/build/conf/opensource.conf
+++ b/build/conf/opensource.conf
@@ -34,6 +34,10 @@ when ($OPENSOURCE == "yes") {
when ($OPENSOURCE == "yes" && $EXPORT_GRADLE == "yes") {
RECURSIVE_ADD_PEERS_TESTS=yes
+ # The only reason to set it is to avoid any deps on contrib/python|contrib/libs/python when
+ # exporting PY_*_MODULE and force dependency to build/platform/python there.
+ USE_SYSTEM_PYTHON=3.10
+ USE_ARCADIA_PYTHON=no
EXPORT_SEM=yes
EXPORTED_BUILD_SYSTEM_SOURCE_ROOT=${"$"}{PROJECT_SOURCE_DIR}
EXPORTED_BUILD_SYSTEM_BUILD_ROOT=${"$"}{PROJECT_BINARY_DIR}
@@ -42,7 +46,7 @@ when ($OPENSOURCE == "yes" && $EXPORT_GRADLE == "yes") {
# Extra macros to control how cmake export works
when ($OPENSOURCE == "yes" && $EXPORT_CMAKE == "yes") {
- # Python version is not acttually used in exported cmake's rigth now.
+ # Python version is not actually used in exported cmake's rigth now.
# The only reason to set it is to avoid any deps on contrib/python|contrib/libs/python when
# exporting PY_*_MODULE and force dependency to build/platform/python there.
USE_SYSTEM_PYTHON=3.10
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 988206de22..5676cccbb2 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -848,6 +848,7 @@ multimodule PROTO_LIBRARY {
}
module TS_PROTO: _TS_PROTO {
+ .SEM=_SEM_IGNORED
# opt-in. We don't want to have TS_PROTO by default
# To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO TS_PREPARE_DEPS) in ya.make
.INCLUDE_TAG=no
@@ -857,6 +858,7 @@ multimodule PROTO_LIBRARY {
}
module TS_PREPARE_DEPS: _TS_PREPARE_DEPS {
+ .SEM=_SEM_IGNORED
.INCLUDE_TAG=no
SET_APPEND(PEERDIR_TAGS TS_PREPARE_DEPS)
}
@@ -931,6 +933,7 @@ multimodule PROTO_SCHEMA {
}
module TS_PROTO_FROM_SCHEMA: _TS_PROTO {
+ .SEM=_SEM_IGNORED
# opt-in. We don't want to have TS_PROTO by default
# To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO TS_PREPARE_DEPS) in ya.make
.INCLUDE_TAG=no
@@ -941,6 +944,7 @@ multimodule PROTO_SCHEMA {
}
module TS_PREPARE_DEPS_FROM_SCHEMA: _TS_PREPARE_DEPS {
+ .SEM=_SEM_IGNORED
.INCLUDE_TAG=no
DISABLE(START_TARGET)
SET_APPEND(PEERDIR_TAGS TS_PREPARE_DEPS TS_PREPARE_DEPS_FROM_SCHEMA)
@@ -953,6 +957,7 @@ multimodule PROTO_SCHEMA {
}
module PROTO_DESCRIPTIONS_: PROTO_DESCRIPTIONS {
+ .SEM=_SEM_IGNORED
.PEERDIRSELF=DESC_PROTO_FROM_SCHEMA
.FINAL_TARGET=yes
SET_APPEND(PEERDIR_TAGS DESC_PROTO_FROM_SCHEMA)