Commit 76b5d85bda4d2c4cd46a6228d59503c90f5b85ff
1 parent
b3784089
bugfix: regex recognizing Python version
the funniest bug so far: Python 3.12 is a 2.x version, because it contains a ‘2’ 🤣
Showing
5 changed files
with
9 additions
and
8 deletions
CMakeLists.txt
... | ... | @@ -4,7 +4,7 @@ project (Morfeusz) |
4 | 4 | |
5 | 5 | set (Morfeusz_VERSION_MAJOR 1) |
6 | 6 | set (Morfeusz_VERSION_MINOR 99) |
7 | -set (Morfeusz_VERSION_PATCH 10) | |
7 | +set (Morfeusz_VERSION_PATCH 11) | |
8 | 8 | set (Morfeusz_VERSION "${Morfeusz_VERSION_MAJOR}.${Morfeusz_VERSION_MINOR}.${Morfeusz_VERSION_PATCH}") |
9 | 9 | set (Morfeusz_LIB_VERSION "${Morfeusz_VERSION}") |
10 | 10 | if (BUILT_ON) |
... | ... |
buildDarwin.sh
... | ... | @@ -279,7 +279,7 @@ export -f log |
279 | 279 | ##??? rm -rf log $BUILD_ROOT |
280 | 280 | mkdir -p log |
281 | 281 | |
282 | -build Darwin $BITS true 2 package package-java gui-dmg 2>&1 | log Darwin $BITS; | |
282 | +build Darwin $BITS true 0 package package-java gui-dmg 2>&1 | log Darwin $BITS; | |
283 | 283 | # build Darwin $BITS true 2 package-python2-egg-info 2>&1 | log Darwin $BITS; |
284 | 284 | # buildegg Darwin $BITS true 2 2>&1 | log Darwin $BITS; |
285 | 285 | # build Darwin $BITS true 3 package-python3-egg-info 2>&1 | log Darwin $BITS; |
... | ... |
buildWindows.sh
... | ... | @@ -127,10 +127,10 @@ export -f log |
127 | 127 | ##??? rm -rf log $BUILD_ROOT |
128 | 128 | mkdir -p log |
129 | 129 | |
130 | -build Windows $BITS true 2.7 package package-java gui-installer 2>&1 | log Windows $BITS | |
130 | +build Windows $BITS true 0 package package-java gui-installer 2>&1 | log Windows $BITS | |
131 | 131 | build Windows $BITS true 2.7 package-python2-fatwhl 2>&1 | log Windows $BITS |
132 | 132 | |
133 | -for py in 3.6 3.7 3.8 3.9 3.10 3.11 3.12 | |
133 | +for py in 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 | |
134 | 134 | do |
135 | 135 | if [ -d ${CROSSMORFEUSZ_ROOT}/windows${BITS}/Python${py//\./}/ ]; then |
136 | 136 | echo Building package for Python ${py} |
... | ... |
morfeusz/wrappers/CMakeLists.txt
... | ... | @@ -2,9 +2,9 @@ add_subdirectory (java) |
2 | 2 | #add_subdirectory (perl) |
3 | 3 | |
4 | 4 | if (${PY}) |
5 | - if("${PY}" MATCHES "2.*") | |
5 | + if("${PY}" MATCHES "^2\\.") | |
6 | 6 | add_subdirectory (python2) |
7 | - elseif("${PY}" MATCHES "3.*") | |
7 | + elseif("${PY}" MATCHES "^3\\.") | |
8 | 8 | add_subdirectory (python3) |
9 | 9 | endif() |
10 | 10 | endif() |
... | ... |
morfeusz/wrappers/python3/CMakeLists.txt
... | ... | @@ -92,7 +92,7 @@ if (UNIX) |
92 | 92 | elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND CMAKE_CROSSCOMPILING) |
93 | 93 | if (NOT PYTHON_INCLUDE_DIRS) |
94 | 94 | set(Python_ADDITIONAL_VERSIONS 3.4) |
95 | - FIND_PACKAGE (PythonLibs ${PY} REQUIRED) | |
95 | + FIND_PACKAGE (Python ${PY} REQUIRED COMPONENTS Development) | |
96 | 96 | endif () |
97 | 97 | INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) |
98 | 98 | add_custom_target (package-python3-egg-info |
... | ... | @@ -112,7 +112,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND CMAKE_CROSSCOMPILING) |
112 | 112 | configure_file (WHEEL.win.in WHEEL) |
113 | 113 | add_custom_target (package-python3-fatwhl |
114 | 114 | COMMAND mkdir win-wheel |
115 | - COMMAND mv morfeusz2.dist-info win-wheel/morfeusz2-${PY3MORFEUSZ_VERSION}.dist-info | |
115 | + COMMAND mv morfeusz2*.dist-info win-wheel/morfeusz2-${PY3MORFEUSZ_VERSION}.dist-info | |
116 | + # from 24.04 on: COMMAND mv morfeusz2-${PY3MORFEUSZ_VERSION}.dist-info win-wheel/ | |
116 | 117 | COMMAND cp morfeusz2.py _morfeusz2.pyd ../../morfeusz2.dll win-wheel |
117 | 118 | COMMAND cp WHEEL win-wheel/morfeusz2-${PY3MORFEUSZ_VERSION}.dist-info/ |
118 | 119 | COMMAND python3 -m wheel pack --build-number ${DICT_VERSION} --dest-dir ${TARGET_DIR} win-wheel/ |
... | ... |