summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorudovichenko-r <[email protected]>2024-11-24 20:00:30 +0300
committerudovichenko-r <[email protected]>2024-11-24 20:26:48 +0300
commitad876795edeca9b01b32aca212d53cb4f62ba41f (patch)
tree0dee93c8e1153560122908dae08e9d8621dad306
parent25080bb2018ed25b7e5e60166864dc65109b6490 (diff)
YQL-19206 Fix yql python build scripts
commit_hash:7886e5975a31d296ec58dd94d013e0f6716a2cae
-rw-r--r--build/plugins/yql_python_udf.py10
-rw-r--r--build/scripts/gen_yql_python_udf.py7
2 files changed, 7 insertions, 10 deletions
diff --git a/build/plugins/yql_python_udf.py b/build/plugins/yql_python_udf.py
index 945ec2dc3f0..80a44bda709 100644
--- a/build/plugins/yql_python_udf.py
+++ b/build/plugins/yql_python_udf.py
@@ -23,13 +23,12 @@ def onregister_yql_python_udf(unit, *args):
ymake.report_configure_error('Libra modules are not supported in opensource python UDFs')
add_libra_modules = False
- yql_base_dir = unit.get('YQL_BASE_DIR')
yql_python_dir = unit.get('YQL_PYTHON_DIR')
if not yql_python_dir:
- yql_python_dir = '/'.join([yql_base_dir, 'udfs/common/python'])
+ yql_python_dir = 'yql/essentials/udfs/common/python'
unit.onyql_abi_version(['2', '27', '0'])
- unit.onpeerdir(['/'.join([yql_base_dir, '/udfs/common/python/python_udf'])])
+ unit.onpeerdir(['yql/essentials/udfs/common/python/python_udf'])
unit.onpeerdir(['yql/essentials/public/udf'])
if add_libra_modules:
@@ -41,13 +40,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_base_dir, '/udfs/common/python/main_py3'])]
+ else ['library/python/runtime_py3', 'yql/essentials/udfs/common/python/main_py3']
)
else:
flavor = 'System'
output_includes = [
- '/'.join([yql_base_dir, '/udfs/common/python/python_udf/python_udf.h']),
+ 'yql/essentials/udfs/common/python/python_udf/python_udf.h',
'yql/essentials/public/udf/udf_registrator.h',
]
if add_libra_modules:
@@ -63,7 +62,6 @@ def onregister_yql_python_udf(unit, *args):
resource_name,
path,
libra_flag,
- yql_base_dir,
'OUT',
path,
'OUTPUT_INCLUDES',
diff --git a/build/scripts/gen_yql_python_udf.py b/build/scripts/gen_yql_python_udf.py
index eea7da6c805..ad0d6932408 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_BASE_DIR@/udfs/common/python/python_udf/python_udf.h>
+#include <yql/essentials/udfs/common/python/python_udf/python_udf.h>
#include <yql/essentials/public/udf/udf_registrator.h>
@@ -37,8 +37,8 @@ extern "C" UDF_API void SetBackTraceCallback(TBackTraceCallback callback) {
def main():
- assert len(sys.argv) == 7
- flavor, module_name, package_name, path, libra_flag, yql_base_dir = sys.argv[1:]
+ assert len(sys.argv) == 6
+ flavor, module_name, package_name, path, libra_flag = sys.argv[1:]
with open(path, 'w') as f:
f.write(
TEMPLATE.strip()
@@ -46,7 +46,6 @@ def main():
.replace('@PACKAGE_NAME@', package_name)
.replace('@FLAVOR@', flavor)
.replace('@WITH_LIBRA@', libra_flag)
- .replace('@YQL_BASE_DIR@', yql_base_dir)
)
f.write('\n')