diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2024-02-19 19:03:59 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2024-02-19 19:27:17 +0300 |
| commit | 9f3835bead79ece9b35a76af38ec5b339779ada8 (patch) | |
| tree | f8b04555b7f384c50545bce3c00919724f0b58e1 /build | |
| parent | 119e8024f38bae4f04fd372110f45ddb2c01d71f (diff) | |
| download | ydb-9f3835bead79ece9b35a76af38ec5b339779ada8.tar.gz | |
Restore external build system generator release 79
Add necessary conf changes to make it work properly.
4afdfa9e8265c04b099a43157a8d5b0e9ac82d01
Diffstat (limited to 'build')
| -rw-r--r-- | build/conf/opensource.conf | 4 | ||||
| -rw-r--r-- | build/external_resources/yexport/resources.json | 6 | ||||
| -rw-r--r-- | build/mapping.conf.json | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/build/conf/opensource.conf b/build/conf/opensource.conf index 7a52f06baa..8e8ba81db5 100644 --- a/build/conf/opensource.conf +++ b/build/conf/opensource.conf @@ -34,6 +34,8 @@ when ($OPENSOURCE == "yes") { when ($OPENSOURCE == "yes" && $EXPORT_GRADLE == "yes") { RECURSIVE_ADD_PEERS_TESTS=yes EXPORT_SEM=yes + EXPORTED_BUILD_SYSTEM_SOURCE_ROOT=${"$"}{PROJECT_SOURCE_DIR} + EXPORTED_BUILD_SYSTEM_BUILD_ROOT=${"$"}{PROJECT_BINARY_DIR} } # Extra macros to control how cmake export works @@ -48,6 +50,8 @@ when ($OPENSOURCE == "yes" && $EXPORT_CMAKE == "yes") { # USE_GLOBAL_CMD=yes does not work for Windows with ya make builds but works with exported CMake files: YMAKE-657. USE_GLOBAL_CMD=yes EXPORT_SEM=yes + EXPORTED_BUILD_SYSTEM_SOURCE_ROOT="${PROJECT_SOURCE_DIR}" + EXPORTED_BUILD_SYSTEM_BUILD_ROOT="${PROJECT_BINARY_DIR}" } CMAKE_PACKAGE= diff --git a/build/external_resources/yexport/resources.json b/build/external_resources/yexport/resources.json index 5ee06fa4ea..abc5cdb3ef 100644 --- a/build/external_resources/yexport/resources.json +++ b/build/external_resources/yexport/resources.json @@ -1,13 +1,13 @@ { "by_platform": { "darwin": { - "uri": "sbr:5811800130" + "uri": "sbr:5840617551" }, "darwin-arm64": { - "uri": "sbr:5811799864" + "uri": "sbr:5840616103" }, "linux": { - "uri": "sbr:5811799588" + "uri": "sbr:5840614473" } } } diff --git a/build/mapping.conf.json b/build/mapping.conf.json index 1fbbc11423..0546db7df1 100644 --- a/build/mapping.conf.json +++ b/build/mapping.conf.json @@ -155,8 +155,11 @@ "5829321497": "https://devtools-registry.s3.yandex.net/5829321497", "5829394327": "https://devtools-registry.s3.yandex.net/5829394327", "5811823978": "https://devtools-registry.s3.yandex.net/5811823978", + "5840611982": "https://devtools-registry.s3.yandex.net/5840611982", "5811823398": "https://devtools-registry.s3.yandex.net/5811823398", + "5840611310": "https://devtools-registry.s3.yandex.net/5840611310", "5811822876": "https://devtools-registry.s3.yandex.net/5811822876", + "5840610640": "https://devtools-registry.s3.yandex.net/5840610640", "5766172292": "https://devtools-registry.s3.yandex.net/5766172292", "5805431504": "https://devtools-registry.s3.yandex.net/5805431504", "5829027626": "https://devtools-registry.s3.yandex.net/5829027626", @@ -423,8 +426,11 @@ "5829321497": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux", "5829394327": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux", "5811823978": "devtools/yexport/bin/yexport for darwin", + "5840611982": "devtools/yexport/bin/yexport for darwin", "5811823398": "devtools/yexport/bin/yexport for darwin-arm64", + "5840611310": "devtools/yexport/bin/yexport for darwin-arm64", "5811822876": "devtools/yexport/bin/yexport for linux", + "5840610640": "devtools/yexport/bin/yexport for linux", "5766172292": "devtools/ymake/bin/ymake for darwin", "5805431504": "devtools/ymake/bin/ymake for darwin", "5829027626": "devtools/ymake/bin/ymake for darwin", |