diff options
author | shadchin <shadchin@yandex-team.ru> | 2022-02-10 16:44:39 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:44:39 +0300 |
commit | e9656aae26e0358d5378e5b63dcac5c8dbe0e4d0 (patch) | |
tree | 64175d5cadab313b3e7039ebaa06c5bc3295e274 /build/platform/python | |
parent | 2598ef1d0aee359b4b6d5fdd1758916d5907d04f (diff) | |
download | ydb-e9656aae26e0358d5378e5b63dcac5c8dbe0e4d0.tar.gz |
Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/platform/python')
-rw-r--r-- | build/platform/python/python27/ya.make | 10 | ||||
-rw-r--r-- | build/platform/python/python39/ya.make | 34 | ||||
-rw-r--r-- | build/platform/python/readme.md | 6 | ||||
-rw-r--r-- | build/platform/python/resources.inc | 10 | ||||
-rw-r--r-- | build/platform/python/tests/ya.make | 2 | ||||
-rw-r--r-- | build/platform/python/ya.make | 152 |
6 files changed, 107 insertions, 107 deletions
diff --git a/build/platform/python/python27/ya.make b/build/platform/python/python27/ya.make index a48304643f..35d2ef8405 100644 --- a/build/platform/python/python27/ya.make +++ b/build/platform/python/python27/ya.make @@ -8,11 +8,11 @@ OWNER( INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) IF (OS_LINUX) - IF (ARCH_ARM64 OR ARCH_AARCH64) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX_ARM64}) - ELSE() - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX}) - ENDIF() + IF (ARCH_ARM64 OR ARCH_AARCH64) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX_ARM64}) + ELSE() + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX}) + ENDIF() ELSEIF (OS_DARWIN) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_DARWIN}) ELSEIF (OS_WINDOWS) diff --git a/build/platform/python/python39/ya.make b/build/platform/python/python39/ya.make index dfc800e971..2579542d1e 100644 --- a/build/platform/python/python39/ya.make +++ b/build/platform/python/python39/ya.make @@ -1,22 +1,22 @@ -RESOURCES_LIBRARY() - -OWNER( - g:contrib - g:yatool -) - -INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) - -IF (OS_LINUX) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_LINUX}) -ELSEIF (OS_DARWIN) +RESOURCES_LIBRARY() + +OWNER( + g:contrib + g:yatool +) + +INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) + +IF (OS_LINUX) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_LINUX}) +ELSEIF (OS_DARWIN) IF (ARCH_ARM64) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_DARWIN_ARM64}) ELSEIF(ARCH_X86_64) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_DARWIN}) ENDIF() -ELSEIF (OS_WINDOWS) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_WINDOWS}) -ENDIF() - -END() +ELSEIF (OS_WINDOWS) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_WINDOWS}) +ENDIF() + +END() diff --git a/build/platform/python/readme.md b/build/platform/python/readme.md index d8f0963c3f..1eaafad35b 100644 --- a/build/platform/python/readme.md +++ b/build/platform/python/readme.md @@ -25,7 +25,7 @@ 6. `for path in $(ls packages); do ar -xf packages/$path; tar -xf data.tar.xz; done;` 7. `mv usr python` 8. `tar -czf python{PYTHON_VERSION}_linux.tar.gz python` -9. `ya upload python{PYTHON_VERSION}_linux.tar.gz -d "Ubuntu {UBUNTU_VERSION} x86_64 python{PYTHON_VERSION} installation" --do-not-remove` +9. `ya upload python{PYTHON_VERSION}_linux.tar.gz -d "Ubuntu {UBUNTU_VERSION} x86_64 python{PYTHON_VERSION} installation" --do-not-remove` UBUNTU_VERSION - версия ubuntu, на которой майнился системный питон @@ -40,7 +40,7 @@ UBUNTU_VERSION - версия ubuntu, на которой майнился си 3. `python/Python.framework/Python -> Versions/Current/Python` 4. `python/Python.framework/Resources -> Versions/Current/Resources` 6. `tar -czf python{PYTHON_VERSION}_darwin.tar.gz python` -7. `ya upload python{PYTHON_VERSION}_darwin.tar.gz -d "Darwin x86_64 python{PYTHON_VERSION} installation" --do-not-remove` +7. `ya upload python{PYTHON_VERSION}_darwin.tar.gz -d "Darwin x86_64 python{PYTHON_VERSION} installation" --do-not-remove` Если нужного питона нет в системе, его нужно установить из `python.org`, его установку можно найти в стандартном месте. @@ -52,7 +52,7 @@ UBUNTU_VERSION - версия ubuntu, на которой майнился си 2. Устанавливаем нужную версию питона из `python.org` 3. Копируем содержимое установки питона в директорию `python` 4. Пакуем директорию `python` в `python{PYTHON_VERSION}_windows.tar.gz` -5. `ya upload python{PYTHON_VERSION}_windows.tar.gz -d "Windows x86_64 python{PYTHON_VERSION} installation" --do-not-remove` +5. `ya upload python{PYTHON_VERSION}_windows.tar.gz -d "Windows x86_64 python{PYTHON_VERSION} installation" --do-not-remove` ## Добавляем бандлы системного питона в сборку diff --git a/build/platform/python/resources.inc b/build/platform/python/resources.inc index 901d5d0433..a730a5039b 100644 --- a/build/platform/python/resources.inc +++ b/build/platform/python/resources.inc @@ -1,14 +1,14 @@ SET(PYTHON27_LINUX sbr:1666107838) # Different from others(compatible with running tests) DEVTOOLS-7424 SET(PYTHON34_LINUX sbr:419260733) SET(PYTHON35_LINUX sbr:1658217692) # Different from others(compatible with running tests) DEVTOOLS-7424 -SET(PYTHON36_LINUX sbr:2569180519) # Different from others(compatible with running tests) DEVTOOLS-7424 +SET(PYTHON36_LINUX sbr:2569180519) # Different from others(compatible with running tests) DEVTOOLS-7424 SET(PYTHON37_LINUX sbr:616675620) SET(PYTHON38_LINUX sbr:1211259884) -SET(PYTHON39_LINUX sbr:2019057022) +SET(PYTHON39_LINUX sbr:2019057022) SET(PYTHON310_LINUX sbr:2505611617) -SET(PYTHON27_LINUX_ARM64 sbr:2145006545) - +SET(PYTHON27_LINUX_ARM64 sbr:2145006545) + SET(PYTHON27_DARWIN sbr:426406952) SET(PYTHON34_DARWIN sbr:426379328) SET(PYTHON35_DARWIN sbr:426409804) @@ -28,5 +28,5 @@ SET(PYTHON35_WINDOWS sbr:410155020) SET(PYTHON36_WINDOWS sbr:410161131) SET(PYTHON37_WINDOWS sbr:629042628) SET(PYTHON38_WINDOWS sbr:1211466284) -SET(PYTHON39_WINDOWS sbr:2018972280) +SET(PYTHON39_WINDOWS sbr:2018972280) SET(PYTHON310_WINDOWS sbr:2506068927) diff --git a/build/platform/python/tests/ya.make b/build/platform/python/tests/ya.make index 0665a86bbe..0d8965240e 100644 --- a/build/platform/python/tests/ya.make +++ b/build/platform/python/tests/ya.make @@ -29,7 +29,7 @@ PEERDIR( build/platform/python/python36 build/platform/python/python37 build/platform/python/python38 - build/platform/python/python39 + build/platform/python/python39 build/platform/python/python310 ) diff --git a/build/platform/python/ya.make b/build/platform/python/ya.make index 101d453f88..247e65f4c9 100644 --- a/build/platform/python/ya.make +++ b/build/platform/python/ya.make @@ -9,34 +9,34 @@ INCLUDE(resources.inc) IF (USE_SYSTEM_PYTHON) IF (OS_LINUX) - IF (ARCH_ARM64 OR ARCH_AARCH64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX_ARM64}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ELSEIF (ARCH_X86_64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX}) - ELSEIF (_SYSTEM_PYTHON34) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_LINUX}) - ELSEIF (_SYSTEM_PYTHON35) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_LINUX}) - ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_LINUX}) - ELSEIF (_SYSTEM_PYTHON37) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_LINUX}) - ELSEIF (_SYSTEM_PYTHON38) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_LINUX}) - ELSEIF (_SYSTEM_PYTHON39) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_LINUX}) + IF (ARCH_ARM64 OR ARCH_AARCH64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX_ARM64}) + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ELSEIF (ARCH_X86_64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_LINUX}) + ELSEIF (_SYSTEM_PYTHON34) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_LINUX}) + ELSEIF (_SYSTEM_PYTHON35) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_LINUX}) + ELSEIF (_SYSTEM_PYTHON36) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_LINUX}) + ELSEIF (_SYSTEM_PYTHON37) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_LINUX}) + ELSEIF (_SYSTEM_PYTHON38) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_LINUX}) + ELSEIF (_SYSTEM_PYTHON39) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_LINUX}) ELSEIF (_SYSTEM_PYTHON310) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_LINUX}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() CFLAGS( GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include" @@ -44,38 +44,38 @@ IF (USE_SYSTEM_PYTHON) ) ELSEIF (OS_DARWIN) IF (PYTHON_DISTR == "macos-brew") - IF (ARCH_X86_64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562720527) - ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562721643) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) + IF (ARCH_X86_64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562720527) + ELSEIF (_SYSTEM_PYTHON36) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON sbr:562721643) + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() ELSE() - IF (ARCH_X86_64) - IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_DARWIN}) - ELSEIF (_SYSTEM_PYTHON34) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_DARWIN}) - ELSEIF (_SYSTEM_PYTHON35) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_DARWIN}) - ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_DARWIN}) - ELSEIF (_SYSTEM_PYTHON37) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_DARWIN}) - ELSEIF (_SYSTEM_PYTHON38) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_DARWIN}) - ELSEIF (_SYSTEM_PYTHON39) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_DARWIN}) + IF (ARCH_X86_64) + IF (_SYSTEM_PYTHON27) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_DARWIN}) + ELSEIF (_SYSTEM_PYTHON34) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_DARWIN}) + ELSEIF (_SYSTEM_PYTHON35) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_DARWIN}) + ELSEIF (_SYSTEM_PYTHON36) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_DARWIN}) + ELSEIF (_SYSTEM_PYTHON37) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_DARWIN}) + ELSEIF (_SYSTEM_PYTHON38) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_DARWIN}) + ELSEIF (_SYSTEM_PYTHON39) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_DARWIN}) ELSEIF (_SYSTEM_PYTHON310) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_DARWIN}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() ELSEIF(ARCH_ARM64) IF (_SYSTEM_PYTHON38) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_DARWIN_ARM64}) @@ -86,42 +86,42 @@ IF (USE_SYSTEM_PYTHON) ELSE() ENABLE(PYTHON_NOT_FOUND) ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) - ENDIF() - ENDIF() + ELSE() + ENABLE(PYTHON_NOT_FOUND) + ENDIF() + ENDIF() CFLAGS(GLOBAL "-isystem$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/Python.framework/Versions/${PY_FRAMEWORK_VERSION}/include/python${PY_VERSION}") - ELSEIF (OS_WINDOWS) - IF (ARCH_X86_64) + ELSEIF (OS_WINDOWS) + IF (ARCH_X86_64) IF (_SYSTEM_PYTHON27) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON27_WINDOWS}) ELSEIF (_SYSTEM_PYTHON34) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON34_WINDOWS}) ELSEIF (_SYSTEM_PYTHON35) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON35_WINDOWS}) ELSEIF (_SYSTEM_PYTHON36) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON36_WINDOWS}) ELSEIF (_SYSTEM_PYTHON37) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON37_WINDOWS}) ELSEIF (_SYSTEM_PYTHON38) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_WINDOWS}) - ELSEIF (_SYSTEM_PYTHON39) - DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_WINDOWS}) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON38_WINDOWS}) + ELSEIF (_SYSTEM_PYTHON39) + DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON39_WINDOWS}) ELSEIF (_SYSTEM_PYTHON310) DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON ${PYTHON310_WINDOWS}) - ELSE() - ENABLE(PYTHON_NOT_FOUND) + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() - ELSE() - ENABLE(PYTHON_NOT_FOUND) + ELSE() + ENABLE(PYTHON_NOT_FOUND) ENDIF() CFLAGS(GLOBAL "/I$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/include") LDFLAGS("/LIBPATH:$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/libs") ENDIF() - - IF (PYTHON_NOT_FOUND) - MESSAGE(FATAL_ERROR "No system Python ${USE_SYSTEM_PYTHON} for the selected platform") - ENDIF() + + IF (PYTHON_NOT_FOUND) + MESSAGE(FATAL_ERROR "No system Python ${USE_SYSTEM_PYTHON} for the selected platform") + ENDIF() ELSEIF (NOT USE_ARCADIA_PYTHON) CFLAGS(GLOBAL $PYTHON_FLAGS) IF (OS_WINDOWS) |