[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52571] trunk/blender: switch verious references from py3.2 -> 3.3 or just 3.
Campbell Barton
ideasman42 at gmail.com
Mon Nov 26 14:58:07 CET 2012
Revision: 52571
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52571
Author: campbellbarton
Date: 2012-11-26 13:58:06 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
switch verious references from py3.2 -> 3.3 or just 3.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/cmake_consistency_check.py
trunk/blender/build_files/cmake/cmake_netbeans_project.py
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/build_files/cmake/cmake_static_check_clang_array.py
trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
trunk/blender/build_files/cmake/cmake_static_check_smatch.py
trunk/blender/build_files/cmake/cmake_static_check_sparse.py
trunk/blender/build_files/cmake/cmake_static_check_splint.py
trunk/blender/build_files/cmake/example_scripts/make_quicky.py
trunk/blender/build_files/cmake/project_info.py
trunk/blender/build_files/scons/config/freebsd7-config.py
trunk/blender/build_files/scons/config/freebsd8-config.py
trunk/blender/build_files/scons/config/freebsd9-config.py
trunk/blender/build_files/scons/config/linuxcross-config.py
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/build_files/scons/config/win64-mingw-config.py
trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
trunk/blender/doc/blender_file_format/BlendFileReader.py
trunk/blender/intern/tools/bpy_introspect_ui.py
trunk/blender/intern/tools/credits_svn_gen.py
trunk/blender/intern/tools/dump_rna2xml.py
trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
trunk/blender/source/tools/check_style_c.py
trunk/blender/source/tools/tag_release.py
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/CMakeLists.txt 2012-11-26 13:58:06 UTC (rev 52571)
@@ -487,14 +487,14 @@
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
# cmake ../blender \
-# -D PYTHON_VERSION=3.2 \
-# -D PYTHON_INCLUDE_DIR=/opt/py32/include/python3.2d \
-# -D PYTHON_LIBRARY=/opt/py32/lib/libpython3.2d.so
+# -D PYTHON_VERSION=3.3 \
+# -D PYTHON_INCLUDE_DIR=/opt/py33/include/python3.3d \
+# -D PYTHON_LIBRARY=/opt/py33/lib/libpython3.3d.so
#
# On Macs:
# cmake ../blender \
-# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
-# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
+# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.3/include/python3.3 \
+# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/config \
# -G Xcode
#
# When changing any of this remember to update the notes in doc/build_systems/cmake.txt
@@ -522,7 +522,7 @@
find_package_wrapper(Freetype REQUIRED)
if(WITH_PYTHON)
- # No way to set py32. remove for now.
+ # No way to set py33. remove for now.
# find_package(PythonLibs)
# Use our own instead, since wothout py is such a rare case,
Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_netbeans_project.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_netbeans_project.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/cmake_static_check_clang_array.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_clang_array.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_static_check_clang_array.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/cmake_static_check_smatch.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_smatch.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_static_check_smatch.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_sparse.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_static_check_sparse.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_splint.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/cmake_static_check_splint.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/cmake/example_scripts/make_quicky.py
===================================================================
--- trunk/blender/build_files/cmake/example_scripts/make_quicky.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/example_scripts/make_quicky.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ##### BEGIN GPL LICENSE BLOCK #####
#
Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/cmake/project_info.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -7,7 +7,7 @@
BF_PYTHON_ABI_FLAGS = ''
BF_PYTHON = '/usr/local'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_VERSION = '3.3'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -7,7 +7,7 @@
BF_PYTHON_ABI_FLAGS = ''
BF_PYTHON = '/usr/local'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_VERSION = '3.3'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd9-config.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/scons/config/freebsd9-config.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -7,7 +7,7 @@
BF_PYTHON_ABI_FLAGS = ''
BF_PYTHON = '/usr/local'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_VERSION = '3.3'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -2,7 +2,7 @@
LIBDIR = '${LCGDIR}'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_VERSION = '3.3'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -2,12 +2,12 @@
LIBDIR = "${LCGDIR}"
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_VERSION = '3.3'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
-BF_PYTHON_DLL = 'python32'
+BF_PYTHON_DLL = 'python33'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py 2012-11-26 13:48:48 UTC (rev 52570)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py 2012-11-26 13:58:06 UTC (rev 52571)
@@ -2,12 +2,12 @@
LIBDIR = "${LCGDIR}"
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_VERSION = '3.3'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
-BF_PYTHON_DLL = 'python32'
+BF_PYTHON_DLL = 'python33'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = True
Modified: trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list