Remove YQL_PACKAGED (#11535)

rvu1024 · web-flow · commit 3f45718ec7e3 · 2024-11-12T19:03:35.000+03:00
diff --git a/ydb/library/yql/tools/mrjob/ya.make b/ydb/library/yql/tools/mrjob/ya.make
@@ -1,47 +1,35 @@
-IF (YQL_PACKAGED)
-    PACKAGE()
+PROGRAM(mrjob)
 
-    FROM_SANDBOX(
-        FILE {FILE_RESOURCE_ID} OUT_NOAUTO
-            mrjob
-            EXECUTABLE
-    )
+ALLOCATOR(J)
 
-    END()
-ELSE()
-    PROGRAM(mrjob)
-
-    ALLOCATOR(J)
-
-    SRCS(
-        mrjob.cpp
-    )
+SRCS(
+    mrjob.cpp
+)
 
-    IF (OS_LINUX)
-        # prevent external python extensions to lookup protobuf symbols (and maybe
-        # other common stuff) in main binary
-        EXPORTS_SCRIPT(${ARCADIA_ROOT}/ydb/library/yql/tools/exports.symlist)
-    ENDIF()
+IF (OS_LINUX)
+    # prevent external python extensions to lookup protobuf symbols (and maybe
+    # other common stuff) in main binary
+    EXPORTS_SCRIPT(${ARCADIA_ROOT}/ydb/library/yql/tools/exports.symlist)
+ENDIF()
 
-    PEERDIR(
-        yt/cpp/mapreduce/client
-        ydb/library/yql/public/udf/service/terminate_policy
-        ydb/library/yql/providers/common/gateway
-        ydb/library/yql/utils/backtrace
-        ydb/library/yql/parser/pg_wrapper
-        ydb/library/yql/sql/pg
-        ydb/library/yql/providers/yt/job
-        ydb/library/yql/providers/yt/codec/codegen
-        ydb/library/yql/providers/yt/comp_nodes/llvm14
-        ydb/library/yql/minikql/computation/llvm14
-        ydb/library/yql/minikql/invoke_builtins/llvm14
-        ydb/library/yql/minikql/comp_nodes/llvm14
-    )
+PEERDIR(
+    yt/cpp/mapreduce/client
+    ydb/library/yql/public/udf/service/terminate_policy
+    ydb/library/yql/providers/common/gateway
+    ydb/library/yql/utils/backtrace
+    ydb/library/yql/parser/pg_wrapper
+    ydb/library/yql/sql/pg
+    ydb/library/yql/providers/yt/job
+    ydb/library/yql/providers/yt/codec/codegen
+    ydb/library/yql/providers/yt/comp_nodes/llvm14
+    ydb/library/yql/minikql/computation/llvm14
+    ydb/library/yql/minikql/invoke_builtins/llvm14
+    ydb/library/yql/minikql/comp_nodes/llvm14
+)
 
-    YQL_LAST_ABI_VERSION()
+YQL_LAST_ABI_VERSION()
 
-    END()
-ENDIF()
+END()
 
 RECURSE_FOR_TESTS(
     test
diff --git a/ydb/library/yql/tools/yqlrun/ya.make b/ydb/library/yql/tools/yqlrun/ya.make
@@ -1,68 +1,56 @@
-IF (YQL_PACKAGED)
-    PACKAGE()
+PROGRAM(yqlrun)
 
-    FROM_SANDBOX(
-        FILE {FILE_RESOURCE_ID} OUT_NOAUTO
-            yqlrun
-            EXECUTABLE
-    )
+ALLOCATOR(J)
 
-    END()
-ELSE()
-    PROGRAM(yqlrun)
+SRCS(
+    yqlrun.cpp
+    gateway_spec.cpp
+)
 
-    ALLOCATOR(J)
-
-    SRCS(
-        yqlrun.cpp
-        gateway_spec.cpp
-    )
-
-    IF (OS_LINUX)
-        # prevent external python extensions to lookup protobuf symbols (and maybe
-        # other common stuff) in main binary
-        EXPORTS_SCRIPT(${ARCADIA_ROOT}/ydb/library/yql/tools/exports.symlist)
-    ENDIF()
-
-    PEERDIR(
-        contrib/libs/protobuf
-        library/cpp/getopt
-        library/cpp/yson
-        library/cpp/svnversion
-        ydb/library/yql/sql/pg
-        ydb/library/yql/core/facade
-        ydb/library/yql/core/file_storage
-        ydb/library/yql/core/file_storage/proto
-        ydb/library/yql/core/file_storage/http_download
-        ydb/library/yql/core/pg_ext
-        ydb/library/yql/core/services/mounts
-        ydb/library/yql/minikql/comp_nodes/llvm14
-        ydb/library/yql/protos
-        ydb/library/yql/public/udf/service/exception_policy
-        ydb/library/yql/utils/backtrace
-        ydb/library/yql/core
-        ydb/library/yql/sql/v1/format
-        ydb/library/yql/providers/common/codec
-        ydb/library/yql/providers/common/comp_nodes
-        ydb/library/yql/providers/common/proto
-        ydb/library/yql/providers/common/provider
-        ydb/library/yql/providers/common/udf_resolve
-        ydb/library/yql/providers/dq/provider
-        ydb/library/yql/providers/yt/gateway/file
-        ydb/library/yql/providers/yt/codec/codegen
-        ydb/library/yql/providers/yt/comp_nodes/llvm14
-        ydb/library/yql/core/url_preprocessing
-        ydb/library/yql/tools/yqlrun/http
-        ydb/library/yql/parser/pg_wrapper
-        ydb/library/yql/public/result_format
-    )
-
-    YQL_LAST_ABI_VERSION()
-
-    FILES(
-        ui.sh
-        uig.sh
-    )
-
-    END()
+IF (OS_LINUX)
+    # prevent external python extensions to lookup protobuf symbols (and maybe
+    # other common stuff) in main binary
+    EXPORTS_SCRIPT(${ARCADIA_ROOT}/ydb/library/yql/tools/exports.symlist)
 ENDIF()
+
+PEERDIR(
+    contrib/libs/protobuf
+    library/cpp/getopt
+    library/cpp/yson
+    library/cpp/svnversion
+    ydb/library/yql/sql/pg
+    ydb/library/yql/core/facade
+    ydb/library/yql/core/file_storage
+    ydb/library/yql/core/file_storage/proto
+    ydb/library/yql/core/file_storage/http_download
+    ydb/library/yql/core/pg_ext
+    ydb/library/yql/core/services/mounts
+    ydb/library/yql/minikql/comp_nodes/llvm14
+    ydb/library/yql/protos
+    ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/utils/backtrace
+    ydb/library/yql/core
+    ydb/library/yql/sql/v1/format
+    ydb/library/yql/providers/common/codec
+    ydb/library/yql/providers/common/comp_nodes
+    ydb/library/yql/providers/common/proto
+    ydb/library/yql/providers/common/provider
+    ydb/library/yql/providers/common/udf_resolve
+    ydb/library/yql/providers/dq/provider
+    ydb/library/yql/providers/yt/gateway/file
+    ydb/library/yql/providers/yt/codec/codegen
+    ydb/library/yql/providers/yt/comp_nodes/llvm14
+    ydb/library/yql/core/url_preprocessing
+    ydb/library/yql/tools/yqlrun/http
+    ydb/library/yql/parser/pg_wrapper
+    ydb/library/yql/public/result_format
+)
+
+YQL_LAST_ABI_VERSION()
+
+FILES(
+    ui.sh
+    uig.sh
+)
+
+END()
diff --git a/ydb/library/yql/udfs/common/datetime/ya.make b/ydb/library/yql/udfs/common/datetime/ya.make
@@ -1,33 +1,21 @@
-IF (YQL_PACKAGED)
-    PACKAGE()
+YQL_UDF_YDB(datetime_udf)
 
-    FROM_SANDBOX(
-        FILE {FILE_RESOURCE_ID} OUT_NOAUTO
-            libdatetime_udf.so
-    )
+YQL_ABI_VERSION(
+    2
+    28
+    0
+)
 
-    END()
-ELSE()
-    YQL_UDF_YDB(datetime_udf)
+SRCS(
+    datetime_udf.cpp
+)
 
-    YQL_ABI_VERSION(
-        2
-        28
-        0
-    )
-
-    SRCS(
-        datetime_udf.cpp
-    )
-
-    PEERDIR(
-        library/cpp/timezone_conversion
-        util/draft
-    )
-    END()
-
-ENDIF()
+PEERDIR(
+    library/cpp/timezone_conversion
+    util/draft
+)
+END()
 
 RECURSE_FOR_TESTS(
     test
-)
+)
