Skip to content

Commit 45ea8c1

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into mergelibs-240815-1025
2 parents 01cca87 + 22d7f65 commit 45ea8c1

File tree

180 files changed

+3170
-2132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+3170
-2132
lines changed

‎build/conf/settings.conf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,3 @@ _FOLDABLE_VARS=\
129129
ARCADIA_TEST_ROOT=../arcadia_tests_data/
130130
DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
131131

132-
__COMMA__=${comma:""}
133-
__BSDQ__=\"
134-
when ($STRUCT_CMD == "yes") {
135-
__BSDQ__=\\\"
136-
}

‎build/scripts/configure_file.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ def usage():
5353
usage()
5454
varDict = {}
5555
for x in sys.argv[3:]:
56-
key, value = str(x).split('=', 1)
56+
try:
57+
key, value = str(x).split('=', 1)
58+
value = value.replace("#BACKSLASH#", "\\\\")
59+
value = value.replace("#DOUBLE_QUOTE#", '"')
60+
except Exception:
61+
continue
5762
varDict[key] = value
5863

5964
main(sys.argv[1], sys.argv[2], varDict)

‎build/ymake.core.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ FALSE=no
4747
MODULE_PREFIX=
4848
MODULE_SUFFIX=
4949

50+
__COMMA__=${comma:""}
51+
__BSDQ__=\"
52+
when ($STRUCT_CMD == "yes") {
53+
__BSDQ__=\\\"
54+
}
55+
5056
# do not keep it undefined, since we directly subsitute it in LLVM_COMPILE_CXX etc.
5157
WINDOWS=no
5258

‎contrib/python/Automat/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PY23_LIBRARY()
22

33
LICENSE(Service-Py23-Proxy)
44

5+
VERSION(Service-proxy-version)
6+
57
IF (PYTHON2)
68
PEERDIR(contrib/python/Automat/py2)
79
ELSE()

‎contrib/python/Flask-Cors/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PY23_LIBRARY()
22

33
LICENSE(Service-Py23-Proxy)
44

5+
VERSION(Service-proxy-version)
6+
57
IF (PYTHON2)
68
PEERDIR(contrib/python/Flask-Cors/py2)
79
ELSE()

‎contrib/python/Flask/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PY23_LIBRARY()
22

33
LICENSE(Service-Py23-Proxy)
44

5+
VERSION(Service-proxy-version)
6+
57
IF (PYTHON2)
68
PEERDIR(contrib/python/Flask/py2)
79
ELSE()

‎contrib/python/Jinja2/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PY23_LIBRARY()
22

33
LICENSE(Service-Py23-Proxy)
44

5+
VERSION(Service-proxy-version)
6+
57
IF (PYTHON2)
68
PEERDIR(contrib/python/Jinja2/py2)
79
ELSE()

‎contrib/python/MarkupSafe/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PY23_LIBRARY()
22

33
LICENSE(Service-Py23-Proxy)
44

5+
VERSION(Service-proxy-version)
6+
57
IF (PYTHON2)
68
PEERDIR(contrib/python/MarkupSafe/py2)
79
ELSE()

‎contrib/python/Pillow/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PY23_LIBRARY()
22

33
LICENSE(Service-Py23-Proxy)
44

5+
VERSION(Service-proxy-version)
6+
57
IF (PYTHON2)
68
PEERDIR(contrib/python/Pillow/py2)
79
ELSE()

‎contrib/python/PyHamcrest/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PY23_LIBRARY()
22

33
LICENSE(Service-Py23-Proxy)
44

5+
VERSION(Service-proxy-version)
6+
57
IF (PYTHON2)
68
PEERDIR(contrib/python/PyHamcrest/py2)
79
ELSE()

0 commit comments

Comments
 (0)