Browse Source

Patches for exporting to Gradle

Patches for exporting to Gradle
commit_hash:051371b11d92fc9461a2dc0cdb70a2e0624ab530
dimdim11 2 months ago
parent
commit
af70a920ae
2 changed files with 10 additions and 1 deletions
  1. 5 1
      build/conf/opensource.conf
  2. 5 0
      build/conf/proto.conf

+ 5 - 1
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

+ 5 - 0
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)