Switch to numpy 1.9 for windows platform
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 10 Dec 2014 08:50:51 +0000 (13:50 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 10 Dec 2014 08:50:51 +0000 (13:50 +0500)
build_files/scons/tools/Blender.py
source/creator/CMakeLists.txt

index d09710a28fc75665df589ca09d8c9c495ee5cacc..eb2e57ad7931411f794e15ba828603b7c0f58b06 100755 (executable)
@@ -654,7 +654,7 @@ def WinPyBundle(target=None, source=None, env=None):
     # Extract Numpy
     if env['WITH_BF_PYTHON_INSTALL_NUMPY']:
         py_tar = env.subst(env['LCGDIR']).lstrip("#")
-        py_tar += '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '_numpy_1.8.tar.gz'
+        py_tar += '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '_numpy_1.9.tar.gz'
 
         py_target = env.subst(env['BF_INSTALLDIR']).lstrip("#")
         py_target = os.path.join(py_target, VERSION, 'python', 'lib', 'site-packages')
index 2b1191319878686d0dd49de1492b550f7f66e692..21cb41ddfa2b885b8cde60995791d65ae8ad7f74 100755 (executable)
@@ -669,8 +669,8 @@ elseif(WIN32)
 
                        if(WITH_PYTHON_INSTALL_NUMPY)
                                add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy
-                                       COMMAND ${CMAKE_COMMAND} -E tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.8.tar.gz"
-                                       DEPENDS ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.8.tar.gz
+                                       COMMAND ${CMAKE_COMMAND} -E tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz"
+                                       DEPENDS ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz
                                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages)
                                add_custom_target(python_numpy ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy)
                                install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy