Skip to content

Library import 7 #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions build/conf/go.conf
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,11 @@ GO_LINK_EXE=
GO_LINK_EXE+=$GENERATE_MF
GO_LINK_EXE+=&& $GENERATE_VCS_C_INFO_NODEP
GO_LINK_EXE+=&& $GENERATE_VCS_GO_INFO_NODEP
GO_LINK_EXE+=&& $COPY_PROFILE_RUNTIME
GO_LINK_EXE+=&& $_GO_LINK_EXE_IMPL($_GO_SRCS_VALUE CGO_FILES $_CGO_SRCS_VALUE EXTRA_TEXT_INPUTS $_GO_EMBED_INPUTS)

GO_LINK_TEST=
GO_LINK_TEST+=$GENERATE_VCS_C_INFO_NODEP
GO_LINK_TEST+=&& $GENERATE_VCS_GO_INFO_NODEP
GO_LINK_TEST+=&& $COPY_PROFILE_RUNTIME
GO_LINK_TEST+=&& $_GO_LINK_TEST_IMPL($_GO_SRCS_VALUE CGO_FILES $_CGO_SRCS_VALUE EXTRA_TEXT_INPUTS $_GO_EMBED_INPUTS GO_TEST_FILES $_GO_TEST_SRCS_VALUE GO_XTEST_FILES $_GO_XTEST_SRCS_VALUE)

GO_LINK_DLL=
Expand Down Expand Up @@ -873,11 +871,6 @@ module GO_PROGRAM: _GO_BASE_UNIT {
_GO_BUILDMODE=++buildmode=pie
}

when ($NEED_PROFILE_RUNTIME == "yes") {
LDFLAGS+=-resource-dir=contrib/libs/clang-rt
PEERDIR+=contrib/libs/clang${CLANG_VER}-rt/lib/profile
}

