[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28307] trunk/blender: replace referenecs to python 2.x
Campbell Barton
ideasman42 at gmail.com
Tue Apr 20 17:46:28 CEST 2010
Revision: 28307
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28307
Author: campbellbarton
Date: 2010-04-20 17:46:28 +0200 (Tue, 20 Apr 2010)
Log Message:
-----------
replace referenecs to python 2.x
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/config/aix4-config.py
trunk/blender/config/irix6-config.py
trunk/blender/doc/blender-cmake.txt
trunk/blender/po/zh_CN.po
trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp
trunk/blender/source/nan_definitions.mk
trunk/blender/source/nan_link.mk
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/CMakeLists.txt 2010-04-20 15:46:28 UTC (rev 28307)
@@ -102,9 +102,9 @@
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
-# cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
+# cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
# On Macs:
-# cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
+# cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
#
# When changing any of this remember to update the notes in doc/blender-cmake.txt
@@ -479,7 +479,7 @@
# otherwise, use custom system framework
SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
- SET(PYTHON_VERSION 2.5)
+ SET(PYTHON_VERSION 3.1)
SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
# SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
SET(PYTHON_LIB "")
Modified: trunk/blender/config/aix4-config.py
===================================================================
--- trunk/blender/config/aix4-config.py 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/config/aix4-config.py 2010-04-20 15:46:28 UTC (rev 28307)
@@ -14,7 +14,7 @@
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
WITH_BF_OPENAL = 'false'
WITH_BF_STATICOPENAL = 'false'
Modified: trunk/blender/config/irix6-config.py
===================================================================
--- trunk/blender/config/irix6-config.py 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/config/irix6-config.py 2010-04-20 15:46:28 UTC (rev 28307)
@@ -10,7 +10,7 @@
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
WITH_BF_OPENAL = 'true'
WITH_BF_STATICOPENAL = 'true'
Modified: trunk/blender/doc/blender-cmake.txt
===================================================================
--- trunk/blender/doc/blender-cmake.txt 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/doc/blender-cmake.txt 2010-04-20 15:46:28 UTC (rev 28307)
@@ -132,9 +132,9 @@
The commandline can be used to override detected/default settings, e.g:
On Unix:
- cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
+ cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
On Macs:
- cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
+ cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -G Xcode ../blender
Mote that this should only be needed once per build directory generation because it will keep the overrides in CMakeCache.txt for subsequent runs.
Modified: trunk/blender/po/zh_CN.po
===================================================================
--- trunk/blender/po/zh_CN.po 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/po/zh_CN.po 2010-04-20 15:46:28 UTC (rev 28307)
@@ -921,7 +921,7 @@
msgid "Save Dynamic Runtime"
msgstr "保存为可执行文件（需要动态连接库）"
-#~ msgid "Creates a dynamic runtime executable with the current project (requieres extenal python20.dll)"
+#~ msgid "Creates a dynamic runtime executable with the current project (requieres extenal python31.dll)"
#~ msgstr "从当前项目创建可执行文件（需要python20.dll）"
#~ msgid "Runtime options"
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp 2010-04-20 15:46:28 UTC (rev 28307)
@@ -182,13 +182,7 @@
/* ------------------------------------------------------------------------- */
PyTypeObject BL_ArmatureActuator::Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
PyVarObject_HEAD_INIT(NULL, 0)
-#else
- /* python 2.5 and below */
- PyObject_HEAD_INIT( NULL ) /* required py macro */
- 0, /* ob_size */
-#endif
"BL_ArmatureActuator",
sizeof(PyObjectPlus_Proxy),
0,
Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/source/nan_definitions.mk 2010-04-20 15:46:28 UTC (rev 28307)
@@ -207,8 +207,8 @@
else
export PY_FRAMEWORK ?= 1
ifdef PY_FRAMEWORK
- export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.5
- export NAN_PYTHON_VERSION ?= 2.5
+ export NAN_PYTHON_VERSION ?= 3.1
+ export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/$(NAN_PYTHON_VERSION)
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
export NAN_PYTHON_LIB ?= -framework Python
else
@@ -538,7 +538,7 @@
ifeq ($(FREE_WINDOWS), true)
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/freegettext.a $(NAN_ICONV)/lib/freeiconv.a
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
- export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/lib25_vs2005/libpython25.a
+ export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/lib25_vs2005/libpython31.a # NOT TESTED, PROBABLY BROKEN
export NAN_FREETYPE ?= $(LCGDIR)/gcc/freetype
export NAN_SDL ?= $(LCGDIR)/gcc/sdl
export NAN_OPENEXR ?= $(LCGDIR)/gcc/openexr
@@ -548,7 +548,7 @@
else
export NAN_GETTEXT_LIB ?= $(NAN_GETTEXT)/lib/gnu_gettext.lib $(NAN_ICONV)/lib/iconv.lib
export NAN_PYTHON_BINARY ?= python
- export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python23.lib
+ export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python31.lib # NOT TESTED, PROBABLY BROKEN
export NAN_FREETYPE ?= $(LCGDIR)/freetype
export NAN_SDL ?= $(LCGDIR)/sdl
export NAN_OPENEXR ?= $(LCGDIR)/openexr
Modified: trunk/blender/source/nan_link.mk
===================================================================
--- trunk/blender/source/nan_link.mk 2010-04-20 14:58:46 UTC (rev 28306)
+++ trunk/blender/source/nan_link.mk 2010-04-20 15:46:28 UTC (rev 28307)
@@ -155,7 +155,7 @@
LOPTS += /NODEFAULTLIB:"libcd"
LOPTS += /NODEFAULTLIB:"libcp"
LOPTS += /NODEFAULTLIB:"libcpd"
- LOPTS += /NODEFAULTLIB:"python20"
+ LOPTS += /NODEFAULTLIB:"python31"
LOPTS += /NODEFAULTLIB:"msvcrt"
LOPTS += /SUBSYSTEM:CONSOLE
LDFLAGS += /MT
More information about the Bf-blender-cvs
mailing list