diff options
| author | ignat <[email protected]> | 2022-02-10 16:48:20 +0300 |
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:48:20 +0300 |
| commit | 12d7840a194f4a6e4ea77a405f980074cf43e942 (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /build | |
| parent | c8b279dd21ddcb47e755028d81281f113a0f4a11 (diff) | |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'build')
| -rw-r--r-- | build/plugins/pybuild.py | 8 | ||||
| -rw-r--r-- | build/ymake.core.conf | 26 |
2 files changed, 17 insertions, 17 deletions
diff --git a/build/plugins/pybuild.py b/build/plugins/pybuild.py index 3913a456be4..f32a2d39a0e 100644 --- a/build/plugins/pybuild.py +++ b/build/plugins/pybuild.py @@ -209,10 +209,10 @@ def onpy_srcs(unit, *args): if unit_needs_main: py_program(unit, py3) - py_namespace_value = unit.get('PY_NAMESPACE_VALUE') - if py_namespace_value == ".": - ns = "" - else: + py_namespace_value = unit.get('PY_NAMESPACE_VALUE') + if py_namespace_value == ".": + ns = "" + else: ns = (unit.get('PY_NAMESPACE_VALUE') or upath.replace('/', '.')) + '.' cython_coverage = unit.get('CYTHON_COVERAGE') == 'yes' diff --git a/build/ymake.core.conf b/build/ymake.core.conf index c6def02d481..081833998b8 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -8819,26 +8819,26 @@ multimodule PY23_LIBRARY { ### ### @see [LIBRARY()](#module_LIBRARY), [PY2MODULE()](#module_PY2MODULE) multimodule PY23_NATIVE_LIBRARY { - module PY2: LIBRARY { + module PY2: LIBRARY { .RESTRICTED=PY_SRCS USE_PYTHON2 USE_PYTHON3 PYTHON3_ADDINCL - OBJ_SUF=.py2 + OBJ_SUF=.py2 PYTHON2_ADDINCL() SET(MODULE_LANG PY2) - } - module PY3: LIBRARY { + } + module PY3: LIBRARY { .RESTRICTED=PY_SRCS USE_PYTHON2 USE_PYTHON3 .ALIASES=PYTHON2_ADDINCL=PYTHON3_ADDINCL PYTHON3_ADDINCL() SET(MODULE_LANG PY3) - when ($MSVC == "yes" || $CYGWIN == "yes") { - MODULE_PREFIX=py3c - } - otherwise { - MODULE_PREFIX=libpy3c - } - OBJ_SUF=.py3 - } -} + when ($MSVC == "yes" || $CYGWIN == "yes") { + MODULE_PREFIX=py3c + } + otherwise { + MODULE_PREFIX=libpy3c + } + OBJ_SUF=.py3 + } +} IBTOOL_PATH=$XCODE_TOOLS_ROOT_RESOURCE_GLOBAL/Xcode/Contents/Developer/usr/bin/ibtool # tag:src-processing |