when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") {
# FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218
MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
Expand Down
6 changes: 3 additions & 3 deletions build/external_resources/yexport/resources.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"by_platform": {
"darwin": {
"uri": "sbr:5562968267"
"uri": "sbr:5641379824"
},
"darwin-arm64": {
"uri": "sbr:5562965675"
"uri": "sbr:5641378801"
},
"linux": {
"uri": "sbr:5562947428"
"uri": "sbr:5641398951"
}
}
}
10 changes: 5 additions & 5 deletions build/external_resources/ymake/public.resources.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
"uri": "sbr:5569062376"
"uri": "sbr:5622651213"
},
"darwin-arm64": {
"uri": "sbr:5569072879"
"uri": "sbr:5622657921"
},
"linux": {
"uri": "sbr:5569070627"
"uri": "sbr:5622653964"
},
"linux-aarch64": {
"uri": "sbr:5569095361"
"uri": "sbr:5622652638"
},
"win32-clang-cl": {
"uri": "sbr:5569066861"
"uri": "sbr:5622653810"
}
}
}
10 changes: 5 additions & 5 deletions build/external_resources/ymake/resources.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
"uri": "sbr:5569055879"
"uri": "sbr:5622649543"
},
"darwin-arm64": {
"uri": "sbr:5569046692"
"uri": "sbr:5622648352"
},
"linux": {
"uri": "sbr:5569080477"
"uri": "sbr:5622649049"
},
"linux-aarch64": {
"uri": "sbr:5569058127"
"uri": "sbr:5622653320"
},
"win32-clang-cl": {
"uri": "sbr:5569069854"
"uri": "sbr:5622653040"
}
}
}
16 changes: 16 additions & 0 deletions build/mapping.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,34 +127,42 @@
"5498749381": "https://devtools-registry.s3.yandex.net/5498749381",
"5534092912": "https://devtools-registry.s3.yandex.net/5534092912",
"5562971772": "https://devtools-registry.s3.yandex.net/5562971772",
"5641388522": "https://devtools-registry.s3.yandex.net/5641388522",
"5486590469": "https://devtools-registry.s3.yandex.net/5486590469",
"5498750509": "https://devtools-registry.s3.yandex.net/5498750509",
"5534043120": "https://devtools-registry.s3.yandex.net/5534043120",
"5562958333": "https://devtools-registry.s3.yandex.net/5562958333",
"5641392899": "https://devtools-registry.s3.yandex.net/5641392899",
"5486590393": "https://devtools-registry.s3.yandex.net/5486590393",
"5498735180": "https://devtools-registry.s3.yandex.net/5498735180",
"5534059422": "https://devtools-registry.s3.yandex.net/5534059422",
"5562961825": "https://devtools-registry.s3.yandex.net/5562961825",
"5641386025": "https://devtools-registry.s3.yandex.net/5641386025",
"5476908047": "https://devtools-registry.s3.yandex.net/5476908047",
"5509380757": "https://devtools-registry.s3.yandex.net/5509380757",
"5550834592": "https://devtools-registry.s3.yandex.net/5550834592",
"5569062376": "https://devtools-registry.s3.yandex.net/5569062376",
"5622651213": "https://devtools-registry.s3.yandex.net/5622651213",
"5476891477": "https://devtools-registry.s3.yandex.net/5476891477",
"5509369518": "https://devtools-registry.s3.yandex.net/5509369518",
"5550838146": "https://devtools-registry.s3.yandex.net/5550838146",
"5569072879": "https://devtools-registry.s3.yandex.net/5569072879",
"5622657921": "https://devtools-registry.s3.yandex.net/5622657921",
"5476896849": "https://devtools-registry.s3.yandex.net/5476896849",
"5509364024": "https://devtools-registry.s3.yandex.net/5509364024",
"5550826871": "https://devtools-registry.s3.yandex.net/5550826871",
"5569070627": "https://devtools-registry.s3.yandex.net/5569070627",
"5622653964": "https://devtools-registry.s3.yandex.net/5622653964",
"5476895322": "https://devtools-registry.s3.yandex.net/5476895322",
"5509360013": "https://devtools-registry.s3.yandex.net/5509360013",
"5550843115": "https://devtools-registry.s3.yandex.net/5550843115",
"5569095361": "https://devtools-registry.s3.yandex.net/5569095361",
"5622652638": "https://devtools-registry.s3.yandex.net/5622652638",
"5476896707": "https://devtools-registry.s3.yandex.net/5476896707",
"5509388614": "https://devtools-registry.s3.yandex.net/5509388614",
"5550838970": "https://devtools-registry.s3.yandex.net/5550838970",
"5569066861": "https://devtools-registry.s3.yandex.net/5569066861",
"5622653810": "https://devtools-registry.s3.yandex.net/5622653810",
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
"5562224408": "https://devtools-registry.s3.yandex.net/5562224408"
},
Expand Down Expand Up @@ -285,34 +293,42 @@
"5498749381": "yexport for darwin",
"5534092912": "yexport for darwin",
"5562971772": "yexport for darwin",
"5641388522": "yexport for darwin",
"5486590469": "yexport for darwin-arm64",
"5498750509": "yexport for darwin-arm64",
"5534043120": "yexport for darwin-arm64",
"5562958333": "yexport for darwin-arm64",
"5641392899": "yexport for darwin-arm64",
"5486590393": "yexport for linux",
"5498735180": "yexport for linux",
"5534059422": "yexport for linux",
"5562961825": "yexport for linux",
"5641386025": "yexport for linux",
"5476908047": "ymake for darwin",
"5509380757": "ymake for darwin",
"5550834592": "ymake for darwin",
"5569062376": "ymake for darwin",
"5622651213": "ymake for darwin",
"5476891477": "ymake for darwin-arm64",
"5509369518": "ymake for darwin-arm64",
"5550838146": "ymake for darwin-arm64",
"5569072879": "ymake for darwin-arm64",
"5622657921": "ymake for darwin-arm64",
"5476896849": "ymake for linux",
"5509364024": "ymake for linux",
"5550826871": "ymake for linux",
"5569070627": "ymake for linux",
"5622653964": "ymake for linux",
"5476895322": "ymake for linux-aarch64",
"5509360013": "ymake for linux-aarch64",
"5550843115": "ymake for linux-aarch64",
"5569095361": "ymake for linux-aarch64",
"5622652638": "ymake for linux-aarch64",
"5476896707": "ymake.exe for win32-clang-cl",
"5509388614": "ymake.exe for win32-clang-cl",
"5550838970": "ymake.exe for win32-clang-cl",
"5569066861": "ymake.exe for win32-clang-cl",
"5622653810": "ymake.exe for win32-clang-cl",
"2980468199": "ytexec for linux",
"5562224408": "ytexec for linux"
},
Expand Down
1 change: 1 addition & 0 deletions build/plugins/lib/test_const/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"coverage_extractor",
"exectest",
"gtest",
"go_test",
# java tests might use shared libraries
"java",
"py2test",
Expand Down
2 changes: 1 addition & 1 deletion build/plugins/yql_python_udf.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def onregister_yql_python_udf(unit, *args):

path = name + '.yql_python_udf.cpp'
libra_flag = '1' if add_libra_modules else '0'
unit.onpython(
unit.onrun_python2(
[
'build/scripts/gen_yql_python_udf.py',
flavor,
Expand Down
10 changes: 7 additions & 3 deletions build/scripts/clang_static_analyzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import os
import re
import argparse
import yaml
import json

CLANG_SA_CONFIG='static_analyzer.yaml'
CLANG_SA_CONFIG='static_analyzer.json'

def parse_args():
parser = argparse.ArgumentParser()
Expand All @@ -31,7 +31,7 @@ def parse_config(config_file):
conf = None
try:
with open(config_file, 'r') as afile:
conf = yaml.safe_load(afile)
conf = json.load(afile)
except:
conf = None
return conf
Expand Down Expand Up @@ -61,6 +61,10 @@ def main():
config_file = find_config(args.config_file)
conf = parse_config(config_file)

# Ensure we can read config
if not conf:
raise ValueError(f"Cant parse config file, check its syntax: {config_file}")

# Ensure we have at least one check
if ('checks' not in conf) or (not conf['checks']):
raise ValueError("There are no checks in the config file")
Expand Down
Loading