switch verious references from py3.2 -> 3.3 or just 3.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Nov 2012 13:58:06 +0000 (13:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Nov 2012 13:58:06 +0000 (13:58 +0000)
21 files changed:
CMakeLists.txt
build_files/cmake/cmake_consistency_check.py
build_files/cmake/cmake_netbeans_project.py
build_files/cmake/cmake_qtcreator_project.py
build_files/cmake/cmake_static_check_clang_array.py
build_files/cmake/cmake_static_check_cppcheck.py
build_files/cmake/cmake_static_check_smatch.py
build_files/cmake/cmake_static_check_sparse.py
build_files/cmake/cmake_static_check_splint.py
build_files/cmake/example_scripts/make_quicky.py
build_files/cmake/project_info.py
build_files/scons/config/freebsd7-config.py
build_files/scons/config/freebsd8-config.py
build_files/scons/config/freebsd9-config.py
build_files/scons/config/linuxcross-config.py
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win64-mingw-config.py
doc/blender_file_format/BlendFileDnaExporter_25.py
doc/blender_file_format/BlendFileReader.py
source/blender/makesrna/rna_cleanup/rna_cleaner.py
source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py

index c40decc424b588eb5e31bacc70b380f89b1096b1..b826b8eeb76edda6468f9af968a74670a902bdd8 100644 (file)
@@ -487,14 +487,14 @@ set(PLATFORM_LINKFLAGS_DEBUG "")
 # 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 @@ if(UNIX AND NOT APPLE)
        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,
index 83ebf927b3c56c7cd8a831998b3e5801902f0db5..b13b0ddb4241dd28d93b2e5976e121a8469fabe2 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 8f3835c3401d8d1a546bc2f961c5cf3539285fdb..2f36cad4d242ca94c53e290746b705ecc1ad33da 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 83ea761e2d1b346da3986d61aab45ef68558c602..86201da23decc66739d1c3ff18328327e486106a 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index db4e762932ee7c445f1b4298b4a4b05a94ac2c50..7f45cc6aadca5201ed65318abe533cb85dd49c3c 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 518b94d74a5b77457edee8dade2dde5295fef865..12369a5e8cddd9a3f5c2b9b1ff733c0bf35f8a36 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 8f7bd37d4c3ea61d24496ca51860d2ae9e4144f7..7535f1cc55ada07ec1e007d16ac054d03c6ddd1e 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 92d590e52ac3120dc6752925ad2f0b543a000575..06bef1a13278bea9ad0cf1ff07ef342b1b53688a 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index d3f2219102152ebed863c91a8a192991134ce9fd..5b1207543f547e07c90ede675c2d48754c8b7f9b 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 9b853fc01d493021a241f81d5a70869b81ed61a2..76d4df32f86690841d78f5a533797e16b5d6dc0c 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
index b154d5781440b3b20ccbe66037b8624ba699b770..34f378a58dde1efc0cd9c15a94e5d4d583a1dcc2 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 61358de12b4fe83452c1aa1eb18cf2c7526627b2..02c9093567a964c3275dbfd659692a48c3fc2a5e 100644 (file)
@@ -7,7 +7,7 @@ LIBDIR = "${LCGDIR}"
 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}'
index 0f6c7f6478640f41672bd565fa9af912a512b15e..5d3308c50d4c1a399498899115b1b1c13e1f77ad 100644 (file)
@@ -7,7 +7,7 @@ LIBDIR = "${LCGDIR}"
 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}'
index c0df68f99ad5e9e4fb57559bcfe263c59164a806..98c2c8fa50018b4620696404235b10f3c1f66436 100644 (file)
@@ -7,7 +7,7 @@ LIBDIR = "${LCGDIR}"
 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}'
index 63264807720de7bf668acf46197188bd607b6421..54faf59b2a47092792971ddc169670365b2209a5 100644 (file)
@@ -2,7 +2,7 @@ LCGDIR = '#../lib/windows'
 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'
index 80e3592c71e8d116170c89fbba582f7a7e63c833..391421609d2bf64088b562528619fe92bc01e63a 100644 (file)
@@ -2,12 +2,12 @@ LCGDIR = '#../lib/mingw32'
 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'
 
index fdfd792f18072e5d363dc4c31f9508412eeb8c54..d00e7a3ffa7043215cda2a604e2193e91ab481ee 100644 (file)
@@ -2,12 +2,12 @@ LCGDIR = '#../lib/mingw64'
 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
index b7b89c8926836e7b2a1efe4dcda3ca4a61da1518..837b67c6eed70ef9cc2991738ee53392be3c4e82 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index b7091ad8ff559a5f4dbff289ab575c4622ba5b46..a4d2f494c5b7fd4d1b450e1d5b1a947194845a71 100644 (file)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
index 0231e57fcfd72b04a52f1ea2545204de4e5f4e06..8b4b10c490e7836b967b0eca9541092b4567b4be 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 """
 This script is used to help cleaning RNA api.
index 758511059915c6cf3627f207dc6ad2fa1575093c..17ea5f9b0bd5645b0bbd105d532bf3d36d20e873 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.2
+#!/usr/bin/env python3
 
 import sys