Merge pull request #79 from o01eg/bump-python-cmake

Bump python cmake

CMakeLists.txt

@@ -316,11 +316,11 @@ if(WIN32)
         zipPythonSTDlib
         DEPENDEES install
         WORKING_DIRECTORY
-            <INSTALL_DIR>/lib/python35
+            <INSTALL_DIR>/lib/python36
         COMMAND ${CMAKE_COMMAND} -E remove_directory
-            <INSTALL_DIR>/lib/python35/lib-dynload
+            <INSTALL_DIR>/lib/python36/lib-dynload
         COMMAND ${ZIP_EXECUTABLE} -r -9 -q --exclude=*.pyc
-            <INSTALL_DIR>/bin/python35.zip
+            <INSTALL_DIR>/bin/python36.zip
             .
         COMMENT "Zip python3 standard library"
     )
@@ -329,7 +329,7 @@ if(WIN32)
         removePythonSTDlib
         DEPENDEES zipPythonSTDlib
         COMMAND ${CMAKE_COMMAND} -E remove_directory
-            <INSTALL_DIR>/lib/python35
+            <INSTALL_DIR>/lib/python36
         COMMENT "Remove python3 standard library from install"
     )
 endif()

Sources.cmake

@@ -23,12 +23,12 @@ set(LIBPNG_VERSION 1.6.37)
 set(LIBPNG_URL https://downloads.sourceforge.net/project/libpng/libpng16/${LIBPNG_VERSION}/libpng-${LIBPNG_VERSION}.tar.gz)
 set(LIBPNG_MD5 6c7519f6c75939efa0ed3053197abd54)
 
-set(PYTHON_CMAKE_URL https://github.com/python-cmake-buildsystem/python-cmake-buildsystem/archive/501869c2b124552dae669d5fd6b7e7101a7cc30c.zip)
-set(PYTHON_CMAKE_MD5 06d2b8fe33eeb08be5e8a127ffa5fff8)
+set(PYTHON_CMAKE_URL https://github.com/python-cmake-buildsystem/python-cmake-buildsystem/archive/d7e201c3308c51eb1766701cbe615f38e4762274.zip)
+set(PYTHON_CMAKE_MD5 107901733cc463b30640a1c8b5aea879)
 
-set(PYTHON3_VERSION 3.5.7)
+set(PYTHON3_VERSION 3.6.5)
 set(PYTHON3_URL https://www.python.org/ftp/python/${PYTHON3_VERSION}/Python-${PYTHON3_VERSION}.tgz)
-set(PYTHON3_MD5 92f4c16c55429bf986f5ab45fe3a6659)
+set(PYTHON3_MD5 ab25d24b1f8cc4990ade979f6dc37883)
 
 set(FREETYPE_VERSION 2.9)
 set(FREETYPE_URL http://downloads.sourceforge.net/project/freetype/freetype2/${FREETYPE_VERSION}/freetype-${FREETYPE_VERSION}.tar.gz)

patches/python-cmake/0001-Builtin-some-modules-in-python3-but-not-in-python2.patch

@@ -50,10 +50,10 @@ index 301c9f2..dd1a75b 100644
 +    set(PY3_BUILTIN BUILTIN)
 +endif()
 +
- # XXX Following modules are missing:
- # lzma
-
-@@ -40,7 +45,7 @@ add_python_extension(_codecs_iso2022 ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_
+ add_python_extension(array ${WIN32_BUILTIN} SOURCES arraymodule.c)
+ add_python_extension(audioop ${WIN32_BUILTIN} SOURCES audioop.c)
+ add_python_extension(_bisect ${WIN32_BUILTIN} SOURCES _bisectmodule.c)
+@@ -37,7 +42,7 @@ add_python_extension(_codecs_iso2022 ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_
  add_python_extension(_codecs_jp ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_jp.c)
  add_python_extension(_codecs_kr ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_kr.c)
  add_python_extension(_codecs_tw ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_tw.c)
@@ -62,7 +62,7 @@ index 301c9f2..dd1a75b 100644
  add_python_extension(cPickle ${WIN32_BUILTIN} REQUIRES IS_PY2 SOURCES cPickle.c)
  set(crypt2_NAME crypt)
  set(crypt2_SOURCES cryptmodule.c)
-@@ -54,14 +59,14 @@ set(datetime2_NAME datetime)
+@@ -51,14 +56,14 @@ set(datetime2_NAME datetime)
  set(datetime2_SOURCES datetimemodule.c)
  set(datetime3_NAME _datetime)
  set(datetime3_SOURCES _datetimemodule.c)
@@ -80,7 +80,7 @@ index 301c9f2..dd1a75b 100644
  add_python_extension(future_builtins ${WIN32_BUILTIN} REQUIRES IS_PY2 SOURCES future_builtins.c)
  add_python_extension(_heapq ${WIN32_BUILTIN} SOURCES _heapqmodule.c)
  add_python_extension(_hotshot ${WIN32_BUILTIN} REQUIRES IS_PY2 SOURCES _hotshot.c)
-@@ -82,7 +87,7 @@ if(WIN32 AND EXISTS ${SRC_DIR}/Modules/_io/winconsoleio.c)
+@@ -79,7 +84,7 @@ if(WIN32 AND EXISTS ${SRC_DIR}/Modules/_io/winconsoleio.c)
  endif()
  add_python_extension(_io BUILTIN SOURCES ${_io_SOURCES})
 
@@ -89,7 +89,7 @@ index 301c9f2..dd1a75b 100644
  add_python_extension(_json ${WIN32_BUILTIN} SOURCES _json.c)
  add_python_extension(_locale ${WIN32_BUILTIN} SOURCES _localemodule.c) # access to ISO C locale support
  add_python_extension(_lsprof ${WIN32_BUILTIN} SOURCES _lsprof.c rotatingtree.c)
-@@ -100,7 +105,7 @@ set(thread3_NAME _thread)
+@@ -97,7 +102,7 @@ set(thread3_NAME _thread)
  set(thread2_SOURCES ${SRC_DIR}/Modules/threadmodule.c)
  set(thread3_SOURCES ${SRC_DIR}/Modules/_threadmodule.c)
  add_python_extension(${thread${PY_VERSION_MAJOR}_NAME} BUILTIN REQUIRES WITH_THREAD SOURCES ${thread${PY_VERSION_MAJOR}_SOURCES})