Commit 08113fc0ee8e57e80ba24c68773b1591a1cd1319
1 parent
82bed219
wheel dla Windows 32 ma mieć tag -win32; --depends3
Przy okazji zależność python-morfeusza zmieniona na libmorfeusz2
Showing
7 changed files
with
8 additions
and
6 deletions
morfeusz/wrappers/python2/WHEEL.win.in
morfeusz/wrappers/python2/setup.py.in
... | ... | @@ -11,7 +11,7 @@ if __name__ == '__main__': |
11 | 11 | setup(name='morfeusz2', |
12 | 12 | author='${CPACK_PACKAGE_VENDOR}', |
13 | 13 | author_email='${CPACK_PACKAGE_CONTACT}', |
14 | - description='Python 2 bindings for Morfeusz 2', | |
14 | + description='Python bindings for Morfeusz 2', | |
15 | 15 | long_description=""" |
16 | 16 | ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} |
17 | 17 | |
... | ... |
morfeusz/wrappers/python3/CMakeLists.txt
... | ... | @@ -69,12 +69,12 @@ if (UNIX) |
69 | 69 | if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
70 | 70 | if (BUILT_ON) |
71 | 71 | add_custom_target (package-python3-deb-sdist |
72 | - COMMAND python3 ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --depends "${CPACK_DEBIAN_PACKAGE_NAME}" --copyright-file "${PROJECT_SOURCE_DIR}/License.txt" --debian-version ${BUILT_ON} | |
72 | + COMMAND python3 ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --depends3 libmorfeusz2 --copyright-file "${PROJECT_SOURCE_DIR}/License.txt" --debian-version ${BUILT_ON} | |
73 | 73 | DEPENDS py3morfeusz |
74 | 74 | ) |
75 | 75 | else () |
76 | 76 | add_custom_target (package-python3-deb-sdist |
77 | - COMMAND python3 ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --depends "${CPACK_DEBIAN_PACKAGE_NAME}" --copyright-file "${PROJECT_SOURCE_DIR}/License.txt" | |
77 | + COMMAND python3 ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --depends3 libmorfeusz2 --copyright-file "${PROJECT_SOURCE_DIR}/License.txt" | |
78 | 78 | DEPENDS py3morfeusz |
79 | 79 | ) |
80 | 80 | endif () |
... | ... |
morfeusz/wrappers/python3/WHEEL.win.in
morfeusz/wrappers/python3/setup.py.in
... | ... | @@ -17,7 +17,7 @@ if __name__ == '__main__': |
17 | 17 | setup(name='morfeusz2', |
18 | 18 | author='${CPACK_PACKAGE_VENDOR}', |
19 | 19 | author_email='${CPACK_PACKAGE_CONTACT}', |
20 | - description='Python 3 bindings for Morfeusz 2', | |
20 | + description='Python bindings for Morfeusz 2', | |
21 | 21 | long_description=""" |
22 | 22 | ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} |
23 | 23 | |
... | ... |
toolchains/Toolchain-Windows-amd64.cmake
... | ... | @@ -6,6 +6,7 @@ set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) |
6 | 6 | set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) |
7 | 7 | |
8 | 8 | set (CMAKE_SYSTEM_PROCESSOR "x86_64") |
9 | +set (PYTHON_PLATFORM_TAG "win_amd64") | |
9 | 10 | |
10 | 11 | # here is the target environment located |
11 | 12 | set (WIN64_ROOT ${CROSSMORFEUSZ_ROOT}/windows64) |
... | ... |
toolchains/Toolchain-Windows-i386.cmake
... | ... | @@ -6,6 +6,7 @@ set (CMAKE_CXX_COMPILER i686-w64-mingw32-g++) |
6 | 6 | set (CMAKE_RC_COMPILER i686-w64-mingw32-windres) |
7 | 7 | |
8 | 8 | set (CMAKE_SYSTEM_PROCESSOR "x86") |
9 | +set (PYTHON_PLATFORM_TAG "win32") | |
9 | 10 | |
10 | 11 | # here is the target environment located |
11 | 12 | set (WIN32_ROOT ${CROSSMORFEUSZ_ROOT}/windows32) |
... | ... |