YT-21446: Remove OS part of python UDFs from arcadia

d587f95edf5636edfae6672d36f57c8a15f5f3e0

3 files changed, 9 insertions, 14 deletions

diff --git a/build/conf/project_specific/yql_udf.conf b/build/conf/project_specific/yql_udf.conf
index 3fe0e07567..e292905a7a 100644
--- a/build/conf/project_specific/yql_udf.conf
+++ b/build/conf/project_specific/yql_udf.conf
@@ -276,7 +276,7 @@ module YQL_PYTHON_UDF: YQL_UDF_MODULE {
     PEERDIR(build/platform/python/ldflags)
     PEERDIR(library/python/type_info)
 
-    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/udfs/common/python/python_udf/python_udfs_exports.exports)
+    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
 
     when ($WINDOWS == "yes") {
         YQL_PYTHON_UDF_EXPORT=
@@ -302,7 +302,7 @@ module YQL_PYTHON_UDF_PROGRAM: _YQL_UDF_PROGRAM_BASE {
     PEERDIR(build/platform/python/ldflags)
     PEERDIR(library/python/type_info)
 
-    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/udfs/common/python/python_udf/python_udfs_exports.exports)
+    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
 
     when ($WINDOWS == "yes") {
         YQL_PYTHON_UDF_EXPORT=
@@ -326,10 +326,7 @@ module YQL_PYTHON3_UDF: YQL_UDF_MODULE {
     PEERDIR(build/platform/python/ldflags)
     PEERDIR(library/python/type_info)
 
-    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_PYTHON_DIR}/python_udf/python_udfs_exports.exports)
-    when (!$YQL_PYTHON_DIR) {
-        YQL_PYTHON_UDF_EXPORT=${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports
-    }
+    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
 
     when ($WINDOWS == "yes") {
         YQL_PYTHON_UDF_EXPORT=
diff --git a/build/plugins/yql_python_udf.py b/build/plugins/yql_python_udf.py
index 18c2e9edce..d7e83b5b24 100644
--- a/build/plugins/yql_python_udf.py
+++ b/build/plugins/yql_python_udf.py
@@ -29,7 +29,7 @@ def onregister_yql_python_udf(unit, *args):
         yql_python_dir = '/'.join([yql_base_dir, 'udfs/common/python'])
 
     unit.onyql_abi_version(['2', '27', '0'])
-    unit.onpeerdir(['/'.join([yql_python_dir, '/python_udf'])])
+    unit.onpeerdir(['/'.join([yql_base_dir, '/udfs/common/python/python_udf'])])
     unit.onpeerdir(['/'.join([yql_base_dir, '/public/udf'])])
 
     if add_libra_modules:
@@ -41,13 +41,13 @@ def onregister_yql_python_udf(unit, *args):
         unit.onpeerdir(
             ['library/python/runtime', '/'.join([yql_python_dir, '/main'])]
             if not py3
-            else ['library/python/runtime_py3', '/'.join([yql_python_dir, '/main_py3'])]
+            else ['library/python/runtime_py3', '/'.join([yql_base_dir, '/udfs/common/python/main_py3'])]
         )
     else:
         flavor = 'System'
 
     output_includes = [
-        '/'.join([yql_python_dir, '/python_udf/python_udf.h']),
+        '/'.join([yql_base_dir, '/udfs/common/python/python_udf/python_udf.h']),
         '/'.join([yql_base_dir, '/public/udf/udf_registrator.h']),
     ]
     if add_libra_modules:
@@ -64,7 +64,6 @@ def onregister_yql_python_udf(unit, *args):
             path,
             libra_flag,
             yql_base_dir,
-            yql_python_dir,
             'OUT',
             path,
             'OUTPUT_INCLUDES',
diff --git a/build/scripts/gen_yql_python_udf.py b/build/scripts/gen_yql_python_udf.py
index 4f7d450d39..e578279350 100644
--- a/build/scripts/gen_yql_python_udf.py
+++ b/build/scripts/gen_yql_python_udf.py
@@ -1,7 +1,7 @@
 import sys
 
 TEMPLATE = """
-#include <@YQL_PYTHON_DIR@/python_udf/python_udf.h>
+#include <@YQL_BASE_DIR@/udfs/common/python/python_udf/python_udf.h>
 
 #include <@YQL_BASE_DIR@/public/udf/udf_registrator.h>
 
@@ -37,8 +37,8 @@ extern "C" UDF_API void SetBackTraceCallback(TBackTraceCallback callback) {
 
 
 def main():
-    assert len(sys.argv) == 8
-    flavor, module_name, package_name, path, libra_flag, yql_base_dir, yql_python_dir = sys.argv[1:]
+    assert len(sys.argv) == 7
+    flavor, module_name, package_name, path, libra_flag, yql_base_dir = sys.argv[1:]
     with open(path, 'w') as f:
         f.write(
             TEMPLATE.strip()
@@ -47,7 +47,6 @@ def main():
             .replace('@FLAVOR@', flavor)
             .replace('@WITH_LIBRA@', libra_flag)
             .replace('@YQL_BASE_DIR@', yql_base_dir)
-            .replace('@YQL_PYTHON_DIR@', yql_python_dir)
         )
         f.write('\n')