Commit 87be0a849b84efc829912495c3c0806179f9242d

Authored by Marcin Woliński
1 parent 5f4325f9

Windows egg 3.8 i 3.9

buildWindows.sh
... ... @@ -151,15 +151,8 @@ function buildegg {
151 151 else
152 152 if [ "$os-$arch" == "Windows-amd64" ]
153 153 then
154   - if [ "$python_ver" == "3.6" ]
155   - then
156   - pythonDir=$CROSSMORFEUSZ_ROOT/windows64/Python36
157   - pythonIncl=python36
158   - elif [ "$python_ver" == "3.7" ]
159   - then
160   - pythonDir=$CROSSMORFEUSZ_ROOT/windows64/Python37
161   - pythonIncl=python37
162   - fi
  154 + pythonDir=$CROSSMORFEUSZ_ROOT/windows64/Python${python_ver//./}
  155 + pythonIncl=python${python_ver//./}
163 156 else
164 157 pythonIncl=python36
165 158 if [ "$os-$arch" == "Windows-i386" ]
... ... @@ -282,4 +275,8 @@ build Windows $BITS true 3.6 package-python3-egg-info 2>&1 | log Windows $BITS
282 275 buildegg Windows $BITS true 3.6 2>&1 | log Windows $BITS
283 276 build Windows $BITS true 3.7 package-python3-egg-info 2>&1 | log Windows $BITS
284 277 buildegg Windows $BITS true 3.7 2>&1 | log Windows $BITS
  278 +build Windows $BITS true 3.8 package-python3-egg-info 2>&1 | log Windows $BITS
  279 +buildegg Windows $BITS true 3.8 2>&1 | log Windows $BITS
  280 +build Windows $BITS true 3.9 package-python3-egg-info 2>&1 | log Windows $BITS
  281 +buildegg Windows $BITS true 3.9 2>&1 | log Windows $BITS
285 282  
... ...
morfeusz/wrappers/python3/CMakeLists.txt
... ... @@ -2,8 +2,10 @@
2 2 # SWIG
3 3 #set(CMAKE_SWIG_OUTDIR swig)
4 4 #~ FIND_PACKAGE (SWIG REQUIRED)
5   -set(Python_ADDITIONAL_VERSIONS 3.4)
6   -FIND_PACKAGE (PythonLibs ${PY} REQUIRED)
  5 +if (NOT PYTHON_INCLUDE_DIRS)
  6 + set(Python_ADDITIONAL_VERSIONS 3.4)
  7 + FIND_PACKAGE (PythonLibs ${PY} REQUIRED)
  8 +endif ()
7 9 #~ INCLUDE (${SWIG_USE_FILE})
8 10  
9 11 set (PY3MORFEUSZ_VERSION "${Morfeusz_LIB_VERSION}")
... ...
toolchains/Toolchain-Windows-amd64.cmake
... ... @@ -11,11 +11,11 @@ set (CMAKE_SYSTEM_PROCESSOR "x86_64")
11 11 set (WIN64_ROOT ${CROSSMORFEUSZ_ROOT}/windows64)
12 12 set (PYTHON_ROOT ${WIN64_ROOT}/Python27)
13 13 if(${PY})
14   - if("${PY}" EQUAL "3.6")
15   - set (PYTHON_ROOT ${WIN64_ROOT}/Python36)
16   - elseif("${PY}" EQUAL "3.7")
17   - set (PYTHON_ROOT ${WIN64_ROOT}/Python37)
18   - endif()
  14 + string(REPLACE "." "" PY_SHORT "${PY}")
  15 + # message(STATUS "#### PY: ${PY} PY_SHORT: ${PY_SHORT}")
  16 + set (PYTHON_ROOT ${WIN64_ROOT}/Python${PY_SHORT})
  17 + set (PYTHON_LIBRARIES ${PYTHON_ROOT}/libs)
  18 + set (PYTHON_INCLUDE_DIRS ${PYTHON_ROOT}/include)
19 19 endif()
20 20 set (JAVA_ROOT ${WIN64_ROOT}/Java/jdk1.7.0_45)
21 21 set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 ${JAVA_ROOT} ${PYTHON_ROOT})
... ...