Merge from trunk r49908-r50219

- Add Smoke Density node
- Make density available on GPU
- *TOTALLY* untested! Will most likely crash and you cannot render at the moment since "Volume BSDF" is missing (from blenderartists volume patch)

TODO:
- Fix "svm_node_smoke_density()", atm I have no idea how

.arcconfig

@@ -1,6 +0,0 @@
-{
-	"project_id" : "Blender",
-	"conduit_uri" : "https://developer.blender.org/",
-	"git.default-relative-commit" : "origin/master",
-	"arc.land.update.default" : "rebase"
-}

.gitignore

@@ -1,34 +0,0 @@
-# generic files to ignore
-.*
-
-# python temp paths
-__pycache__/
-*.py[cod]
-
-# editors
-*~
-*.swp
-*.swo
-*#
-
-# QtCreator
-CMakeLists.txt.user
-
-# ms-windows
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-
-# commonly used paths in blender
-/blender.bin
-/user-config.py
-
-# local patches
-/*.patch
-/*.diff
-
-# in-source doc-gen
-/doc/doxygen/html/
-/doc/python_api/sphinx-in-tmp/
-/doc/python_api/sphinx-in/
-/doc/python_api/sphinx-out/

.gitmodules

@@ -1,16 +0,0 @@
-[submodule "release/scripts/addons"]
-	path = release/scripts/addons
-	url = ../blender-addons.git
-	ignore = all
-[submodule "release/scripts/addons_contrib"]
-	path = release/scripts/addons_contrib
-	url = ../blender-addons-contrib.git
-	ignore = all
-[submodule "release/datafiles/locale"]
-	path = release/datafiles/locale
-	url = ../blender-translations.git
-	ignore = all
-[submodule "scons"]
-	path = scons
-	url = ../scons.git
-	ignore = all

GNUmakefile

@@ -40,7 +40,7 @@ ifndef BUILD_CMAKE_ARGS
 endif
 
 ifndef BUILD_DIR
-	BUILD_DIR:=$(shell dirname "$(BLENDER_DIR)")/build_$(OS_NCASE)
+	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
 endif
 
 
@@ -52,25 +52,17 @@ ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_debug
 	BUILD_TYPE:=Debug
 endif
-ifneq "$(findstring full, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_full
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_full.cmake"
-endif
 ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_lite
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake"
-endif
-ifneq "$(findstring cycles, $(MAKECMDGOALS))" ""
-	BUILD_DIR:=$(BUILD_DIR)_cycles
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake"
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake
 endif
 ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_bpy
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake"
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
 endif
 ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_bpy
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake"
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake
 endif
 
 
@@ -78,16 +70,16 @@ endif
 # Get the number of cores for threaded build
 NPROCS:=1
 ifeq ($(OS), Linux)
-	NPROCS:=$(shell nproc)
+	NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
 endif
 ifeq ($(OS), Darwin)
-	NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | cut -d" " -f3)
+	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)
 endif
 ifeq ($(OS), FreeBSD)
-	NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | cut -d" " -f2 )
+	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
 endif
 ifeq ($(OS), NetBSD)
-	NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | cut -d" " -f2 )
+	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
 endif
 
 
@@ -95,8 +87,8 @@ endif
 # Macro for configuring cmake
 
 CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
-                     -H"$(BLENDER_DIR)" \
-                     -B"$(BUILD_DIR)" \
+                     -H$(BLENDER_DIR) \
+                     -B$(BUILD_DIR) \
                      -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
 
 
@@ -126,16 +118,14 @@ all:
 
 	@echo
 	@echo Building Blender ...
-	$(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
+	$(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
 	@echo
 	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
 	@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
 	@echo
 
 debug: all
-full: all
 lite: all
-cycles: all
 headless: all
 bpy: all
 
@@ -143,7 +133,7 @@ bpy: all
 # -----------------------------------------------------------------------------
 # Configuration (save some cd'ing around)
 config:
-	$(CMAKE_CONFIG_TOOL) "$(BUILD_DIR)"
+	$(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
 
 
 # -----------------------------------------------------------------------------
@@ -152,10 +142,8 @@ help:
 	@echo ""
 	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
 	@echo "  * debug     - build a debug binary"
-	@echo "  * full      - enable all supported dependencies & options"
 	@echo "  * lite      - disable non essential features for a smaller binary and faster build"
 	@echo "  * headless  - build without an interface (renderfarm or server automation)"
-	@echo "  * cycles    - build Cycles standalone only, without Blender"
 	@echo "  * bpy       - build as a python module which can be loaded from python directly"
 	@echo ""
 	@echo "  * config    - run cmake configuration tool to set build options"
@@ -175,31 +163,18 @@ help:
 	@echo "  * package_archive - build an archive package"
 	@echo ""
 	@echo "Testing Targets (not associated with building blender)"
-	@echo "  * test               - run ctest, currently tests import/export, operator execution and that python modules load"
-	@echo "  * test_cmake         - runs our own cmake file checker which detects errors in the cmake file list definitions"
-	@echo "  * test_pep8          - checks all python script are pep8 which are tagged to use the stricter formatting"
-	@echo "  * test_deprecated    - checks for deprecation tags in our code which may need to be removed"
-	@echo "  * test_style_c       - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
-	@echo "  * test_style_c_qtc   - same as test_style but outputs QtCreator tasks format"
-	@echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
-	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+	@echo "  * test            - run ctest, currently tests import/export, operator execution and that python modules load"
+	@echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
+	@echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
+	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
+	@echo "  * test_style      - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo ""
 	@echo "Static Source Code Checking (not associated with building blender)"
-	@echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
-	@echo "  * check_clang_array    - run blender source through clang array checking script (C & C++)"
-	@echo "  * check_splint         - run blenders source through splint (C only)"
-	@echo "  * check_sparse         - run blenders source through sparse (C only)"
-	@echo "  * check_smatch         - run blenders source through smatch (C only)"
-	@echo "  * check_spelling_c     - check for spelling errors (C/C++ only)"
-	@echo "  * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
-	@echo "  * check_spelling_osl   - check for spelling errors (OSL only)"
-	@echo "  * check_spelling_py    - check for spelling errors (Python only)"
-	@echo "  * check_descriptions   - check for duplicate/invalid descriptions"
-	@echo ""
-	@echo "Utilities (not associated with building blender)"
-	@echo "  * icons    - updates PNG icons from SVG files."
-	@echo "  * tgz      - create a compressed archive of the source code."
-	@echo "  * update   - updates git and all submodules"
+	@echo "  * check_cppcheck    - run blender source through cppcheck (C & C++)"
+	@echo "  * check_splint      - run blenders source through splint (C only)"
+	@echo "  * check_sparse      - run blenders source through sparse (C only)"
+	@echo "  * check_spelling_c  - check for spelling errors (C/C++ only)"
+	@echo "  * check_spelling_py - check for spelling errors (Python only)"
 	@echo ""
 	@echo "Documentation Targets (not associated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
@@ -207,9 +182,6 @@ help:
 	@echo "  * doc_dna  - generate blender file format reference"
 	@echo "  * doc_man  - generate manpage"
 	@echo ""
-	@echo "Information"
-	@echo "  * help          - this help message"
-	@echo "  * help_features - show a list of optional features when building"
 
 # -----------------------------------------------------------------------------
 # Packages
@@ -221,7 +193,7 @@ package_pacman:
 	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
 package_archive:
-	make -C "$(BUILD_DIR)" -s package_archive
+	make -C $(BUILD_DIR) -s package_archive
 	@echo archive in "$(BUILD_DIR)/release"
 
 
@@ -233,70 +205,34 @@ test:
 
 # run pep8 check check on scripts we distribute.
 test_pep8:
-	python3 tests/python/pep8.py > test_pep8.log 2>&1
+	python3.2 source/tests/pep8.py > test_pep8.log 2>&1
 	@echo "written: test_pep8.log"
 
 # run some checks on our cmakefiles.
 test_cmake:
-	python3 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+	python3.2 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
 	@echo "written: test_cmake_consistency.log"
 
 # run deprecation tests, see if we have anything to remove.
 test_deprecated:
-	python3 tests/check_deprecated.py
+	python3.2 source/tests/check_deprecated.py
 
-test_style_c:
+test_style:
 	# run our own checks on C/C++ style
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
-	    "$(BLENDER_DIR)/source/blender" \
-	    "$(BLENDER_DIR)/source/creator" \
-	    --no-length-check
-
-test_style_c_qtc:
-	# run our own checks on C/C++ style
-	USE_QTC_TASK=1 \
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
-	    "$(BLENDER_DIR)/source/blender" \
-	    "$(BLENDER_DIR)/source/creator" \
-	    --no-length-check \
-	    > \
-	    "$(BLENDER_DIR)/test_style.tasks"
-	@echo "written: test_style.tasks"
-
-
-test_style_osl:
-	# run our own checks on C/C++ style
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
-	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders" \
-	    "$(BLENDER_DIR)/release/scripts/templates_osl"
-
-
-test_style_osl_qtc:
-	# run our own checks on C/C++ style
-	USE_QTC_TASK=1 \
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" \
-	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders" \
-	    "$(BLENDER_DIR)/release/scripts/templates_osl" \
-	    > \
-	    "$(BLENDER_DIR)/test_style.tasks"
-	@echo "written: test_style.tasks"
+	PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
 
 # -----------------------------------------------------------------------------
 # Project Files
 #
 
 project_qtcreator:
-	python3 build_files/cmake/cmake_qtcreator_project.py "$(BUILD_DIR)"
+	python3.2 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
 
 project_netbeans:
-	python3 build_files/cmake/cmake_netbeans_project.py "$(BUILD_DIR)"
+	python3.2 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
 
 project_eclipse:
-	cmake -G"Eclipse CDT4 - Unix Makefiles" -H"$(BLENDER_DIR)" -B"$(BUILD_DIR)"
+	cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
 
 
 # -----------------------------------------------------------------------------
@@ -305,85 +241,21 @@ project_eclipse:
 
 check_cppcheck:
 	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
-	    "$(BLENDER_DIR)/check_cppcheck.txt"
-	@echo "written: check_cppcheck.txt"
-
-check_clang_array:
-	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py"
+	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
 
 check_splint:
 	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py"
+	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
 
 check_sparse:
 	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py"
-
-check_smatch:
-	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py"
+	cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
 
 check_spelling_py:
-	cd "$(BUILD_DIR)" ; \
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    "$(BLENDER_DIR)/release/scripts"
+	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
 
 check_spelling_c:
-	cd "$(BUILD_DIR)" ; \
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    "$(BLENDER_DIR)/source" \
-	    "$(BLENDER_DIR)/intern/cycles" \
-	    "$(BLENDER_DIR)/intern/guardedalloc" \
-	    "$(BLENDER_DIR)/intern/ghost" \
-
-check_spelling_c_qtc:
-	cd "$(BUILD_DIR)" ; USE_QTC_TASK=1 \
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    "$(BLENDER_DIR)/source" \
-	    "$(BLENDER_DIR)/intern/cycles" \
-	    "$(BLENDER_DIR)/intern/guardedalloc" \
-	    "$(BLENDER_DIR)/intern/ghost" \
-	    > \
-	    "$(BLENDER_DIR)/check_spelling_c.tasks"
-
-check_spelling_osl:
-	cd "$(BUILD_DIR)" ;\
-	PYTHONIOENCODING=utf_8 python3 \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders"
-
-check_descriptions:
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"
-
-# -----------------------------------------------------------------------------
-# Utilities
-#
-
-tgz:
-	./build_files/utils/build_tgz.sh
-
-icons:
-	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-
-update:
-	if [ -d "../lib" ]; then \
-		svn update ../lib/* ; \
-	fi
-	git pull --rebase
-	git submodule foreach git pull --rebase origin master
-
+	cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
 
 # -----------------------------------------------------------------------------
 # Documentation
@@ -391,7 +263,7 @@ update:
 
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py:
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
+	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
 	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
@@ -400,24 +272,14 @@ doc_doxy:
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna:
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
+	$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man:
-	python3 doc/manpage/blender.1.py "$(BUILD_DIR)/bin/blender"
-
-help_features:
-	@python3 -c \
-		"import re; \
-		print('\n'.join([ \
-		w for l in open('"$(BLENDER_DIR)"/CMakeLists.txt', 'r').readlines() \
-		if not l.lstrip().startswith('#') \
-		for w in (re.sub(\
-		    r'.*\boption\s*\(\s*(WITH_[a-zA-Z0-9_]+)\s+(\".*\")\s*.*', r'\g<1> - \g<2>', l).strip('() \n'),) \
-		if w.startswith('WITH_')]))" | uniq
+	python3.2 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
 
 
 clean:
-	$(MAKE) -C "$(BUILD_DIR)" clean
+	$(MAKE) -C $(BUILD_DIR) clean
 
 .PHONY: all

build_files/buildbot/config/user-config-cuda-glibc211-i686.py

@@ -1,5 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
-BF_NUMJOBS = 1
-
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']

build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py

@@ -1,5 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
-BF_NUMJOBS = 1
-
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']

build_files/buildbot/config/user-config-glibc211-i686.py

@@ -1,169 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
-BF_NUMJOBS = 4
-WITHOUT_BF_OVERWRITE_INSTALL = True
-
-# Python configuration
-BF_PYTHON_VERSION = '3.4'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.4'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = True
-WITH_BF_STATICOPENCOLLADA=True
-BF_OPENCOLLADA = '/opt/lib/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADASaxFrameworkLoader.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \
-    '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a '  + \
-    '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
-    '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \
-    '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
-BF_PCRE_LIB = ''
-BF_EXPAT_LIB = ''
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = True
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Blender player (would be enabled in it's own config)
-WITH_BF_PLAYER = False
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# FFT
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
-
-WITH_BF_OIIO = True
-WITH_BF_STATICOIIO = True
-BF_OIIO = '/opt/lib/oiio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_CYCLES_OSL = True
-WITH_BF_STATICOSL = False
-BF_OSL = '/opt/lib/osl'
-BF_OSL_INC = '${BF_OSL}/include'
-# note oslexec would passed via program linkflags, which is needed to
-# make llvm happy with osl_allocate_closure_component
-BF_OSL_LIB = 'oslcomp oslexec oslquery'
-BF_OSL_LIBPATH = '${BF_OSL}/lib'
-BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-
-WITH_BF_LLVM = True
-WITH_BF_STATICLLVM = False
-BF_LLVM = '/opt/lib/llvm-3.4.2'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \
-    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
-    'LLVMTarget LLVMMC LLVMCore LLVMSupport'
-BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# Ocean Simulation
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']
-BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive', '-Wl,--version-script=source/creator/blender.map']

build_files/buildbot/config/user-config-glibc211-x86_64.py

@@ -1,169 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
-BF_NUMJOBS = 4
-WITHOUT_BF_OVERWRITE_INSTALL = True
-
-# Python configuration
-BF_PYTHON_VERSION = '3.4'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.4'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = True
-WITH_BF_STATICOPENCOLLADA=True
-BF_OPENCOLLADA = '/opt/lib/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADASaxFrameworkLoader.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \
-    '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a '  + \
-    '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
-    '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \
-    '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
-BF_PCRE_LIB = ''
-BF_EXPAT_LIB = ''
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = True
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Blender player (would be enabled in it's own config)
-WITH_BF_PLAYER = False
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# FFT
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
-
-WITH_BF_OIIO = True
-WITH_BF_STATICOIIO = True
-BF_OIIO = '/opt/lib/oiio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_CYCLES_OSL = True
-WITH_BF_STATICOSL = False
-BF_OSL = '/opt/lib/osl'
-BF_OSL_INC = '${BF_OSL}/include'
-# note oslexec would passed via program linkflags, which is needed to
-# make llvm happy with osl_allocate_closure_component
-BF_OSL_LIB = 'oslcomp oslexec oslquery'
-BF_OSL_LIBPATH = '${BF_OSL}/lib'
-BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-
-WITH_BF_LLVM = True
-WITH_BF_STATICLLVM = False
-BF_LLVM = '/opt/lib/llvm-3.4.2'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \
-    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
-    'LLVMTarget LLVMMC LLVMCore LLVMSupport'
-BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# Ocean Simulation
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']
-BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive', '-Wl,--version-script=source/creator/blender.map']

build_files/buildbot/config/user-config-i686.py

@@ -0,0 +1,122 @@
+BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
+BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
+
+# Python configuration
+BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON = '/opt/python3'
+
+WITH_BF_STATICPYTHON = True
+
+# OpenCollada configuration
+WITH_BF_COLLADA = True
+BF_OPENCOLLADA = '/opt/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib32'
+BF_PCRE_LIB = ''
+BF_EXPAT_LIB = ''
+
+# FFMPEG configuration
+WITH_BF_FFMPEG = True
+WITH_BF_STATICFFMPEG = True
+
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
+BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
+
+# Don't depend on system's libstdc++
+WITH_BF_STATICCXX = True
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = True
+BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
+
+WITH_BF_GETTEXT_STATIC = True
+BF_FREETYPE_LIB_STATIC = True
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = True
+
+WITH_BF_TIFF = True
+WITH_BF_STATICTIFF = True
+BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
+
+WITH_BF_JPEG = True
+BF_JPEG_LIB = 'libjpeg'
+BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib32'
+
+WITH_BF_PNG = True
+BF_PNG_LIB = 'libpng'
+BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
+
+WITH_BF_STATICLIBSAMPLERATE = True
+
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
+
+WITH_BF_SDL = True
+WITH_BF_OGG = True
+
+WITH_BF_OPENMP = True
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_BULLET = True
+
+# Blender player (would be enabled in it's own config)
+WITH_BF_PLAYER = False
+
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
+# JACK
+WITH_BF_JACK = True
+
+# Cycles
+WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+
+WITH_BF_OIIO = True
+WITH_BF_STATICOIIO = True
+BF_OIIO = '/opt/oiio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
+# Ocean Simulation
+WITH_BF_OCEANSIM = True
+
+# Compilation and optimization
+BF_DEBUG = False
+REL_CCFLAGS = ['-O2']  # C & C++
+PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

build_files/buildbot/config/user-config-mac-i386.py

@@ -1,7 +0,0 @@
-
-MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
-
-WITH_BF_CYCLES_CUDA_BINARIES = True
-
-WITH_BF_CYCLES_OSL = False # OSL never worked on OSX 32bit !
-

build_files/buildbot/config/user-config-mac-x86_64.py

@@ -1,5 +0,0 @@
-
-MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
-
-WITH_BF_CYCLES_CUDA_BINARIES = True
-

build_files/buildbot/config/user-config-player-glibc211-i686.py

@@ -1,126 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
-BF_NUMJOBS = 4
-
-# Python configuration
-BF_PYTHON_VERSION = '3.4'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.4'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = False
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = False
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Do not build blender when building blenderplayer
-WITH_BF_NOBLENDER = True
-WITH_BF_PLAYER = True
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# Motion Tracking
-WITH_BF_LIBMV = False
-
-# Ocean Simulation
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']

build_files/buildbot/config/user-config-player-glibc211-x86_64.py

@@ -1,126 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
-BF_NUMJOBS = 4
-
-# Python configuration
-BF_PYTHON_VERSION = '3.4'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.4'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = False
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = False
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Do not build blender when building blenderplayer
-WITH_BF_NOBLENDER = True
-WITH_BF_PLAYER = True
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# Motion Tracking
-WITH_BF_LIBMV = False
-
-# Ocean Simulation
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']

build_files/buildbot/config/user-config-player-i686.py

@@ -0,0 +1,99 @@
+BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
+BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
+
+# Python configuration
+BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON = '/opt/python3'
+
+WITH_BF_STATICPYTHON = True
+
+# OpenCollada configuration
+WITH_BF_COLLADA = False
+
+# FFMPEG configuration
+WITH_BF_FFMPEG = True
+WITH_BF_STATICFFMPEG = True
+
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
+BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
+
+# Don't depend on system's libstdc++
+WITH_BF_STATICCXX = True
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = True
+BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
+
+WITH_BF_GETTEXT_STATIC = True
+BF_FREETYPE_LIB_STATIC = True
+
+WITH_BF_OPENEXR = False
+WITH_BF_STATICOPENEXR = True
+
+WITH_BF_TIFF = False
+WITH_BF_STATICTIFF = True
+BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
+
+WITH_BF_JPEG = True
+BF_JPEG_LIB = 'libjpeg'
+BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib32'
+
+WITH_BF_PNG = True
+BF_PNG_LIB = 'libpng'
+BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32'
+
+WITH_BF_STATICLIBSAMPLERATE = True
+
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
+
+WITH_BF_SDL = True
+WITH_BF_OGG = False
+
+WITH_BF_OPENMP = True
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_BULLET = True
+
+# Do not build blender when building blenderplayer
+WITH_BF_NOBLENDER = True
+WITH_BF_PLAYER = True
+
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32'
+
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+
+# JACK
+WITH_BF_JACK = True
+
+# Motion Tracking
+WITH_BF_LIBMV = False
+
+# Ocean Simulation
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+WITH_BF_OCEANSIM = True
+
+# Compilation and optimization
+BF_DEBUG = False
+REL_CCFLAGS = ['-O2']  # C & C++
+PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32']

build_files/buildbot/config/user-config-player-x86_64.py

@@ -0,0 +1,99 @@
+BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
+BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
+
+# Python configuration
+BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON = '/opt/python3'
+
+WITH_BF_STATICPYTHON = True
+
+# OpenCollada configuration
+WITH_BF_COLLADA = False
+
+# FFMPEG configuration
+WITH_BF_FFMPEG = True
+WITH_BF_STATICFFMPEG = True
+
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
+BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
+
+# Don't depend on system's libstdc++
+WITH_BF_STATICCXX = True
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = True
+BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
+
+WITH_BF_GETTEXT_STATIC = True
+BF_FREETYPE_LIB_STATIC = True
+
+WITH_BF_OPENEXR = False
+WITH_BF_STATICOPENEXR = True
+
+WITH_BF_TIFF = False
+WITH_BF_STATICTIFF = True
+BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
+
+WITH_BF_JPEG = True
+BF_JPEG_LIB = 'libjpeg'
+BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64'
+
+WITH_BF_STATICLIBSAMPLERATE = True
+
+WITH_BF_PNG = True
+BF_PNG_LIB = 'libpng'
+BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
+
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
+
+WITH_BF_SDL = True
+WITH_BF_OGG = False
+
+WITH_BF_OPENMP = True
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_BULLET = True
+
+# Do not build blender when building blenderplayer
+WITH_BF_NOBLENDER = True
+WITH_BF_PLAYER = True
+
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+
+# JACK
+WITH_BF_JACK = True
+
+# Motion Tracking
+WITH_BF_LIBMV = False
+
+# Ocean Simulation
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+WITH_BF_OCEANSIM = True
+
+# Compilation and optimization
+BF_DEBUG = False
+REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

build_files/buildbot/config/user-config-x86_64.py

@@ -0,0 +1,122 @@
+BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
+BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
+
+# Python configuration
+BF_PYTHON_VERSION = '3.2'
+BF_PYTHON_ABI_FLAGS = 'mu'
+BF_PYTHON = '/opt/python3'
+
+WITH_BF_STATICPYTHON = True
+
+# OpenCollada configuration
+WITH_BF_COLLADA = True
+BF_OPENCOLLADA = '/opt/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
+BF_PCRE_LIB = ''
+BF_EXPAT_LIB = ''
+
+# FFMPEG configuration
+WITH_BF_FFMPEG = True
+WITH_BF_STATICFFMPEG = True
+
+BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
+BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libfaad.a'
+
+# Don't depend on system's libstdc++
+WITH_BF_STATICCXX = True
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = True
+BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a'
+
+WITH_BF_GETTEXT_STATIC = True
+BF_FREETYPE_LIB_STATIC = True
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = True
+
+WITH_BF_TIFF = True
+WITH_BF_STATICTIFF = True
+BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
+
+WITH_BF_JPEG = True
+BF_JPEG_LIB = 'libjpeg'
+BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64'
+
+WITH_BF_PNG = True
+BF_PNG_LIB = 'libpng'
+BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64'
+
+WITH_BF_STATICLIBSAMPLERATE = True
+
+WITH_BF_ZLIB = True
+WITH_BF_STATICZLIB = True
+BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
+
+WITH_BF_SDL = True
+WITH_BF_OGG = True
+
+WITH_BF_OPENMP = True
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_BULLET = True
+
+# Blender player (would be enabled in it's own config)
+WITH_BF_PLAYER = False
+
+# Use jemalloc memory manager
+WITH_BF_JEMALLOC = True
+WITH_BF_STATICJEMALLOC = True
+BF_JEMALLOC = '/home/sources/staticlibs/jemalloc'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64'
+
+# Use 3d mouse library
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = True
+BF_3DMOUSE = '/home/sources/staticlibs/spnav'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
+# JACK
+WITH_BF_JACK = True
+
+# Cycles
+WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+
+WITH_BF_OIIO = True
+WITH_BF_STATICOIIO = True
+BF_OIIO = '/opt/oiio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
+# Ocean Simulation
+WITH_BF_OCEANSIM = True
+
+# Compilation and optimization
+BF_DEBUG = False
+REL_CCFLAGS = ['-O2', '-msse', '-msse2']  # C & C++
+PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']

build_files/buildbot/master.cfg

@@ -3,57 +3,6 @@
 
 # <pep8 compliant>
 
-# List of the branches being built automatically overnight
-NIGHT_SCHEDULE_BRANCHES=[None, "gooseberry"]
-
-# List of the branches available for force build
-FORCE_SCHEDULE_BRANCHES=["master", "gooseberry", "experimental-build"]
-
-"""
-Stock Twisted directory lister doesn't provide any information about last file
-modification time, we hack the class a bit in order to have such functionaliity
-:)
-"""
-
-from buildbot.status.web.base import DirectoryLister
-
-def get_files_and_directories(self, directory):
-    from twisted.web.static import (getTypeAndEncoding,
-                                    formatFileSize)
-    import urllib
-    import cgi
-    import time
-    import os
-    files = []
-    dirs = []
-    for path in directory:
-        url = urllib.quote(path, "/")
-        escapedPath = cgi.escape(path)
-        lastmodified = time.ctime(os.path.getmtime(
-            os.path.join(self.path, path)))
-        if os.path.isdir(os.path.join(self.path, path)):
-            url = url + '/'
-            dirs.append({'text': escapedPath + "/", 'href': url,
-                         'size': '', 'type': '[Directory]',
-                         'encoding': '',
-                         'lastmodified': lastmodified})
-        else:
-            mimetype, encoding = getTypeAndEncoding(path, self.contentTypes,
-                                                    self.contentEncodings,
-                                                    self.defaultType)
-            try:
-                size = os.stat(os.path.join(self.path, path)).st_size
-            except OSError:
-                continue
-            files.append({
-                'text': escapedPath, "href": url,
-                'type': '[%s]' % mimetype,
-                'encoding': (encoding and '[%s]' % encoding or ''),
-                'size': formatFileSize(size),
-                'lastmodified': lastmodified})
-    return dirs, files
-DirectoryLister._getFilesAndDirectories = get_files_and_directories
-
 # Dictionary that the buildmaster pays attention to.
 c = BuildmasterConfig = {}
 
@@ -77,93 +26,24 @@ c['slavePortnum'] = 9989
 # CHANGE SOURCES
 
 from buildbot.changes.svnpoller import SVNPoller
-from buildbot.changes.gitpoller import GitPoller
 
-c['change_source'] = GitPoller(
-       'git://git.blender.org/blender.git',
+c['change_source'] = SVNPoller(
+       'https://svn.blender.org/svnroot/bf-blender/trunk/',
        pollinterval=1200)
 
-
-# CODEBASES
-#
-# Allow to controll separately things like branches for each repo and submodules.
-
-all_repositories = {
-    r'git://git.blender.org/blender.git': 'blender',
-    r'git://git.blender.org/blender-translations.git': 'blender-translations',
-    r'git://git.blender.org/blender-addons.git': 'blender-addons',
-    r'git://git.blender.org/blender-addons-contrib.git': 'blender-addons-contrib',
-    r'git://git.blender.org/scons.git': 'scons',
-    r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn',
-}
-
-def codebaseGenerator(chdict):
-    return all_repositories[chdict['repository']]
-
-c['codebaseGenerator'] = codebaseGenerator
-
-
-# SCHEDULERS
-#
-# Decide how to react to incoming changes.
-
-# from buildbot.scheduler import Scheduler
-from buildbot.schedulers import timed, forcesched
-
-c['schedulers'] = []
-
-def schedule_force_build(name):
-    c['schedulers'].append(forcesched.ForceScheduler(name='force ' + name,
-        builderNames=[name],
-        codebases=[forcesched.CodebaseParameter(
-                codebase="blender",
-                branch=forcesched.ChoiceStringParameter(
-                    name="branch", choices=FORCE_SCHEDULE_BRANCHES, default="master"),
-                # Do not hide revision, can be handy!
-                repository=forcesched.FixedParameter(name="repository", default="", hide=True),
-                project=forcesched.FixedParameter(name="project", default="", hide=True)),
-            # For now, hide other codebases.
-            forcesched.CodebaseParameter(hide=True, codebase="blender-translations"),
-            forcesched.CodebaseParameter(hide=True, codebase="blender-addons"),
-            forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"),
-            forcesched.CodebaseParameter(hide=True, codebase="scons"),
-            forcesched.CodebaseParameter(hide=True, codebase="lib svn")],
-        properties=[]))
-
-
-def schedule_build(name, hour, minute=0):
-    for current_branch in NIGHT_SCHEDULE_BRANCHES:
-        scheduler_name = "nightly " + name
-        if current_branch:
-            scheduler_name += ' ' + current_branch
-        c['schedulers'].append(timed.Nightly(name=scheduler_name,
-            codebases={
-                "blender": {"repository": ""},
-                "blender-translations": {"repository": "", "branch": "master"},
-                "blender-addons": {"repository": "", "branch": "master"},
-                "blender-addons-contrib": {"repository": "", "branch": "master"},
-                "scons": {"repository": "", "branch": "master"},
-                "lib svn": {"repository": "", "branch": "master"}},
-            branch=current_branch,
-            builderNames=[name],
-            hour=hour,
-            minute=minute))
-
-
 # BUILDERS
 #
-# The 'builders' list defines the Builders, which tell Buildbot how to
-# perform a build: what steps, and which slaves can execute them.
-# Note that any particular build will only take place on one slave.
+# The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
+# what steps, and which slaves can execute them.  Note that any particular build will
+# only take place on one slave.
 
 from buildbot.process.factory import BuildFactory
-from buildbot.process.properties import Interpolate
 from buildbot.steps.source import SVN
-from buildbot.steps.source import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import Compile
 from buildbot.steps.shell import Test
 from buildbot.steps.transfer import FileUpload
+# from buildbot.steps.transfer import FileDownload
 from buildbot.steps.master import MasterShellCommand
 from buildbot.config import BuilderConfig
 
@@ -173,8 +53,7 @@ c['builders'] = []
 buildernames = []
 
 
-def add_builder(c, name, libdir, factory, branch='',
-                rsync=False, hour=3, minute=0):
+def add_builder(c, name, libdir, factory, branch=''):
     slavenames = []
 
     for slave in master_private.slaves:
@@ -182,138 +61,86 @@ def add_builder(c, name, libdir, factory, branch='',
             slavenames.append(slave['name'])
 
     if len(slavenames) > 0:
-        f = factory(name, libdir, branch, rsync)
-        c['builders'].append(BuilderConfig(name=name,
-                                           slavenames=slavenames,
-                                           factory=f,
-                                           category='blender'))
+        f = factory(name, libdir, branch)
+        c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender'))
         buildernames.append(name)
 
-        schedule_build(name, hour, minute)
-        schedule_force_build(name)
-
 # common steps
 
 
-def git_submodule_step(submodule):
-    return Git(name=submodule + '.git',
-               repourl='git://git.blender.org/' + submodule + '.git',
-               mode='update',
-               codebase=submodule,
-               workdir=submodule + '.git')
-
-
-def git_step(branch=''):
+def svn_step(branch=''):
     if branch:
-        return Git(name='blender.git',
-                   repourl='git://git.blender.org/blender.git',
-                   mode='update',
-                   branch=branch,
-                   codebase='blender',
-                   workdir='blender.git',
-                   submodules=True)
+        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/branches/%%BRANCH%%', mode='update', defaultBranch=branch, workdir='blender')
     else:
-        return Git(name='blender.git',
-                   repourl='git://git.blender.org/blender.git',
-                   mode='update',
-                   codebase='blender',
-                   workdir='blender.git',
-                   submodules=True)
+        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
 
 
-def git_submodules_update():
-    command = ['git', 'submodule', 'foreach', '--recursive',
-               'git', 'pull', 'origin', 'master']
-    return ShellCommand(name='Submodules Update',
-                        command=command,
-                        description='updating',
-                        descriptionDone='up to date',
-                        workdir='blender.git')
-
-
-def lib_svn_step(dir):
-    return SVN(name='lib svn',
-               baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir,
-               codebase='lib svn',
-               mode='update',
-               defaultBranch='trunk',
-               workdir='lib/' + dir)
-
-
-def rsync_step(id, branch, rsync_script):
-    return ShellCommand(name='rsync',
-                        command=['python', rsync_script, id, branch],
-                        description='uploading',
-                        descriptionDone='uploaded',
-                        workdir='install')
+def lib_svn_step(libdir):
+    return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir)
 
 # generic builder
 
 
-def generic_builder(id, libdir='', branch='', rsync=False):
-    filename = 'uploaded/buildbot_upload_' + id + '.zip'
-    compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
-    test_script = '../blender.git/build_files/buildbot/slave_test.py'
-    pack_script = '../blender.git/build_files/buildbot/slave_pack.py'
-    rsync_script = '../blender.git/build_files/buildbot/slave_rsync.py'
+def generic_builder(idname, libdir='', branch=''):
+    filename = 'buildbot_upload_' + idname + '.zip'
+    compile_script = '../blender/build_files/buildbot/slave_compile.py'
+    test_script = '../blender/build_files/buildbot/slave_test.py'
+    pack_script = '../blender/build_files/buildbot/slave_pack.py'
     unpack_script = 'master_unpack.py'
 
     f = BuildFactory()
+    f.addStep(svn_step(branch))
     if libdir != '':
         f.addStep(lib_svn_step(libdir))
 
-    for submodule in ('blender-translations',
-                      'blender-addons',
-                      'blender-addons-contrib',
-                      'scons'):
-        f.addStep(git_submodule_step(submodule))
-
-    f.addStep(git_step(branch))
-    f.addStep(git_submodules_update())
-
-    f.addStep(Compile(command=['python', compile_script, id], timeout=3600))
-    f.addStep(Test(command=['python', test_script, id]))
-    f.addStep(ShellCommand(name='package',
-                           command=['python', pack_script, id, branch or Interpolate('%(src:blender:branch)s')],
-                           description='packaging',
-                           descriptionDone='packaged'))
-    if rsync:
-        f.addStep(rsync_step(id, branch, rsync_script))
-    elif id.find('cmake') != -1:
-        f.addStep(FileUpload(name='upload',
-                             slavesrc='buildbot_upload.zip',
-                             masterdest=filename,
-                             maxsize=150 * 1024 * 1024))
+    f.addStep(Compile(command=['python', compile_script, idname]))
+    f.addStep(Test(command=['python', test_script, idname]))
+    f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged'))
+    if 'cmake' in idname:
+        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
     else:
-        f.addStep(FileUpload(name='upload',
-                             slavesrc='buildbot_upload.zip',
-                             masterdest=filename,
-                             maxsize=150 * 1024 * 1024,
-                             workdir='install'))
-    f.addStep(MasterShellCommand(name='unpack',
-                                 command=['python', unpack_script, filename],
-                                 description='unpacking',
-                                 descriptionDone='unpacked'))
+        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
+    f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
     return f
 
 # builders
 
-add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=5)
-add_builder(c, 'mac_i386_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=11)
-add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1)
-add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2)
-add_builder(c, 'win32_scons_vc2013', 'windows_vc12', generic_builder, hour=1)
-add_builder(c, 'win64_scons_vc2013', 'win64_vc12', generic_builder, hour=2)
-add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3)
-add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4)
-#add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4)
-add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3)
-#add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1)
-#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder, hour=2)
+add_builder(c, 'mac_x86_64_scons', 'darwin-9.x.universal', generic_builder)
+add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad')
+add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder)
+add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder)
+#add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
+add_builder(c, 'linux_i386_scons', '', generic_builder)
+add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad')
+add_builder(c, 'linux_x86_64_scons', '', generic_builder)
+add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
+add_builder(c, 'win32_scons', 'windows', generic_builder)
+add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
+add_builder(c, 'win64_scons', 'win64', generic_builder)
+add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
+add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
+#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
+#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
 
-# Multiview branch
-add_builder(c, 'multiview_win64_scons', 'win64', generic_builder, 'multiview', hour=4)
-add_builder(c, 'multiview_win32_scons', 'windows', generic_builder, 'multiview', hour=5)
+# SCHEDULERS
+#
+# Decide how to react to incoming changes.
+
+# from buildbot.scheduler import Scheduler
+from buildbot.schedulers import timed
+
+c['schedulers'] = []
+#c['schedulers'].append(Scheduler(name="all", branch=None,
+#                                 treeStableTimer=None,
+#                                 builderNames=[]))
+#c['schedulers'].append(timed.Periodic(name="nightly",
+#                        builderNames=buildernames,
+#                        periodicBuildTimer=24*60*60))
+
+c['schedulers'].append(timed.Nightly(name='nightly',
+    builderNames=buildernames,
+    hour=3,
+    minute=0))
 
 # STATUS TARGETS
 #
@@ -325,27 +152,20 @@ c['status'] = []
 
 from buildbot.status import html
 from buildbot.status.web import authz
-from buildbot.status.web import auth
-
-users = []
-for slave in master_private.slaves:
-    users += [(slave['name'], slave['password'])]
 
 authz_cfg = authz.Authz(
-    auth=auth.BasicAuth(users),
     # change any of these to True to enable; see the manual for more
     # options
     gracefulShutdown=False,
     forceBuild=True,  # use this to test your slave once it is set up
     forceAllBuilds=False,
     pingBuilder=False,
-    stopBuild=True,
+    stopBuild=False,
     stopAllBuilds=False,
     cancelPendingBuild=True,
 )
 
 c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
-#c['status'].append(html.WebStatus(http_port=8010))
 
 # PROJECT IDENTITY
 

build_files/buildbot/master_unpack.py

@@ -30,12 +30,12 @@ import zipfile
 # extension stripping
 def strip_extension(filename):
     extensions = '.zip', '.tar', '.bz2', '.gz', '.tgz', '.tbz', '.exe'
+    filename_noext, ext = os.path.splitext(filename)
+    if ext in extensions:
+        return strip_extension(filename_noext)  # may have .tar.bz2
+    else:
+        return filename
 
-    for ext in extensions:
-        if filename.endswith(ext):
-            filename = filename[:-len(ext)]
-
-    return filename
 
 # extract platform from package name
 def get_platform(filename):
@@ -48,11 +48,12 @@ def get_platform(filename):
     tokens = filename.split("-")
     platforms = ('osx', 'mac', 'bsd',
                  'win', 'linux', 'source',
-                 'irix', 'solaris', 'mingw')
+                 'solaris',
+                 'mingw')
     platform_tokens = []
     found = False
 
-    for i, token in enumerate(tokens):
+    for token in tokens:
         if not found:
             for platform in platforms:
                 if platform in token.lower():
@@ -64,19 +65,20 @@ def get_platform(filename):
 
     return '-'.join(platform_tokens)
 
+
 def get_branch(filename):
     tokens = filename.split("-")
     branch = ""
-    
-    for token in tokens:
-        if token == "blender":
-            return branch
 
+    for token in tokens:
         if branch == "":
             branch = token
         else:
             branch = branch + "-" + token
 
+        if token == "blender":
+            return branch
+
     return ""
 
 # get filename
@@ -114,12 +116,7 @@ if platform == '':
     sys.exit(1)
 
 # extract
-if not branch or branch == 'master':
-    directory = 'public_html/download'
-elif branch == 'experimental-build':
-    directory = 'public_html/download/experimental'
-else:
-    directory = 'public_html/download'
+directory = 'public_html/download'
 
 try:
     zf = z.open(package)
@@ -129,6 +126,8 @@ try:
 
     zf.close()
     z.close()
+
+    os.remove(filename)
 except Exception, ex:
     sys.stderr.write('Failed to unzip package: %s\n' % str(ex))
     sys.exit(1)

build_files/buildbot/slave_compile.py

@@ -21,7 +21,6 @@
 import os
 import subprocess
 import sys
-import shutil
 
 # get builder name
 if len(sys.argv) < 2:
@@ -31,9 +30,9 @@ if len(sys.argv) < 2:
 builder = sys.argv[1]
 
 # we run from build/ directory
-blender_dir = '../blender.git'
+blender_dir = '../blender'
 
-if 'cmake' in builder:
+if builder.find('cmake') != -1:
     # cmake
 
     # set build options
@@ -46,69 +45,43 @@ if 'cmake' in builder:
     elif builder.endswith('mac_ppc_cmake'):
         cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc')
 
-    if 'win64' in builder:
-        cmake_options.append(['-G','"Visual Studio 12 2013 Win64"'])
-    elif 'win32' in builder:
-        cmake_options.append(['-G','"Visual Studio 12 2013"'])
-
-    cmake_options.append("-C../blender.git/build_files/cmake/config/blender_full.cmake")
-    cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=1")
     # configure and make
     retcode = subprocess.call(['cmake', blender_dir] + cmake_options)
     if retcode != 0:
         sys.exit(retcode)
-    if 'win' in builder:
-        retcode = subprocess.call(['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release'])
-    else:
-        retcode = subprocess.call(['make', '-s', '-j4', 'install'])
+    retcode = subprocess.call(['make', '-s', '-j4', 'install'])
     sys.exit(retcode)
 else:
-    python_bin = 'python'
-    if builder.find('linux') != -1:
-        python_bin = '/opt/lib/python-2.7/bin/python2.7'
-
     # scons
     os.chdir(blender_dir)
-    scons_cmd = [python_bin, 'scons/scons.py']
+    scons_cmd = ['python', 'scons/scons.py']
     scons_options = ['BF_FANCY=False']
 
-    # We're using the same rules as release builder, so tweak
-    # build and install dirs
-    build_dir = os.path.join('..', 'build', builder)
-    install_dir = os.path.join('..', 'install', builder)
-
-    # Clean install directory so we'll be sure there's no
-    # residual libs and files remained from the previous install.
-    if os.path.isdir(install_dir):
-        shutil.rmtree(install_dir)
-
-    buildbot_dir = os.path.dirname(os.path.realpath(__file__))
-    config_dir = os.path.join(buildbot_dir, 'config')
-
     if builder.find('linux') != -1:
-        configs = []
-        if builder.endswith('linux_glibc211_x86_64_scons'):
-            configs = ['user-config-player-glibc211-x86_64.py',
-                       'user-config-cuda-glibc211-x86_64.py',
-                       'user-config-glibc211-x86_64.py'
-                       ]
-            chroot_name = 'buildbot_squeeze_x86_64'
-            cuda_chroot = 'buildbot_squeeze_x86_64'
-        elif builder.endswith('linux_glibc211_i386_scons'):
-            configs = ['user-config-player-glibc211-i686.py',
-                       'user-config-cuda-glibc211-i686.py',
-                       'user-config-glibc211-i686.py']
-            chroot_name = 'buildbot_squeeze_i686'
+        import shutil
 
-            # use 64bit cuda toolkit, so there'll be no memory limit issues
-            cuda_chroot = 'buildbot_squeeze_x86_64'
-
-        # Compilation will happen inside of chroot environment
-        prog_scons_cmd = ['schroot', '-c', chroot_name, '--'] + scons_cmd
-        cuda_scons_cmd = ['schroot', '-c', cuda_chroot, '--'] + scons_cmd
+        # We're using the same rules as release builder, so tweak
+        # build and install dirs
+        build_dir = os.path.join('..', 'build', builder)
+        install_dir = os.path.join('..', 'install', builder)
 
         common_options = ['BF_INSTALLDIR=' + install_dir] + scons_options
 
+        # Clean install directory so we'll be sure there's no
+        if os.path.isdir(install_dir):
+            shutil.rmtree(install_dir)
+
+        buildbot_dir = os.path.dirname(os.path.realpath(__file__))
+        config_dir = os.path.join(buildbot_dir, 'config')
+
+        configs = []
+        if builder.endswith('linux_x86_64_scons'):
+            configs = ['user-config-player-x86_64.py',
+                       'user-config-x86_64.py']
+        elif builder.endswith('linux_i386_scons'):
+            configs = ['user-config-player-i686.py',
+                       'user-config-i686.py']
+
         for config in configs:
             config_fpath = os.path.join(config_dir, config)
 
@@ -121,24 +94,14 @@ else:
 
             scons_options += common_options
 
-            if config.find('player') != -1:
-                scons_options.append('blenderplayer')
-                cur_scons_cmd = prog_scons_cmd
-            elif config.find('cuda') != -1:
-                scons_options.append('cudakernels')
-                cur_scons_cmd = cuda_scons_cmd
-
-                if config.find('i686') != -1:
-                    scons_options.append('BF_BITNESS=32')
-                elif config.find('x86_64') != -1:
-                    scons_options.append('BF_BITNESS=64')
-            else:
+            if config.find('player') == -1:
                 scons_options.append('blender')
-                cur_scons_cmd = prog_scons_cmd
+            else:
+                scons_options.append('blenderplayer')
 
             scons_options.append('BF_CONFIG=' + config_fpath)
 
-            retcode = subprocess.call(cur_scons_cmd + scons_options)
+            retcode = subprocess.call(scons_cmd + scons_options)
             if retcode != 0:
                 print('Error building rules wuth config ' + config)
                 sys.exit(retcode)
@@ -151,40 +114,11 @@ else:
             if builder.find('win64') != -1:
                 bitness = '64'
 
-            scons_options.append('BF_INSTALLDIR=' + install_dir)
-            scons_options.append('BF_BUILDDIR=' + build_dir)
             scons_options.append('BF_BITNESS=' + bitness)
             scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
             scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
             if builder.find('mingw') != -1:
                 scons_options.append('BF_TOOLSET=mingw')
-            if builder.endswith('vc2013'):
-                scons_options.append('MSVS_VERSION=12.0')
-                scons_options.append('MSVC_VERSION=12.0')
-                scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=1')
-                scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
-            scons_options.append('BF_NUMJOBS=1')
-
-        elif builder.find('mac') != -1:
-            if builder.find('x86_64') != -1:
-                config = 'user-config-mac-x86_64.py'
-            else:
-                config = 'user-config-mac-i386.py'
-
-            scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
-
-        if builder.find('win') != -1:
-            if not os.path.exists(install_dir):
-                os.makedirs(install_dir)
-            if builder.endswith('vc2013'):
-                dlls = ('msvcp120.dll', 'msvcr120.dll', 'vcomp120.dll')
-            if builder.find('win64') == -1:
-                dlls_path = '..\\..\\..\\redist\\x86'
-            else:
-                dlls_path = '..\\..\\..\\redist\\amd64'
-            for dll in dlls:
-                shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
-
-        retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
 
+        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)

build_files/buildbot/slave_pack.py

@@ -33,39 +33,35 @@ if len(sys.argv) < 2:
     sys.exit(1)
 
 builder = sys.argv[1]
-# Never write branch if it is master.
-branch = sys.argv[2] if (len(sys.argv) >= 3 and sys.argv[2] != 'master') else ''
+branch = ''
+
+if len(sys.argv) >= 3:
+    branch = sys.argv[2]
 
 # scons does own packaging
 if builder.find('scons') != -1:
-    python_bin = 'python'
-    if builder.find('linux') != -1:
-        python_bin = '/opt/lib/python-2.7/bin/python2.7'
-
-    os.chdir('../blender.git')
+    os.chdir('../blender')
     scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False']
 
-    buildbot_dir = os.path.dirname(os.path.realpath(__file__))
-    config_dir = os.path.join(buildbot_dir, 'config')
-    build_dir = os.path.join('..', 'build', builder)
-    install_dir = os.path.join('..', 'install', builder)
-
     if builder.find('linux') != -1:
+        buildbot_dir = os.path.dirname(os.path.realpath(__file__))
+        config_dir = os.path.join(buildbot_dir, 'config')
+        build_dir = os.path.join('..', 'build', builder)
+        install_dir = os.path.join('..', 'install', builder)
+
         scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False',
-                          'BF_BUILDDIR=' + build_dir,
-                          'BF_INSTALLDIR=' + install_dir,
-                          'WITHOUT_BF_INSTALL=True']
+            'BF_BUILDDIR=' + build_dir,
+            'BF_INSTALLDIR=' + install_dir,
+            'WITHOUT_BF_INSTALL=True']
 
         config = None
         bits = None
 
-        if builder.endswith('linux_glibc211_x86_64_scons'):
-            config = 'user-config-glibc211-x86_64.py'
-            chroot_name = 'buildbot_squeeze_x86_64'
+        if builder.endswith('linux_x86_64_scons'):
+            config = 'user-config-x86_64.py'
             bits = 64
-        elif builder.endswith('linux_glibc211_i386_scons'):
-            config = 'user-config-glibc211-i686.py'
-            chroot_name = 'buildbot_squeeze_i686'
+        elif builder.endswith('linux_i386_scons'):
+            config = 'user-config-i686.py'
             bits = 32
 
         if config is not None:
@@ -74,7 +70,7 @@ if builder.find('scons') != -1:
 
         blender = os.path.join(install_dir, 'blender')
         blenderplayer = os.path.join(install_dir, 'blenderplayer')
-        subprocess.call(['schroot', '-c', chroot_name, '--', 'strip', '--strip-all', blender, blenderplayer])
+        subprocess.call(['strip', '--strip-all', blender, blenderplayer])
 
         extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
         mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
@@ -84,7 +80,7 @@ if builder.find('scons') != -1:
         os.system('cp %s %s' % (software_gl, install_dir))
         os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
 
-        retcode = subprocess.call(['schroot', '-c', chroot_name, '--', python_bin, 'scons/scons.py'] + scons_options)
+        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
 
         sys.exit(retcode)
     else:
@@ -94,49 +90,14 @@ if builder.find('scons') != -1:
             if builder.find('win64') != -1:
                 bitness = '64'
 
-            scons_options.append('BF_INSTALLDIR=' + install_dir)
-            scons_options.append('BF_BUILDDIR=' + build_dir)
             scons_options.append('BF_BITNESS=' + bitness)
             scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
             scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
             if builder.find('mingw') != -1:
                 scons_options.append('BF_TOOLSET=mingw')
-            if builder.endswith('vc2013'):
-                scons_options.append('MSVS_VERSION=12.0')
-                scons_options.append('MSVC_VERSION=12.0')
 
-        elif builder.find('mac') != -1:
-            if builder.find('x86_64') != -1:
-                config = 'user-config-mac-x86_64.py'
-            else:
-                config = 'user-config-mac-i386.py'
-
-            scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
-
-        retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
+        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
-else:
-#cmake
-    if 'win' in builder:
-        files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')]
-        for f in files:
-            os.remove(f)
-        retcode = subprocess.call(['cpack', '-G','ZIP'])
-        result_file = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')][0]
-        os.rename(result_file, "{}.zip".format(builder))
-        # create zip file
-        try:
-            upload_zip = "buildbot_upload.zip"
-            if os.path.exists(upload_zip):
-                os.remove(upload_zip)
-            z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)
-            z.write("{}.zip".format(builder))
-            z.close()
-            sys.exit(retcode)
-        except Exception, ex:
-            sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
-            sys.exit(1)
-
 
 # clean release directory if it already exists
 release_dir = 'release'

build_files/buildbot/slave_rsync.py

@@ -1,43 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-# Runs on buildbot slave, rsync zip directly to buildbot server rather
-# than using upload which is much slower
-
-import os
-import sys
-
-# get builder name
-if len(sys.argv) < 2:
-    sys.stderr.write("Not enough arguments, expecting builder name\n")
-    sys.exit(1)
-
-builder = sys.argv[1]
-
-# rsync, this assumes ssh keys are setup so no password is needed
-local_zip = "buildbot_upload.zip"
-remote_folder = "builder.blender.org:/data/buildbot-master/uploaded/"
-remote_zip = remote_folder + "buildbot_upload_" + builder + ".zip"
-command = "rsync -avz %s %s" % (local_zip, remote_zip)
-
-print(command)
-
-ret = os.system(command)
-sys.exit(ret)

build_files/buildbot/slave_test.py

@@ -29,9 +29,9 @@ if len(sys.argv) < 2:
 builder = sys.argv[1]
 
 # we run from build/ directory
-blender_dir = '../blender.git'
+blender_dir = '../blender'
 
-if "cmake" in builder:
+if builder.find('cmake') != -1:
     # cmake
     retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
     sys.exit(retcode)

build_files/cmake/Modules/FindGLEW.cmake

@@ -1,79 +1,59 @@
-# - Find GLEW library
-# Find the native Glew includes and library
-# This module defines
-#  GLEW_INCLUDE_DIRS, where to find glew.h, Set when
-#                        GLEW_INCLUDE_DIR is found.
-#  GLEW_ROOT_DIR, The base directory to search for Glew.
-#                    This can also be an environment variable.
-#  GLEW_FOUND, If false, do not try to use Glew.
 #
-# also defined,
-#  GLEW_LIBRARY, where to find the Glew library.
-#  GLEW_MX_LIBRARY, where to find the GlewMX library.
-
-#=============================================================================
-# Copyright 2014 Blender Foundation.
+# Try to find GLEW library and include path.
+# Once done this will define
 #
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
+# GLEW_FOUND
+# GLEW_INCLUDE_PATH
+# GLEW_LIBRARY
+# 
 
-# If GLEW_ROOT_DIR was defined in the environment, use it.
-IF(NOT GLEW_ROOT_DIR AND NOT $ENV{GLEW_ROOT_DIR} STREQUAL "")
-	SET(GLEW_ROOT_DIR $ENV{GLEW_ROOT_DIR})
-ENDIF()
+IF (WIN32)
+	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
+		$ENV{PROGRAMFILES}/GLEW/include
+		${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
+		DOC "The directory where GL/glew.h resides")
+	IF (NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
+		FIND_LIBRARY( GLEW_LIBRARY
+			NAMES glew64 glew64s
+			PATHS
+			$ENV{PROGRAMFILES}/GLEW/lib
+			${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
+			${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+			DOC "The GLEW library (64-bit)"
+		)
+	ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
+		FIND_LIBRARY( GLEW_LIBRARY
+			NAMES glew GLEW glew32 glew32s
+			PATHS
+			$ENV{PROGRAMFILES}/GLEW/lib
+			${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
+			${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+			DOC "The GLEW library"
+		)
+	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
+ELSE (WIN32)
+	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
+		/usr/include
+		/usr/local/include
+		/sw/include
+		/opt/local/include
+		DOC "The directory where GL/glew.h resides")
+	FIND_LIBRARY( GLEW_LIBRARY
+		NAMES GLEW glew
+		PATHS
+		/usr/lib64
+		/usr/lib
+		/usr/local/lib64
+		/usr/local/lib
+		/sw/lib
+		/opt/local/lib
+		DOC "The GLEW library")
+ENDIF (WIN32)
 
-SET(_glew_SEARCH_DIRS
-  ${GLEW_ROOT_DIR}
-  /usr/local
-)
+IF (GLEW_INCLUDE_PATH)
+	SET(GLEW_FOUND TRUE)
+ELSE (GLEW_INCLUDE_PATH)
+	SET(GLEW_FOUND FALSE)
+ENDIF (GLEW_INCLUDE_PATH)
 
-FIND_PATH(GLEW_INCLUDE_DIR
-  NAMES
-    GL/glew.h
-  HINTS
-    ${_glew_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(GLEW_LIBRARY
-  NAMES
-    GLEW
-  HINTS
-    ${_glew_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-
-FIND_LIBRARY(GLEW_MX_LIBRARY
-  NAMES
-    GLEWmx
-  HINTS
-    ${_glew_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG
-    GLEW_LIBRARY GLEW_INCLUDE_DIR)
-
-IF(GLEW_FOUND)
-  SET(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
-ENDIF(GLEW_FOUND)
-
-MARK_AS_ADVANCED(
-  GLEW_INCLUDE_DIR
-  GLEW_LIBRARY
-  GLEW_MX_LIBRARY
-)
-
-UNSET(_glew_SEARCH_DIRS)
+MARK_AS_ADVANCED( GLEW_FOUND )

build_files/cmake/Modules/FindIcuLinux.cmake

@@ -1,146 +0,0 @@
-# - Find static icu libraries
-# Find the native static icu libraries (needed for static boost_locale :/ ).
-# This module defines
-#  ICU_LIBRARIES, libraries to link against to use icu.
-#  ICU_ROOT_DIR, The base directory to search for icu.
-#                    This can also be an environment variable.
-#  ICU_FOUND, If false, do not try to use icu.
-#
-# also defined, but not for general use are
-#  ICU_LIBRARY_xxx, where to find the icu libraries.
-
-#=============================================================================
-# Copyright 2012 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If ICU_ROOT_DIR was defined in the environment, use it.
-IF(NOT ICU_ROOT_DIR AND NOT $ENV{ICU_ROOT_DIR} STREQUAL "")
-  SET(ICU_ROOT_DIR $ENV{ICU_ROOT_DIR})
-ENDIF()
-
-if(Boost_USE_STATIC_LIBS)
-  set(_icu_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-endif()
-
-SET(_icu_SEARCH_DIRS
-  ${ICU_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-# We don't need includes, only libs to link against...
-#FIND_PATH(ICU_INCLUDE_DIR
-#  NAMES
-#    utf.h
-#  HINTS
-#    ${_icu_SEARCH_DIRS}
-#  PATH_SUFFIXES
-#    include/unicode
-#)
-
-FIND_LIBRARY(ICU_LIBRARY_DATA
-  NAMES
-    icudata
-  HINTS
-    ${_icu_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-FIND_LIBRARY(ICU_LIBRARY_I18N
-  NAMES
-    icui18n
-  HINTS
-    ${_icu_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-FIND_LIBRARY(ICU_LIBRARY_IO
-  NAMES
-    icuio
-  HINTS
-    ${_icu_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-FIND_LIBRARY(ICU_LIBRARY_LE
-  NAMES
-    icule
-  HINTS
-    ${_icu_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-FIND_LIBRARY(ICU_LIBRARY_LX
-  NAMES
-    iculx
-  HINTS
-    ${_icu_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-FIND_LIBRARY(ICU_LIBRARY_TU
-  NAMES
-    icutu
-  HINTS
-    ${_icu_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-FIND_LIBRARY(ICU_LIBRARY_UC
-  NAMES
-    icuuc
-  HINTS
-    ${_icu_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# Restore the original find library ordering
-if(Boost_USE_STATIC_LIBS)
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ${_icu_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set ICU_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Icu DEFAULT_MSG
-    ICU_LIBRARY_DATA
-    ICU_LIBRARY_I18N
-    ICU_LIBRARY_IO
-    ICU_LIBRARY_LE
-    ICU_LIBRARY_LX
-    ICU_LIBRARY_TU
-    ICU_LIBRARY_UC
-)
-
-IF(ICU_FOUND)
-  SET(ICU_LIBRARIES ${ICU_LIBRARY_DATA} ${ICU_LIBRARY_I18N} ${ICU_LIBRARY_IO} ${ICU_LIBRARY_LE} ${ICU_LIBRARY_LX} ${ICU_LIBRARY_TU} ${ICU_LIBRARY_UC})
-  SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
-ENDIF(ICU_FOUND)
-
-MARK_AS_ADVANCED(
-  ICU_INCLUDE_DIR
-  ICU_LIBRARY_DATA
-  ICU_LIBRARY_I18N
-  ICU_LIBRARY_IO
-  ICU_LIBRARY_LE
-  ICU_LIBRARY_LX
-  ICU_LIBRARY_TU
-  ICU_LIBRARY_UC
-)

build_files/cmake/Modules/FindOpenCOLLADA.cmake

@@ -66,7 +66,6 @@ SET(_opencollada_SEARCH_DIRS
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
-  /opt/lib/opencollada
 )
 
 SET(_opencollada_INCLUDES)
@@ -140,8 +139,3 @@ IF(OPENCOLLADA_FOUND)
   SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES})
   SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES})
 ENDIF(OPENCOLLADA_FOUND)
-
-UNSET(COMPONENT)
-UNSET(UPPERCOMPONENT)
-UNSET(_opencollada_LIBRARIES)
-UNSET(_opencollada_INCLUDES)

build_files/cmake/Modules/FindOpenColorIO.cmake

@@ -1,95 +0,0 @@
-# - Find OpenColorIO library
-# Find the native OpenColorIO includes and library
-# This module defines
-#  OPENCOLORIO_INCLUDE_DIRS, where to find OpenColorIO.h, Set when
-#                            OPENCOLORIO_INCLUDE_DIR is found.
-#  OPENCOLORIO_LIBRARIES, libraries to link against to use OpenColorIO.
-#  OPENCOLORIO_ROOT_DIR, The base directory to search for OpenColorIO.
-#                        This can also be an environment variable.
-#  OPENCOLORIO_FOUND, If false, do not try to use OpenColorIO.
-#
-# also defined, but not for general use are
-#  OPENCOLORIO_LIBRARY, where to find the OpenColorIO library.
-
-#=============================================================================
-# Copyright 2012 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENCOLORIO_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENCOLORIO_ROOT_DIR AND NOT $ENV{OPENCOLORIO_ROOT_DIR} STREQUAL "")
-  SET(OPENCOLORIO_ROOT_DIR $ENV{OPENCOLORIO_ROOT_DIR})
-ENDIF()
-
-SET(_opencolorio_FIND_COMPONENTS
-  OpenColorIO
-  yaml-cpp
-  tinyxml
-)
-
-SET(_opencolorio_SEARCH_DIRS
-  ${OPENCOLORIO_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/lib/ocio
-)
-
-FIND_PATH(OPENCOLORIO_INCLUDE_DIR
-  NAMES
-    OpenColorIO/OpenColorIO.h
-  HINTS
-    ${_opencolorio_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-SET(_opencolorio_LIBRARIES)
-FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_opencolorio_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-  IF(OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY)
-    LIST(APPEND _opencolorio_LIBRARIES "${OPENCOLORIO_${UPPERCOMPONENT}_LIBRARY}")
-  ENDIF()
-ENDFOREACH()
-
-
-# handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenColorIO DEFAULT_MSG
-    _opencolorio_LIBRARIES OPENCOLORIO_INCLUDE_DIR)
-
-IF(OPENCOLORIO_FOUND)
-  SET(OPENCOLORIO_LIBRARIES ${_opencolorio_LIBRARIES})
-  SET(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO_INCLUDE_DIR})
-ENDIF(OPENCOLORIO_FOUND)
-
-MARK_AS_ADVANCED(
-  OPENCOLORIO_INCLUDE_DIR
-  OPENCOLORIO_LIBRARY
-  OPENCOLORIO_OPENCOLORIO_LIBRARY
-  OPENCOLORIO_TINYXML_LIBRARY
-  OPENCOLORIO_YAML-CPP_LIBRARY
-)
-
-UNSET(COMPONENT)
-UNSET(UPPERCOMPONENT)
-UNSET(_opencolorio_FIND_COMPONENTS)
-UNSET(_opencolorio_LIBRARIES)
-UNSET(_opencolorio_SEARCH_DIRS)

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -34,9 +34,6 @@ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
   SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
 ENDIF()
 
-# Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
-SET(_openexr_libs_ver_init "2.0")
-
 SET(_openexr_FIND_COMPONENTS
   Half
   Iex
@@ -55,58 +52,20 @@ SET(_openexr_SEARCH_DIRS
 
 FIND_PATH(OPENEXR_INCLUDE_DIR
   NAMES
-    OpenEXR/ImfXdr.h
+    ImfXdr.h
   HINTS
     ${_openexr_SEARCH_DIRS}
   PATH_SUFFIXES
-    include
+    include/OpenEXR
 )
 
-# If the headers were found, get the version from config file, if not already set.
-IF(OPENEXR_INCLUDE_DIR)
-  IF(NOT OPENEXR_VERSION)
-
-    FIND_FILE(_openexr_CONFIG
-      NAMES
-        OpenEXRConfig.h
-      PATHS
-        "${OPENEXR_INCLUDE_DIR}"
-        "${OPENEXR_INCLUDE_DIR}/OpenEXR"
-      NO_DEFAULT_PATH
-    )
-
-    IF(_openexr_CONFIG)
-      FILE(STRINGS "${_openexr_CONFIG}" OPENEXR_BUILD_SPECIFICATION
-           REGEX "^[ \t]*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
-    ELSE()
-      MESSAGE(WARNING "Could not find \"OpenEXRConfig.h\" in \"${OPENEXR_INCLUDE_DIR}\"")
-    ENDIF()
-
-    IF(OPENEXR_BUILD_SPECIFICATION)
-      MESSAGE(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
-      STRING(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
-             "\\1" _openexr_libs_ver_init ${OPENEXR_BUILD_SPECIFICATION})
-    ELSE()
-      MESSAGE(WARNING "Could not determine ILMBase library version, assuming ${_openexr_libs_ver_init}.")
-    ENDIF()
-
-    UNSET(_openexr_CONFIG CACHE)
-
-  ENDIF()
-ENDIF()
-
-SET("OPENEXR_VERSION" ${_openexr_libs_ver_init} CACHE STRING "Version of OpenEXR lib")
-UNSET(_openexr_libs_ver_init)
-
-STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
-
 SET(_openexr_LIBRARIES)
 FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
 
   FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
     NAMES
-      ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT} 
+      ${COMPONENT}
     HINTS
       ${_openexr_SEARCH_DIRS}
     PATH_SUFFIXES
@@ -115,8 +74,6 @@ FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
   LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
 ENDFOREACH()
 
-UNSET(_openexr_libs_ver)
-
 # handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -125,21 +82,11 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR  DEFAULT_MSG
 
 IF(OPENEXR_FOUND)
   SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-  # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
-  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
+  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
 ENDIF()
 
-MARK_AS_ADVANCED(
-  OPENEXR_INCLUDE_DIR
-  OPENEXR_VERSION
-)
+MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR)
 FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
   STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
   MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
 ENDFOREACH()
-
-UNSET(COMPONENT)
-UNSET(UPPERCOMPONENT)
-UNSET(_openexr_FIND_COMPONENTS)
-UNSET(_openexr_LIBRARIES)
-UNSET(_openexr_SEARCH_DIRS)

build_files/cmake/Modules/FindOpenGLES.cmake

@@ -1,77 +0,0 @@
-# - Try to find OpenGLES
-# Once done this will define
-#
-#  OPENGLES_FOUND           - system has OpenGLES and EGL
-#  OPENGL_EGL_FOUND         - system has EGL
-#  OPENGLES_INCLUDE_DIR     - the GLES include directory
-#  OPENGLES_LIBRARY         - the GLES library
-#  OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
-#  OPENGLES_EGL_LIBRARY     - the EGL library
-#  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
-#  OPENGLES_INCLUDES        - all includes needed for OpenGLES
-
-# If OPENGLES_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENGLES_ROOT_DIR AND NOT $ENV{OPENGLES_ROOT_DIR} STREQUAL "")
-  SET(OPENGLES_ROOT_DIR $ENV{OPENGLES_ROOT_DIR})
-ENDIF()
-
-SET(_opengles_SEARCH_DIRS
-  ${OPENGLES_ROOT_DIR}
-  /usr/local
-)
-
-FIND_PATH(OPENGLES_INCLUDE_DIR
-  NAMES
-    GLES2/gl2.h
-  HINTS
-    ${_opengles_SEARCH_DIRS}
-)
-
-FIND_LIBRARY(OPENGLES_LIBRARY
-  NAMES
-    GLESv2
-  PATHS
-    ${_opengles_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-FIND_PATH(OPENGLES_EGL_INCLUDE_DIR
-  NAMES
-    EGL/egl.h
-  HINTS
-    ${_opengles_SEARCH_DIRS}
-)
-
-FIND_LIBRARY(OPENGLES_EGL_LIBRARY
-  NAMES
-    EGL
-  HINTS
-    ${_opengles_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
-  SET(OPENGL_EGL_FOUND "YES")
-ELSE()
-  SET(OPENGL_EGL_FOUND "NO")
-ENDIF()
-
-IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
-   OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
-  SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
-                           ${OPENGLES_EGL_LIBRARY})
-  SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
-  SET(OPENGLES_FOUND "YES")
-ELSE()
-  SET(OPENGLES_FOUND "NO")
-ENDIF()
-
-MARK_AS_ADVANCED(
-  OPENGLES_EGL_INCLUDE_DIR
-  OPENGLES_EGL_LIBRARY
-  OPENGLES_INCLUDE_DIR
-)
-
-UNSET(_opengles_SEARCH_DIRS)

build_files/cmake/Modules/FindOpenImageIO.cmake

@@ -33,7 +33,6 @@ SET(_openimageio_SEARCH_DIRS
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
-  /opt/lib/oiio
 )
 
 FIND_PATH(OPENIMAGEIO_INCLUDE_DIR
@@ -69,5 +68,3 @@ MARK_AS_ADVANCED(
   OPENIMAGEIO_INCLUDE_DIR
   OPENIMAGEIO_LIBRARY
 )
-
-UNSET(_openimageio_SEARCH_DIRS)

build_files/cmake/Modules/FindOpenJPEG.cmake

@@ -42,7 +42,6 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR
     ${_openjpeg_SEARCH_DIRS}
   PATH_SUFFIXES
     include
-    include/openjpeg-1.5
 )
 
 FIND_LIBRARY(OPENJPEG_LIBRARY
@@ -69,5 +68,3 @@ MARK_AS_ADVANCED(
   OPENJPEG_INCLUDE_DIR
   OPENJPEG_LIBRARY
 )
-
-UNSET(_openjpeg_SEARCH_DIRS)

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -2,16 +2,13 @@
 # Find the native Python includes and library
 #
 # Note:, This is not _yet_ intended to be a general python module for other
-#  projects to use since its hard coded to fixed Python version
-#  as Blender only supports a single Python version at the moment.
-#
-# Note:
-#  this is for Blender/Unix Python only.
+#  projects to use since its hard coded to python 3.2 as blender only supports
+#  a single python version.
+#  This is for blender/unix python only.
 #
 # This module defines
 #  PYTHON_VERSION
 #  PYTHON_INCLUDE_DIRS
-#  PYTHON_INCLUDE_CONFIG_DIRS
 #  PYTHON_LIBRARIES
 #  PYTHON_LIBPATH, Used for installation
 #  PYTHON_LINKFLAGS
@@ -37,7 +34,7 @@ IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} STREQUAL "")
   SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
 ENDIF()
 
-SET(PYTHON_VERSION 3.4 CACHE STRING "Python Version (major and minor only)")
+SET(PYTHON_VERSION 3.2 CACHE STRING "Python Version (major and minor only)")
 MARK_AS_ADVANCED(PYTHON_VERSION)
 
 
@@ -49,29 +46,21 @@ MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
 
 # if the user passes these defines as args, we dont want to overwrite
 SET(_IS_INC_DEF OFF)
-SET(_IS_INC_CONF_DEF OFF)
 SET(_IS_LIB_DEF OFF)
-SET(_IS_LIB_PATH_DEF OFF)
 IF(DEFINED PYTHON_INCLUDE_DIR)
   SET(_IS_INC_DEF ON)
 ENDIF()
-IF(DEFINED PYTHON_INCLUDE_CONFIG_DIR)
-  SET(_IS_INC_CONF_DEF ON)
-ENDIF()
 IF(DEFINED PYTHON_LIBRARY)
   SET(_IS_LIB_DEF ON)
 ENDIF()
-IF(DEFINED PYTHON_LIBPATH)
-  SET(_IS_LIB_PATH_DEF ON)
-ENDIF()
 
 
 # only search for the dirs if we havn't already
-IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_LIB_PATH_DEF))
+IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF))
 
   SET(_python_ABI_FLAGS
     "m;mu;u; "    # release
-    "dm;dmu;du;d" # debug
+    "md;mud;ud;d" # debug
   )
 
   STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
@@ -80,7 +69,6 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_
     ${PYTHON_ROOT_DIR}
     "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
     "/opt/py${_PYTHON_VERSION_NO_DOTS}"
-    "/opt/lib/python-${PYTHON_VERSION}"
   )
 
   FOREACH(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS})
@@ -97,27 +85,9 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_
           ${_python_SEARCH_DIRS}
         PATH_SUFFIXES
           include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
-          include/${CMAKE_LIBRARY_ARCHITECTURE}/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
       )
     ENDIF()
 
-    IF(NOT DEFINED PYTHON_INCLUDE_CONFIG_DIR)
-      FIND_PATH(PYTHON_INCLUDE_CONFIG_DIR
-        NAMES
-          pyconfig.h
-        HINTS
-          ${_python_SEARCH_DIRS}
-        PATH_SUFFIXES
-          include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
-          include/${CMAKE_LIBRARY_ARCHITECTURE}/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
-      )
-      IF((NOT PYTHON_INCLUDE_CONFIG_DIR) AND PYTHON_INCLUDE_DIR)
-        # Fallback...
-        UNSET(PYTHON_INCLUDE_CONFIG_DIR CACHE)
-        SET(PYTHON_INCLUDE_CONFIG_DIR ${PYTHON_INCLUDE_DIR} CACHE PATH "")
-      ENDIF()
-    ENDIF()
-
     IF(NOT DEFINED PYTHON_LIBRARY)
       FIND_LIBRARY(PYTHON_LIBRARY
         NAMES
@@ -129,38 +99,16 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_
       )
     ENDIF()
 
-    IF(NOT DEFINED PYTHON_LIBPATH)
-      FIND_PATH(PYTHON_LIBPATH
-        NAMES
-          "python${PYTHON_VERSION}/abc.py" # This is a bit hackish! :/
-        HINTS
-          ${_python_SEARCH_DIRS}
-        PATH_SUFFIXES
-          lib64 lib
-      )
-      IF((NOT PYTHON_LIBPATH) AND PYTHON_LIBRARY)
-        # Fallback...
-        UNSET(PYTHON_LIBPATH CACHE)
-        GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
-      ENDIF()
-    ENDIF()
-
-    IF(PYTHON_LIBRARY AND PYTHON_LIBPATH AND PYTHON_INCLUDE_DIR AND PYTHON_INCLUDE_CONFIG_DIR)
+    IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
       break()
     ELSE()
       # ensure we dont find values from 2 different ABI versions
       IF(NOT _IS_INC_DEF)
         UNSET(PYTHON_INCLUDE_DIR CACHE)
       ENDIF()
-      IF(NOT _IS_INC_CONF_DEF)
-        UNSET(PYTHON_INCLUDE_CONFIG_DIR CACHE)
-      ENDIF()
       IF(NOT _IS_LIB_DEF)
         UNSET(PYTHON_LIBRARY CACHE)
       ENDIF()
-      IF(NOT _IS_LIB_PATH_DEF)
-        UNSET(PYTHON_LIBPATH CACHE)
-      ENDIF()
     ENDIF()
   ENDFOREACH()
 
@@ -172,24 +120,22 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_
 ENDIF()
 
 UNSET(_IS_INC_DEF)
-UNSET(_IS_INC_CONF_DEF)
 UNSET(_IS_LIB_DEF)
-UNSET(_IS_LIB_PATH_DEF)
 
 # handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix  DEFAULT_MSG
-    PYTHON_LIBRARY PYTHON_LIBPATH PYTHON_INCLUDE_DIR PYTHON_INCLUDE_CONFIG_DIR)
+    PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
+
 
 IF(PYTHONLIBSUNIX_FOUND)
   # Assign cache items
-  SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_CONFIG_DIR})
+  SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
   SET(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
 
   # we need this for installation
-  # XXX No more valid with debian-like py3.4 packages...
-#  GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
+  GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
 
   # not used
   # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
@@ -197,7 +143,5 @@ ENDIF()
 
 MARK_AS_ADVANCED(
   PYTHON_INCLUDE_DIR
-  PYTHON_INCLUDE_CONFIG_DIR
   PYTHON_LIBRARY
-  PYTHON_LIBPATH
 )

build_files/cmake/Modules/GTestTesting.cmake

@@ -1,47 +0,0 @@
-#=============================================================================
-# Copyright 2014 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#
-# Inspired on the Testing.cmake from Libmv
-#
-#=============================================================================
-
-macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
-	if(WITH_GTESTS)
-		get_property(_current_include_directories
-		             DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-		             PROPERTY INCLUDE_DIRECTORIES)
-		set(TEST_INC
-			${_current_include_directories}
-			${CMAKE_SOURCE_DIR}/tests/gtests
-			${CMAKE_SOURCE_DIR}/extern/libmv/third_party/glog/src
-			${CMAKE_SOURCE_DIR}/extern/libmv/third_party/gflags
-			${CMAKE_SOURCE_DIR}/extern/gtest/include
-		)
-		unset(_current_include_directories)
-
-		add_executable(${NAME}_test ${SRC})
-		target_link_libraries(${NAME}_test
-		                      ${EXTRA_LIBS}
-		                      bf_testing_main
-		                      bf_intern_guardedalloc
-		                      extern_gtest
-		                      extern_glog)
-		set_target_properties(${NAME}_test PROPERTIES
-		                      RUNTIME_OUTPUT_DIRECTORY         "${TESTS_OUTPUT_DIR}"
-		                      RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}"
-		                      RUNTIME_OUTPUT_DIRECTORY_DEBUG   "${TESTS_OUTPUT_DIR}"
-		                      INCLUDE_DIRECTORIES              "${TEST_INC}")
-		add_test(${NAME}_test ${TESTS_OUTPUT_DIR}/${NAME}_test)
-	endif()
-endmacro()
-
-macro(BLENDER_TEST NAME EXTRA_LIBS)
-	BLENDER_SRC_GTEST("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}")
-endmacro()

build_files/cmake/buildinfo.cmake

@@ -1,133 +1,21 @@
 # This is called by cmake as an extermal process from
 # ./source/creator/CMakeLists.txt to write ./source/creator/buildinfo.h
 
+# The FindSubversion.cmake module is part of the standard distribution
+include(FindSubversion)
+
 # Extract working copy information for SOURCE_DIR into MY_XXX variables
-# with a default in case anything fails, for example when using git-svn
-set(MY_WC_HASH "unknown")
-set(MY_WC_BRANCH "unknown")
-set(MY_WC_COMMIT_TIMESTAMP 0)
-
-# Guess if this is a git working copy and then look up the revision
-if(EXISTS ${SOURCE_DIR}/.git)
-	# The FindGit.cmake module is part of the standard distribution
-	include(FindGit)
-	if(GIT_FOUND)
-		message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
-
-		execute_process(COMMAND git rev-parse --abbrev-ref HEAD
-		                WORKING_DIRECTORY ${SOURCE_DIR}
-		                OUTPUT_VARIABLE MY_WC_BRANCH
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-		if(MY_WC_BRANCH STREQUAL "HEAD")
-			# Detached HEAD, check whether commit hash is reachable
-			# in the master branch
-			execute_process(COMMAND git rev-parse --short HEAD
-			                WORKING_DIRECTORY ${SOURCE_DIR}
-			                OUTPUT_VARIABLE MY_WC_HASH
-			                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-			execute_process(COMMAND git branch --list master --contains ${MY_WC_HASH}
-			                WORKING_DIRECTORY ${SOURCE_DIR}
-			                OUTPUT_VARIABLE _git_contains_check
-			                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-			STRING(REGEX REPLACE "^[ \t]+" "" _git_contains_check "${_git_contains_check}")
-			if(_git_contains_check STREQUAL "master")
-				set(MY_WC_BRANCH "master")
-			else()
-				execute_process(COMMAND git show-ref --tags -d
-				                WORKING_DIRECTORY ${SOURCE_DIR}
-				                OUTPUT_VARIABLE _git_tag_hashes
-				                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-				execute_process(COMMAND git rev-parse HEAD
-				                WORKING_DIRECTORY ${SOURCE_DIR}
-				                OUTPUT_VARIABLE _git_head_hash
-				                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-				if(_git_tag_hashes MATCHES "${_git_head_hash}")
-					set(MY_WC_BRANCH "master")
-				endif()
-
-				unset(_git_tag_hashes)
-				unset(_git_head_hashs)
-			endif()
-
-
-			unset(_git_contains_check)
-		else()
-			execute_process(COMMAND git log HEAD..@{u}
-			                WORKING_DIRECTORY ${SOURCE_DIR}
-			                OUTPUT_VARIABLE _git_below_check
-			                OUTPUT_STRIP_TRAILING_WHITESPACE)
-			if(NOT _git_below_check STREQUAL "")
-				# If there're commits between HEAD and upstream this means
-				# that we're reset-ed to older revision. Use it's hash then.
-				execute_process(COMMAND git rev-parse --short HEAD
-				                WORKING_DIRECTORY ${SOURCE_DIR}
-				                OUTPUT_VARIABLE MY_WC_HASH
-				                OUTPUT_STRIP_TRAILING_WHITESPACE)
-			else()
-				execute_process(COMMAND git rev-parse --short @{u}
-				                WORKING_DIRECTORY ${SOURCE_DIR}
-				                OUTPUT_VARIABLE MY_WC_HASH
-				                OUTPUT_STRIP_TRAILING_WHITESPACE
-				                ERROR_QUIET)
-
-				if(MY_WC_HASH STREQUAL "")
-					# Local branch, not set to upstream.
-					# Well, let's use HEAD for now
-					execute_process(COMMAND git rev-parse --short HEAD
-					                WORKING_DIRECTORY ${SOURCE_DIR}
-					                OUTPUT_VARIABLE MY_WC_HASH
-					                OUTPUT_STRIP_TRAILING_WHITESPACE)
-				endif()
-			endif()
-
-			if(MY_WC_BRANCH MATCHES "^blender-v")
-				set(MY_WC_BRANCH "master")
-			endif()
-
-			unset(_git_below_check)
-		endif()
-
-		execute_process(COMMAND git log -1 --format=%ct
-		                WORKING_DIRECTORY ${SOURCE_DIR}
-		                OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-		# Update GIT index before getting dirty files
-		execute_process(COMMAND git update-index -q --refresh
-		                WORKING_DIRECTORY ${SOURCE_DIR}
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-		execute_process(COMMAND git diff-index --name-only HEAD --
-		                WORKING_DIRECTORY ${SOURCE_DIR}
-		                OUTPUT_VARIABLE _git_changed_files
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-		if(NOT _git_changed_files STREQUAL "")
-			set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
-		else()
-			# Unpushed commits are also considered local modifications
-			execute_process(COMMAND git log @{u}..
-			                WORKING_DIRECTORY ${SOURCE_DIR}
-			                OUTPUT_VARIABLE _git_unpushed_log
-			                OUTPUT_STRIP_TRAILING_WHITESPACE
-			                ERROR_QUIET)
-			if(NOT _git_unpushed_log STREQUAL "")
-				set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
-			endif()
-			unset(_git_unpushed_log)
-		endif()
-
-		unset(_git_changed_files)
+# with a default in case anything fails, for examble when using git-svn
+set(MY_WC_REVISION "unknown")
+# Guess if this is a SVN working copy and then look up the revision
+if(EXISTS ${SOURCE_DIR}/.svn/)
+	if(Subversion_FOUND)
+		Subversion_WC_INFO(${SOURCE_DIR} MY)
 	endif()
 endif()
 
 # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
-# but BUILD_DATE and BUILD_TIME are platform dependent
+# but BUILD_DATE and BUILD_TIME are plataform dependant
 if(UNIX)
 	execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 	execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -137,23 +25,13 @@ if(WIN32)
 	execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
-# Write a file with the BUILD_HASH define
+# Write a file with the SVNVERSION define
 file(WRITE buildinfo.h.txt
-	"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
-	"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
-	"#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
+	"#define BUILD_REV \"${MY_WC_REVISION}\"\n"
 	"#define BUILD_DATE \"${BUILD_DATE}\"\n"
 	"#define BUILD_TIME \"${BUILD_TIME}\"\n"
 )
 
-# cleanup
-unset(MY_WC_HASH)
-unset(MY_WC_COMMIT_TIMESTAMP)
-unset(MY_WC_BRANCH)
-unset(BUILD_DATE)
-unset(BUILD_TIME)
-
-
 # Copy the file to the final header only if the version changes
 # and avoid needless rebuilds
 # TODO: verify this comment is true, as BUILD_TIME probably changes

build_files/cmake/clang_array_check.py

@@ -1,363 +0,0 @@
-# ---
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# ---
-# by Campbell Barton
-
-"""
-Invocation:
-
-   export CLANG_BIND_DIR="/dsk/src/llvm/tools/clang/bindings/python"
-   export CLANG_LIB_DIR="/opt/llvm/lib"
-
-   python2 clang_array_check.py somefile.c -DSOME_DEFINE -I/some/include
-
-... defines and includes are optional
-
-"""
-
-# delay parsing functions until we need them
-USE_LAZY_INIT = True
-USE_EXACT_COMPARE = False
-
-# -----------------------------------------------------------------------------
-# predefined function/arg sizes, handy sometimes, but not complete...
-
-defs_precalc = {
-    "glColor3bv": {0: 3},
-    "glColor4bv": {0: 4},
-
-    "glColor3ubv": {0: 3},
-    "glColor4ubv": {0: 4},
-
-    "glColor4usv": {0: 3},
-    "glColor4usv": {0: 4},
-
-    "glColor3fv": {0: 3},
-    "glColor4fv": {0: 4},
-
-    "glColor3dv": {0: 3},
-    "glColor4dv": {0: 4},
-
-    "glVertex2fv": {0: 2},
-    "glVertex3fv": {0: 3},
-    "glVertex4fv": {0: 4},
-
-    "glEvalCoord1fv": {0: 1},
-    "glEvalCoord1dv": {0: 1},
-    "glEvalCoord2fv": {0: 2},
-    "glEvalCoord2dv": {0: 2},
-
-    "glRasterPos2dv": {0: 2},
-    "glRasterPos3dv": {0: 3},
-    "glRasterPos4dv": {0: 4},
-
-    "glRasterPos2fv": {0: 2},
-    "glRasterPos3fv": {0: 3},
-    "glRasterPos4fv": {0: 4},
-
-    "glRasterPos2sv": {0: 2},
-    "glRasterPos3sv": {0: 3},
-    "glRasterPos4sv": {0: 4},
-
-    "glTexCoord2fv": {0: 2},
-    "glTexCoord3fv": {0: 3},
-    "glTexCoord4fv": {0: 4},
-
-    "glTexCoord2dv": {0: 2},
-    "glTexCoord3dv": {0: 3},
-    "glTexCoord4dv": {0: 4},
-
-    "glNormal3fv": {0: 3},
-    "glNormal3dv": {0: 3},
-    "glNormal3bv": {0: 3},
-    "glNormal3iv": {0: 3},
-    "glNormal3sv": {0: 3},
-}
-
-# -----------------------------------------------------------------------------
-
-import sys
-
-if 0:
-    # Examples with LLVM as the root dir: '/dsk/src/llvm'
-
-    # path containing 'clang/__init__.py'
-    CLANG_BIND_DIR = "/dsk/src/llvm/tools/clang/bindings/python"
-
-    # path containing libclang.so
-    CLANG_LIB_DIR = "/opt/llvm/lib"
-else:
-    import os
-    CLANG_BIND_DIR = os.environ.get("CLANG_BIND_DIR")
-    CLANG_LIB_DIR = os.environ.get("CLANG_LIB_DIR")
-
-    if CLANG_BIND_DIR is None:
-        print("$CLANG_BIND_DIR python binding dir not set")
-    if CLANG_LIB_DIR is None:
-        print("$CLANG_LIB_DIR clang lib dir not set")
-
-sys.path.append(CLANG_BIND_DIR)
-
-import clang
-import clang.cindex
-from clang.cindex import (CursorKind,
-                          TypeKind,
-                          TokenKind)
-
-clang.cindex.Config.set_library_path(CLANG_LIB_DIR)
-
-index = clang.cindex.Index.create()
-
-args = sys.argv[2:]
-# print(args)
-
-tu = index.parse(sys.argv[1], args)
-# print('Translation unit: %s' % tu.spelling)
-filepath = tu.spelling
-
-# -----------------------------------------------------------------------------
-
-
-def function_parm_wash_tokens(parm):
-    # print(parm.kind)
-    assert parm.kind in (CursorKind.PARM_DECL,
-                         CursorKind.VAR_DECL,  # XXX, double check this
-                         CursorKind.FIELD_DECL,
-                         )
-
-    """
-    Return tolens without trailing commads and 'const'
-    """
-
-    tokens = [t for t in parm.get_tokens()]
-    if not tokens:
-        return tokens
-
-    # if tokens[-1].kind == To
-    # remove trailing char
-    if tokens[-1].kind == TokenKind.PUNCTUATION:
-        if tokens[-1].spelling in (",", ")", ";"):
-            tokens.pop()
-        # else:
-        #     print(tokens[-1].spelling)
-
-    t_new = []
-    for t in tokens:
-        t_kind = t.kind
-        t_spelling = t.spelling
-        ok = True
-        if t_kind == TokenKind.KEYWORD:
-            if t_spelling in ("const", "restrict", "volatile"):
-                ok = False
-            elif t_spelling.startswith("__"):
-                ok = False  # __restrict
-        elif t_kind in (TokenKind.COMMENT, ):
-            ok = False
-
-            # Use these
-        elif t_kind in (TokenKind.LITERAL,
-                        TokenKind.PUNCTUATION,
-                        TokenKind.IDENTIFIER):
-            # use but ignore
-            pass
-
-        else:
-            print("Unknown!", t_kind, t_spelling)
-
-        # if its OK we will add
-        if ok:
-            t_new.append(t)
-    return t_new
-
-
-def parm_size(node_child):
-    tokens = function_parm_wash_tokens(node_child)
-
-    # print(" ".join([t.spelling for t in tokens]))
-
-    # NOT PERFECT CODE, EXTRACT SIZE FROM TOKENS
-    if len(tokens) >= 3:  # foo [ 1 ]
-        if      ((tokens[-3].kind == TokenKind.PUNCTUATION and tokens[-3].spelling == "[") and
-                 (tokens[-2].kind == TokenKind.LITERAL and tokens[-2].spelling.isdigit()) and
-                 (tokens[-1].kind == TokenKind.PUNCTUATION and tokens[-1].spelling == "]")):
-            # ---
-            return int(tokens[-2].spelling)
-    return -1
-
-
-def function_get_arg_sizes(node):
-    # Return a dict if (index: size) items
-    # {arg_indx: arg_array_size, ... ]
-    arg_sizes = {}
-
-    if 1:  # node.spelling == "BM_vert_create", for debugging
-        node_parms = [node_child for node_child in node.get_children()
-                      if node_child.kind == CursorKind.PARM_DECL]
-
-        for i, node_child in enumerate(node_parms):
-
-            # print(node_child.kind, node_child.spelling)
-            # print(node_child.type.kind, node_child.spelling)
-            if node_child.type.kind == TypeKind.CONSTANTARRAY:
-                pointee = node_child.type.get_pointee()
-                size = parm_size(node_child)
-                if size != -1:
-                    arg_sizes[i] = size
-
-    return arg_sizes
-
-
-# -----------------------------------------------------------------------------
-_defs = {}
-
-
-def lookup_function_size_def(func_id):
-    if USE_LAZY_INIT:
-        result = _defs.get(func_id, {})
-        if type(result) != dict:
-            result = _defs[func_id] = function_get_arg_sizes(result)
-        return result
-    else:
-        return _defs.get(func_id, {})
-
-# -----------------------------------------------------------------------------
-
-
-def file_check_arg_sizes(tu):
-
-    # main checking function
-    def validate_arg_size(node):
-        """
-        Loop over args and validate sizes for args we KNOW the size of.
-        """
-        assert node.kind == CursorKind.CALL_EXPR
-
-        if 0:
-            print("---",
-                  " <~> ".join(
-                  [" ".join([t.spelling for t in C.get_tokens()])
-                  for C in node.get_children()]
-                  ))
-        # print(node.location)
-
-        # first child is the function call, skip that.
-        children = list(node.get_children())
-
-        if not children:
-            return  # XXX, look into this, happens on C++
-
-        func = children[0]
-
-        # get the func declaration!
-        # works but we can better scan for functions ahead of time.
-        if 0:
-            func_dec = func.get_definition()
-            if func_dec:
-                print("FD", " ".join([t.spelling for t in func_dec.get_tokens()]))
-            else:
-                # HRMP'f - why does this fail?
-                print("AA", " ".join([t.spelling for t in node.get_tokens()]))
-        else:
-            args_size_definition = ()  # dummy
-
-            # get the key
-            tok = list(func.get_tokens())
-            if tok:
-                func_id = tok[0].spelling
-                args_size_definition = lookup_function_size_def(func_id)
-
-        if not args_size_definition:
-            return
-
-        children = children[1:]
-        for i, node_child in enumerate(children):
-            children = list(node_child.get_children())
-
-            # skip if we dont have an index...
-            size_def = args_size_definition.get(i, -1)
-
-            if size_def == -1:
-                continue
-
-            # print([c.kind for c in children])
-            # print(" ".join([t.spelling for t in node_child.get_tokens()]))
-
-            if len(children) == 1:
-                arg = children[0]
-                if arg.kind in (CursorKind.DECL_REF_EXPR,
-                                CursorKind.UNEXPOSED_EXPR):
-
-                    if arg.type.kind == TypeKind.CONSTANTARRAY:
-                        dec = arg.get_definition()
-                        if dec:
-                            size = parm_size(dec)
-
-                            # size == 0 is for 'float *a'
-                            if size != -1 and size != 0:
-
-                                # nice print!
-                                if 0:
-                                    print("".join([t.spelling for t in func.get_tokens()]),
-                                          i,
-                                          " ".join([t.spelling for t in dec.get_tokens()]))
-
-                                # testing
-                                # size_def = 100
-                                if size != 1:
-                                    if USE_EXACT_COMPARE:
-                                        # is_err = (size != size_def) and (size != 4 and size_def != 3)
-                                        is_err = (size != size_def)
-                                    else:
-                                        is_err = (size < size_def)
-
-                                    if is_err:
-                                        location = node.location
-                                        # if "math_color_inline.c" not in str(location.file):
-                                        if 1:
-                                            print("%s:%d:%d: argument %d is size %d, should be %d (from %s)" %
-                                                  (location.file,
-                                                   location.line,
-                                                   location.column,
-                                                   i + 1, size, size_def,
-                                                   filepath  # always the same but useful when running threaded
-                                                   ))
-
-    # we dont really care what we are looking at, just scan entire file for
-    # function calls.
-
-    def recursive_func_call_check(node):
-        if node.kind == CursorKind.CALL_EXPR:
-            validate_arg_size(node)
-
-        for c in node.get_children():
-            recursive_func_call_check(c)
-
-    recursive_func_call_check(tu.cursor)
-
-
-# -- first pass, cache function definitions sizes
-
-# PRINT FUNC DEFINES
-def recursive_arg_sizes(node, ):
-    # print(node.kind, node.spelling)
-    if node.kind == CursorKind.FUNCTION_DECL:
-        if USE_LAZY_INIT:
-            args_sizes = node
-        else:
-            args_sizes = function_get_arg_sizes(node)
-        # if args_sizes:
-        #     print(node.spelling, args_sizes)
-        _defs[node.spelling] = args_sizes
-        # print("adding", node.spelling)
-    for c in node.get_children():
-        recursive_arg_sizes(c)
-# cache function sizes
-recursive_arg_sizes(tu.cursor)
-_defs.update(defs_precalc)
-
-# --- second pass, check against def's
-file_check_arg_sizes(tu)

build_files/cmake/cmake_consistency_check.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -58,7 +58,7 @@ def replace_line(f, i, text, keep_indent=True):
 def source_list(path, filename_check=None):
     for dirpath, dirnames, filenames in os.walk(path):
 
-        # skip '.git'
+        # skip '.svn'
         if dirpath.startswith("."):
             continue
 
@@ -75,12 +75,12 @@ def is_cmake(filename):
 
 def is_c_header(filename):
     ext = splitext(filename)[1]
-    return (ext in {".h", ".hpp", ".hxx", ".hh"})
+    return (ext in (".h", ".hpp", ".hxx"))
 
 
 def is_c(filename):
     ext = splitext(filename)[1]
-    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"})
+    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
 
 
 def is_c_any(filename):
@@ -174,7 +174,7 @@ def cmake_get_src(f):
                             elif is_c(new_file):
                                 sources_c.append(new_file)
                                 global_refs.setdefault(new_file, []).append((f, i))
-                            elif l in {"PARENT_SCOPE", }:
+                            elif l in ("PARENT_SCOPE", ):
                                 # cmake var, ignore
                                 pass
                             elif new_file.endswith(".list"):
@@ -201,7 +201,7 @@ def cmake_get_src(f):
                                     # replace_line(f, i - 1, new_path_rel)
 
                             else:
-                                raise Exception("non existent include %s:%d -> %s" % (f, i, new_file))
+                                raise Exception("non existant include %s:%d -> %s" % (f, i, new_file))
 
                         # print(new_file)
 
@@ -222,8 +222,8 @@ def cmake_get_src(f):
             '''
 
             # reset
-            del sources_h[:]
-            del sources_c[:]
+            sources_h[:] = []
+            sources_c[:] = []
 
     filen.close()
 

build_files/cmake/cmake_consistency_check_config.py

@@ -2,10 +2,11 @@ import os
 
 IGNORE = (
     "/test/",
-    "/tests/gtests/",
+    "/decimate_glut_test/",
     "/BSP_GhostTest/",
     "/release/",
     "/xembed/",
+    "/decimation/intern/future/",
     "/TerraplayNetwork/",
     "/ik_glut_test/",
 
@@ -30,22 +31,6 @@ IGNORE = (
     "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
     "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
-    "intern/cycles/render/film_response.cpp",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc",
-    "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc",
 
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -64,11 +49,6 @@ IGNORE = (
     "extern/recastnavigation/Recast/Include/RecastTimer.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
-    "intern/cycles/render/film_response.h",
-    "extern/carve/include/carve/config.h",
-    "extern/carve/include/carve/external/boost/random.hpp",
-    "extern/carve/patches/files/config.h",
-    "extern/carve/patches/files/random.hpp",
     )
 
 UTF8_CHECK = True

build_files/cmake/cmake_netbeans_project.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -24,7 +24,7 @@
 
 """
 Example linux usage
- python3 ~/blender-git/blender/build_files/cmake/cmake_netbeans_project.py ~/blender-git/cmake
+ python3 ~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
 
 Windows not supported so far
 """
@@ -56,10 +56,6 @@ def create_nb_project_main():
         pass
     else:
         includes, defines = cmake_advanced_info()
-
-        if (includes, defines) == (None, None):
-            return
-
         # for some reason it doesnt give all internal includes
         includes = list(set(includes) | set(dirname(f) for f in files if is_c_header(f)))
         includes.sort()
@@ -67,8 +63,8 @@ def create_nb_project_main():
         if 0:
             PROJECT_NAME = "Blender"
         else:
-            # be tricky, get the project name from git if we can!
-            PROJECT_NAME = project_name_get()
+            # be tricky, get the project name from SVN if we can!
+            PROJECT_NAME = project_name_get(SOURCE_DIR)
 
         # --------------- NB spesific
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
@@ -105,8 +101,8 @@ def create_nb_project_main():
         f.write('        <data xmlns="http://www.netbeans.org/ns/make-project/1">\n')
         f.write('            <name>%s</name>\n' % PROJECT_NAME)
         f.write('            <c-extensions>c,m</c-extensions>\n')
-        f.write('            <cpp-extensions>cpp,cxx,cc,mm</cpp-extensions>\n')
-        f.write('            <header-extensions>h,hxx,hh,hpp,inl</header-extensions>\n')
+        f.write('            <cpp-extensions>cpp,mm</cpp-extensions>\n')
+        f.write('            <header-extensions>h,hpp,inl</header-extensions>\n')
         f.write('            <sourceEncoding>UTF-8</sourceEncoding>\n')
         f.write('            <make-dep-projects/>\n')
         f.write('            <sourceRootList>\n')
@@ -118,21 +114,16 @@ def create_nb_project_main():
         f.write('                    <type>0</type>\n')
         f.write('                </confElem>\n')
         f.write('            </confList>\n')
-        f.write('            <formatting>\n')
-        f.write('                <project-formatting-style>false</project-formatting-style>\n')
-        f.write('            </formatting>\n')
         f.write('        </data>\n')
         f.write('    </configuration>\n')
         f.write('</project>\n')
 
-        f.close()
-
         f = open(join(PROJECT_DIR_NB, "configurations.xml"), 'w')
 
         f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-        f.write('<configurationDescriptor version="94">\n')
+        f.write('<configurationDescriptor version="79">\n')
         f.write('  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">\n')
-        f.write('    <df name="0" root="%s">\n' % SOURCE_DIR)  # base_root_rel
+        f.write('    <df name="blender" root="%s">\n' % SOURCE_DIR)  # base_root_rel
 
         # write files!
         files_rel_local = [normpath(relpath(join(CMAKE_DIR, path), SOURCE_DIR)) for path in files_rel]
@@ -150,7 +141,7 @@ def create_nb_project_main():
 
             for key, item in dirs:
                 f.write('%s  <df name="%s">\n' % (ident, key))
-                write_df(item, ident + "    ")
+                write_df(item, ident + "  ")
                 f.write('%s  </df>\n' % ident)
 
             for key in files:
@@ -183,10 +174,9 @@ def create_nb_project_main():
         f.write('    <conf name="Default" type="0">\n')
 
         f.write('      <toolsSet>\n')
+        f.write('        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>\n')
         f.write('        <compilerSet>default</compilerSet>\n')
         f.write('      </toolsSet>\n')
-        f.write('      <dependencyChecking>false</dependencyChecking>\n')
-        f.write('      <rebuildPropChanged>false</rebuildPropChanged>\n')
         f.write('      <makefileType>\n')
 
         f.write('        <makeTool>\n')
@@ -223,7 +213,7 @@ def create_nb_project_main():
             f.write('      <item path="%s"\n' % path)
             f.write('            ex="false"\n')
             f.write('            tool="1"\n')
-            f.write('            flavor2="0">\n')
+            f.write('            flavor="0">\n')
             f.write('      </item>\n')
 
         f.write('      <runprofile version="9">\n')
@@ -245,8 +235,6 @@ def create_nb_project_main():
 
         f.write('</configurationDescriptor>\n')
 
-        f.close()
-
 
 def main():
     create_nb_project_main()

build_files/cmake/cmake_qtcreator_project.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -27,7 +27,7 @@ Example Win32 usage:
  c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
 
 example linux usage
- python .~/blender-git/blender/build_files/cmake/cmake_qtcreator_project.py ~/blender-git/cmake
+ python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
 """
 
 from project_info import (SIMPLE_PROJECTFILE,
@@ -63,27 +63,24 @@ def create_qtc_project_main():
     if SIMPLE_PROJECTFILE:
         # --- qtcreator specific, simple format
         PROJECT_NAME = "Blender"
-        with open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w') as f:
-            f.write("\n".join(files_rel))
+        f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
+        f.write("\n".join(files_rel))
 
-        with open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w') as f:
-            f.write("\n".join(sorted(list(set(os.path.dirname(f)
-                              for f in files_rel if is_c_header(f))))))
+        f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
+        f.write("\n".join(sorted(list(set(os.path.dirname(f)
+                          for f in files_rel if is_c_header(f))))))
 
         qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
-        with open(qtc_prj, 'w') as f:
-            f.write("[General]\n")
+        f = open(qtc_prj, 'w')
+        f.write("[General]\n")
 
         qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
         if not os.path.exists(qtc_cfg):
-            with open(qtc_cfg, 'w') as f:
-                f.write("// ADD PREDEFINED MACROS HERE!\n")
+            f = open(qtc_cfg, 'w')
+            f.write("// ADD PREDEFINED MACROS HERE!\n")
     else:
         includes, defines = cmake_advanced_info()
 
-        if (includes, defines) == (None, None):
-            return
-
         # for some reason it doesnt give all internal includes
         includes = list(set(includes) | set(os.path.dirname(f)
                         for f in files_rel if is_c_header(f)))
@@ -92,34 +89,27 @@ def create_qtc_project_main():
         if 0:
             PROJECT_NAME = "Blender"
         else:
-            # be tricky, get the project name from CMake if we can!
-            PROJECT_NAME = project_name_get()
+            # be tricky, get the project name from SVN if we can!
+            PROJECT_NAME = project_name_get(SOURCE_DIR)
 
         FILE_NAME = PROJECT_NAME.lower()
-        with open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w') as f:
-            f.write("\n".join(files_rel))
+        f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+        f.write("\n".join(files_rel))
 
-        with open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w', encoding='utf-8') as f:
-            f.write("\n".join(sorted(includes)))
+        f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w', encoding='utf-8')
+        f.write("\n".join(sorted(includes)))
 
         qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
-        with open(qtc_prj, 'w') as f:
-            f.write("[General]\n")
+        f = open(qtc_prj, 'w')
+        f.write("[General]\n")
 
         qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
-        with open(qtc_cfg, 'w') as f:
-            f.write("// ADD PREDEFINED MACROS TO %s_custom.config!\n" % FILE_NAME)
-
-            qtc_custom_cfg = os.path.join(PROJECT_DIR, "%s_custom.config" % FILE_NAME)
-            if os.path.exists(qtc_custom_cfg):
-                with open(qtc_custom_cfg, 'r') as fc:
-                    f.write(fc.read())
-                    f.write("\n")
-
-            defines_final = [("#define %s %s" % (item[0], quote_define(item[1]))) for item in defines]
-            if sys.platform != "win32":
-                defines_final += cmake_compiler_defines()
-            f.write("\n".join(defines_final))
+        f = open(qtc_cfg, 'w')
+        f.write("// ADD PREDEFINED MACROS HERE!\n")
+        defines_final = [("#define %s %s" % (item[0], quote_define(item[1]))) for item in defines]
+        if sys.platform != "win32":
+            defines_final += cmake_compiler_defines()
+        f.write("\n".join(defines_final))
 
     print("Blender project file written to: %r" % qtc_prj)
     # --- end
@@ -134,21 +124,21 @@ def create_qtc_project_python():
     if 0:
         PROJECT_NAME = "Blender_Python"
     else:
-        # be tricky, get the project name from git if we can!
-        PROJECT_NAME = project_name_get() + "_Python"
+        # be tricky, get the project name from SVN if we can!
+        PROJECT_NAME = project_name_get(SOURCE_DIR) + "_Python"
 
     FILE_NAME = PROJECT_NAME.lower()
-    with open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w') as f:
-        f.write("\n".join(files_rel))
+    f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+    f.write("\n".join(files_rel))
 
     qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
-    with open(qtc_prj, 'w') as f:
-        f.write("[General]\n")
+    f = open(qtc_prj, 'w')
+    f.write("[General]\n")
 
     qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
     if not os.path.exists(qtc_cfg):
-        with open(qtc_cfg, 'w') as f:
-            f.write("// ADD PREDEFINED MACROS HERE!\n")
+        f = open(qtc_cfg, 'w')
+        f.write("// ADD PREDEFINED MACROS HERE!\n")
 
     print("Python project file written to:  %r" % qtc_prj)
 

build_files/cmake/cmake_static_check_clang_array.py

@@ -1,86 +0,0 @@
-#!/usr/bin/env python3
-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-import project_source_info
-import subprocess
-import sys
-import os
-
-USE_QUIET = (os.environ.get("QUIET", None) is not None)
-
-CHECKER_IGNORE_PREFIX = [
-    "extern",
-    "intern/moto",
-    "blender/intern/opennl",
-    ]
-
-CHECKER_BIN = "python2"
-
-CHECKER_ARGS = [
-    os.path.join(os.path.dirname(__file__), "clang_array_check.py"),
-    # not sure why this is needed, but it is.
-    "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
-    # stupid but needed
-    "-Dbool=char"
-    ]
-
-
-def main():
-    source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-
-    check_commands = []
-    for c, inc_dirs, defs in source_info:
-
-        #~if "source/blender" not in c:
-        #~    continue
-
-        cmd = ([CHECKER_BIN] +
-               CHECKER_ARGS +
-               [c] +
-               [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs]
-               )
-
-        check_commands.append((c, cmd))
-
-    process_functions = []
-
-    def my_process(i, c, cmd):
-        if not USE_QUIET:
-            percent = 100.0 * (i / (len(check_commands) - 1))
-            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
-            sys.stdout.flush()
-            sys.stdout.write("%s %s\n" % (percent_str, c))
-
-        return subprocess.Popen(cmd)
-
-    for i, (c, cmd) in enumerate(check_commands):
-        process_functions.append((my_process, (i, c, cmd)))
-
-    project_source_info.queue_processes(process_functions)
-
-
-if __name__ == "__main__":
-    main()

build_files/cmake/cmake_static_check_cppcheck.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -27,12 +27,9 @@ import subprocess
 import sys
 import os
 
-USE_QUIET = (os.environ.get("QUIET", None) is not None)
-
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-    "blender/intern/opennl",
     ]
 
 CHECKER_BIN = "cppcheck"
@@ -41,40 +38,34 @@ CHECKER_ARGS = [
     # not sure why this is needed, but it is.
     "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
     "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
-    "--max-configs=1",  # speeds up execution
+    # "--max-configs=1",  # speeds up execution
     #  "--check-config", # when includes are missing
-    "--enable=all",  # if you want sixty hundred pedantic suggestions
+    #  "--enable=all",  # if you want sixty hundred pedantic suggestions
     ]
 
-if USE_QUIET:
-    CHECKER_ARGS.append("--quiet")
-
 
 def main():
     source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-    source_defines = project_source_info.build_defines_as_args()
 
     check_commands = []
     for c, inc_dirs, defs in source_info:
         cmd = ([CHECKER_BIN] +
-               CHECKER_ARGS +
+                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs] +
-               source_defines
-               )
+               [("-D%s" % d) for d in defs]
+              )
 
         check_commands.append((c, cmd))
 
     process_functions = []
 
     def my_process(i, c, cmd):
-        if not USE_QUIET:
-            percent = 100.0 * (i / len(check_commands))
-            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+        percent = 100.0 * (i / (len(check_commands) - 1))
+        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
 
-            sys.stdout.flush()
-            sys.stdout.write("%s " % percent_str)
+        sys.stdout.flush()
+        sys.stdout.write("%s " % percent_str)
 
         return subprocess.Popen(cmd)
 
@@ -83,8 +74,6 @@ def main():
 
     project_source_info.queue_processes(process_functions)
 
-    print("Finished!")
-
 
 if __name__ == "__main__":
     main()

build_files/cmake/cmake_static_check_smatch.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Contributor(s): Campbell Barton
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-CHECKER_IGNORE_PREFIX = [
-    "extern",
-    "intern/moto",
-    "blender/intern/opennl",
-    ]
-
-CHECKER_BIN = "smatch"
-CHECKER_ARGS = [
-    "--full-path",
-    "--two-passes",
-    ]
-
-import project_source_info
-import subprocess
-import sys
-import os
-
-USE_QUIET = (os.environ.get("QUIET", None) is not None)
-
-
-def main():
-    source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-    source_defines = project_source_info.build_defines_as_args()
-
-    check_commands = []
-    for c, inc_dirs, defs in source_info:
-
-        cmd = ([CHECKER_BIN] +
-               CHECKER_ARGS +
-               [c] +
-               [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs] +
-               source_defines
-               )
-
-        check_commands.append((c, cmd))
-
-    def my_process(i, c, cmd):
-        if not USE_QUIET:
-            percent = 100.0 * (i / len(check_commands))
-            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
-            sys.stdout.flush()
-            sys.stdout.write("%s %s\n" % (percent_str, c))
-
-        return subprocess.Popen(cmd)
-
-    process_functions = []
-    for i, (c, cmd) in enumerate(check_commands):
-        process_functions.append((my_process, (i, c, cmd)))
-
-    project_source_info.queue_processes(process_functions)
-
-
-if __name__ == "__main__":
-    main()

build_files/cmake/cmake_static_check_sparse.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -25,7 +25,6 @@
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-    "blender/intern/opennl",
     ]
 
 CHECKER_BIN = "sparse"
@@ -35,35 +34,29 @@ CHECKER_ARGS = [
 import project_source_info
 import subprocess
 import sys
-import os
-
-USE_QUIET = (os.environ.get("QUIET", None) is not None)
 
 
 def main():
     source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
-    source_defines = project_source_info.build_defines_as_args()
 
     check_commands = []
     for c, inc_dirs, defs in source_info:
 
         cmd = ([CHECKER_BIN] +
-               CHECKER_ARGS +
+                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
-               [("-D%s" % d) for d in defs] +
-               source_defines
-               )
+               [("-D%s" % d) for d in defs]
+              )
 
         check_commands.append((c, cmd))
 
     def my_process(i, c, cmd):
-        if not USE_QUIET:
-            percent = 100.0 * (i / len(check_commands))
-            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+        percent = 100.0 * (i / (len(check_commands) - 1))
+        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
 
-            sys.stdout.flush()
-            sys.stdout.write("%s %s\n" % (percent_str, c))
+        sys.stdout.flush()
+        sys.stdout.write("%s %s\n" % (percent_str, c))
 
         return subprocess.Popen(cmd)
 

build_files/cmake/cmake_static_check_splint.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -25,7 +25,6 @@
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
-    "blender/intern/opennl",
     ]
 
 CHECKER_BIN = "splint"
@@ -68,9 +67,6 @@ CHECKER_ARGS = [
 import project_source_info
 import subprocess
 import sys
-import os
-
-USE_QUIET = (os.environ.get("QUIET", None) is not None)
 
 
 def main():
@@ -79,21 +75,20 @@ def main():
     check_commands = []
     for c, inc_dirs, defs in source_info:
         cmd = ([CHECKER_BIN] +
-               CHECKER_ARGS +
+                CHECKER_ARGS +
                [c] +
                [("-I%s" % i) for i in inc_dirs] +
                [("-D%s" % d) for d in defs]
-               )
+              )
 
         check_commands.append((c, cmd))
 
     def my_process(i, c, cmd):
-        if not USE_QUIET:
-            percent = 100.0 * (i / len(check_commands))
-            percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+        percent = 100.0 * (i / (len(check_commands) - 1))
+        percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
 
-            sys.stdout.write("%s %s\n" % (percent_str, c))
-            sys.stdout.flush()
+        sys.stdout.write("%s %s\n" % (percent_str, c))
+        sys.stdout.flush()
 
         return subprocess.Popen(cmd)
 

build_files/cmake/config/blender_full.cmake

@@ -1,62 +0,0 @@
-# turn everything OFF except for python which defaults to ON
-# and is needed for the UI
-#
-# Example usage:
-#   cmake -C../blender/build_files/cmake/config/blender_full.cmake  ../blender
-#
-
-set(WITH_BUILDINFO           ON  CACHE BOOL "" FORCE)
-set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
-set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
-set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
-set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
-set(WITH_GAMEENGINE          ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
-set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
-set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
-set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
-set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_DDS           ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_FRAMESERVER   ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_REDCODE       ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
-set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
-set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
-set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-set(WITH_LZMA                ON  CACHE BOOL "" FORCE)
-set(WITH_LZO                 ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_BOOLEAN         ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_FLUID           ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_REMESH          ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_SMOKE           ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_OCEANSIM        ON  CACHE BOOL "" FORCE)
-set(WITH_AUDASPACE           ON  CACHE BOOL "" FORCE)
-set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
-set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
-set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
-set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
-set(WITH_OPENNL              ON  CACHE BOOL "" FORCE)
-set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
-set(WITH_RAYOPTIMIZATION     ON  CACHE BOOL "" FORCE)
-set(WITH_SDL                 ON  CACHE BOOL "" FORCE)
-set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
-set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
-
-set(WITH_PLAYER              ON  CACHE BOOL "" FORCE)
-set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
-
-if(UNIX AND NOT APPLE)
-	set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
-endif()
-
-if(APPLE)
-	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
-endif()
-

build_files/cmake/config/blender_headless.cmake

@@ -5,19 +5,19 @@
 #   cmake -C../blender/build_files/cmake/config/blender_headless.cmake  ../blender
 #
 
-set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE) 
-set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
+set(WITH_HEADLESS            ON  CACHE FORCE BOOL) 
+set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
 
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
-set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
-set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
+set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
+set(WITH_FFTW3               OFF CACHE FORCE BOOL)
+set(WITH_JACK                OFF CACHE FORCE BOOL)
+set(WITH_SDL                 OFF CACHE FORCE BOOL)
+set(WITH_OPENAL              OFF CACHE FORCE BOOL)
+set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
+set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
 
 # other features which are not especially useful as a python module
-set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
-set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
+set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
+set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)

build_files/cmake/config/blender_lite.cmake

@@ -5,55 +5,46 @@
 #   cmake -C../blender/build_files/cmake/config/blender_lite.cmake  ../blender
 #
 
-set(WITH_INSTALL_PORTABLE    ON  CACHE BOOL "" FORCE)
-set(WITH_SYSTEM_GLEW         ON  CACHE BOOL "" FORCE)
-
-set(WITH_BUILDINFO           OFF CACHE BOOL "" FORCE)
-set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_AVI           OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
-set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
-set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
-set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
-set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
-set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)
-set(WITH_GHOST_XDND          OFF CACHE BOOL "" FORCE)
-set(WITH_IK_SOLVER           OFF CACHE BOOL "" FORCE)
-set(WITH_IK_ITASC            OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_CINEON        OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_DDS           OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_FRAMESERVER   OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_HDR           OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENEXR       OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENJPEG      OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_REDCODE       OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_TIFF          OFF CACHE BOOL "" FORCE)
-set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
-set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
-set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_LZMA                OFF CACHE BOOL "" FORCE)
-set(WITH_LZO                 OFF CACHE BOOL "" FORCE)
-set(WITH_MOD_BOOLEAN         OFF CACHE BOOL "" FORCE)
-set(WITH_MOD_FLUID           OFF CACHE BOOL "" FORCE)
-set(WITH_MOD_REMESH          OFF CACHE BOOL "" FORCE)
-set(WITH_MOD_SMOKE           OFF CACHE BOOL "" FORCE)
-set(WITH_MOD_OCEANSIM        OFF CACHE BOOL "" FORCE)
-set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
-set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
-set(WITH_OPENCOLORIO         OFF CACHE BOOL "" FORCE)
-set(WITH_OPENIMAGEIO         OFF CACHE BOOL "" FORCE)
-set(WITH_OPENMP              OFF CACHE BOOL "" FORCE)
-set(WITH_OPENNL              OFF CACHE BOOL "" FORCE)
-set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
-set(WITH_RAYOPTIMIZATION     OFF CACHE BOOL "" FORCE)
-set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
-set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
-set(WITH_X11_XF86VMODE       OFF CACHE BOOL "" FORCE)
-
-if(APPLE)
-	set(WITH_CODEC_QUICKTIME     OFF CACHE BOOL "" FORCE)
-endif()
+set(WITH_INSTALL_PORTABLE    ON  CACHE FORCE BOOL)
+set(WITH_SYSTEM_GLEW         ON  CACHE FORCE BOOL)
 
+set(WITH_BUILDINFO           OFF CACHE FORCE BOOL)
+set(WITH_BULLET              OFF CACHE FORCE BOOL)
+set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
+set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
+set(WITH_CYCLES              OFF CACHE FORCE BOOL)
+set(WITH_FFTW3               OFF CACHE FORCE BOOL)
+set(WITH_LIBMV               OFF CACHE FORCE BOOL)
+set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
+set(WITH_COMPOSITOR          OFF CACHE FORCE BOOL)
+set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
+set(WITH_IK_SOLVER           OFF CACHE FORCE BOOL)
+set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_DDS           OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_FRAMESERVER   OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_HDR           OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_OPENEXR       OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_OPENJPEG      OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_REDCODE       OFF CACHE FORCE BOOL)
+set(WITH_IMAGE_TIFF          OFF CACHE FORCE BOOL)
+set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
+set(WITH_INTERNATIONAL       OFF CACHE FORCE BOOL)
+set(WITH_JACK                OFF CACHE FORCE BOOL)
+set(WITH_LZMA                OFF CACHE FORCE BOOL)
+set(WITH_LZO                 OFF CACHE FORCE BOOL)
+set(WITH_MOD_BOOLEAN         OFF CACHE FORCE BOOL)
+set(WITH_MOD_DECIMATE        OFF CACHE FORCE BOOL)
+set(WITH_MOD_FLUID           OFF CACHE FORCE BOOL)
+set(WITH_MOD_REMESH          OFF CACHE FORCE BOOL)
+set(WITH_MOD_SMOKE           OFF CACHE FORCE BOOL)
+set(WITH_MOD_OCEANSIM        OFF CACHE FORCE BOOL)
+set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
+set(WITH_OPENAL              OFF CACHE FORCE BOOL)
+set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)
+set(WITH_OPENMP              OFF CACHE FORCE BOOL)
+set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
+set(WITH_RAYOPTIMIZATION     OFF CACHE FORCE BOOL)
+set(WITH_SDL                 OFF CACHE FORCE BOOL)
+set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
+set(WITH_X11_XF86VMODE       OFF CACHE FORCE BOOL)

build_files/cmake/config/bpy_module.cmake

@@ -4,30 +4,30 @@
 #   cmake -C../blender/build_files/cmake/config/bpy_module.cmake  ../blender
 #
 
-set(WITH_PYTHON_MODULE       ON  CACHE BOOL "" FORCE)
+set(WITH_PYTHON_MODULE       ON  CACHE FORCE BOOL)
 
 # install into the systems python dir
-set(WITH_INSTALL_PORTABLE    OFF CACHE BOOL "" FORCE)
+set(WITH_INSTALL_PORTABLE    OFF CACHE FORCE BOOL)
 
 # no point int copying python into python
-set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
+set(WITH_PYTHON_INSTALL      OFF CACHE FORCE BOOL)
 
 # dont build the game engine
-set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
+set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
 
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesnt hold the audio device and loads quickly.
-set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
-set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
-set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
+set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
+set(WITH_FFTW3               OFF CACHE FORCE BOOL)
+set(WITH_JACK                OFF CACHE FORCE BOOL)
+set(WITH_SDL                 OFF CACHE FORCE BOOL)
+set(WITH_OPENAL              OFF CACHE FORCE BOOL)
+set(WITH_CODEC_FFMPEG        OFF CACHE FORCE BOOL)
+set(WITH_CODEC_SNDFILE       OFF CACHE FORCE BOOL)
 
 # other features which are not especially useful as a python module
-set(WITH_X11_XINPUT          OFF CACHE BOOL "" FORCE)
-set(WITH_INPUT_NDOF          OFF CACHE BOOL "" FORCE)
-set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
-set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
-set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
+set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
+set(WITH_INPUT_NDOF          OFF CACHE FORCE BOOL)
+set(WITH_OPENCOLLADA         OFF CACHE FORCE BOOL)
+set(WITH_INTERNATIONAL       OFF CACHE FORCE BOOL)
+set(WITH_BULLET              OFF CACHE FORCE BOOL)

build_files/cmake/config/cycles_standalone.cmake

@@ -1,14 +0,0 @@
-# only compile Cycles standalone, without Blender
-#
-# Example usage:
-#   cmake -C../blender/build_files/cmake/config/cycles_standalone.cmake  ../blender
-#
-
-# disable Blender
-set(WITH_BLENDER             OFF  CACHE BOOL "" FORCE)
-set(WITH_PLAYER              OFF  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_BLENDER      OFF  CACHE BOOL "" FORCE)
-
-# build Cycles
-set(WITH_CYCLES_STANDALONE        ON CACHE BOOL "" FORCE)
-set(WITH_CYCLES_STANDALONE_GUI    ON CACHE BOOL "" FORCE)

build_files/cmake/example_scripts/cmake_linux_install.sh

@@ -1,41 +1,37 @@
 #!/bin/sh
 
 # This shell script checks out and compiles blender, tested on ubuntu 10.04
-# assumes you have dependencies installed already
+# assumes you have dependancies installed alredy
 
 # See this page for more info:
-#   http://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Linux/Generic_Distro/CMake
+#  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
 
 # grab blender
-mkdir ~/blender-git 
-cd ~/blender-git
+mkdir ~/blender-svn 
+cd ~/blender-svn
+svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
 
-git clone http://git.blender.org/blender.git
-cd blender
-git submodule update --init --recursive
-git submodule foreach git checkout master
-git submodule foreach git pull --rebase origin master
-
-# create build dir
-mkdir ~/blender-git/build-cmake
-cd ~/blender-git/build-cmake
+# create cmake dir
+mkdir ~/blender-svn/build-cmake
+cd ~/blender-svn/build-cmake
 
 # cmake without copying files for fast rebuilds
-# the files from git will be used in place
+# the files from svn will be used in place
 cmake ../blender
 
 # make blender, will take some time
-make -j$(nproc)
+make
 
 # link the binary to blenders source directory to run quickly
-ln -s ~/blender-git/build-cmake/bin/blender ~/blender-git/blender/blender.bin
+ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
 
 # useful info
 echo ""
 echo "* Useful Commands *"
-echo "   Run Blender: ~/blender-git/blender/blender.bin"
-echo "   Update Blender: git pull --rebase; git submodule foreach git pull --rebase origin master"
-echo "   Reconfigure Blender: cd ~/blender-git/build-cmake ; cmake ."
-echo "   Build Blender: cd ~/blender-git/build-cmake ; make"
+echo "   Run Blender: ~/blender-svn/blender/blender.bin"
+echo "   Update Blender: svn up ~/blender-svn/blender"
+echo "   Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
+echo "   Build Blender: cd ~/blender-svn/build-cmake ; make"
 echo ""
 
+

build_files/cmake/example_scripts/make_quicky.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ##### BEGIN GPL LICENSE BLOCK #####
 #

build_files/cmake/macros.cmake

@@ -27,10 +27,7 @@ macro(list_insert_after
 	list_id item_check item_add
 	)
 	set(_index)
-	list(FIND "${list_id}" "${item_check}" _index)
-	if("${_index}" MATCHES "-1")
-		message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
-	endif()
+	list(FIND ${list_id} "${item_check}" _index)
 	math(EXPR _index "${_index} + 1")
 	list(INSERT ${list_id} "${_index}" ${item_add})
 	unset(_index)
@@ -40,32 +37,11 @@ macro(list_insert_before
 	list_id item_check item_add
 	)
 	set(_index)
-	list(FIND "${list_id}" "${item_check}" _index)
-	if("${_index}" MATCHES "-1")
-		message(FATAL_ERROR "'${list_id}' doesn't contain '${item_check}'")
-	endif()
+	list(FIND ${list_id} "${item_check}" _index)
 	list(INSERT ${list_id} "${_index}" ${item_add})
 	unset(_index)
 endmacro()
 
-function (list_assert_duplicates
-	list_id
-	)
-	
-	# message(STATUS "list data: ${list_id}")
-
-	list(LENGTH list_id _len_before)
-	list(REMOVE_DUPLICATES list_id)
-	list(LENGTH list_id _len_after)
-	# message(STATUS "list size ${_len_before} -> ${_len_after}")
-	if(NOT _len_before EQUAL _len_after)
-		message(FATAL_ERROR "duplicate found in list which should not contain duplicates: ${list_id}")
-	endif()
-	unset(_len_before)
-	unset(_len_after)
-endfunction()
-
-
 # foo_bar.spam --> foo_barMySuffix.spam
 macro(file_suffix
 	file_name_new file_name file_suffix
@@ -161,9 +137,7 @@ macro(blender_source_group
 
 	foreach(_SRC ${sources})
 		get_filename_component(_SRC_EXT ${_SRC} EXT)
-		if((${_SRC_EXT} MATCHES ".h") OR
-		   (${_SRC_EXT} MATCHES ".hpp") OR
-		   (${_SRC_EXT} MATCHES ".hh"))
+		if((${_SRC_EXT} MATCHES ".h") OR (${_SRC_EXT} MATCHES ".hpp"))
 			source_group("Header Files" FILES ${_SRC})
 		else()
 			source_group("Source Files" FILES ${_SRC})
@@ -195,11 +169,6 @@ macro(blender_add_lib_nolist
 	# listed is helpful for IDE's (QtCreator/MSVC)
 	blender_source_group("${sources}")
 
-	list_assert_duplicates("${sources}")
-	list_assert_duplicates("${includes}")
-	# Not for system includes because they can resolve to the same path
-	# list_assert_duplicates("${includes_sys}")
-
 endmacro()
 
 
@@ -221,7 +190,11 @@ macro(SETUP_LIBDIRS)
 	if(WITH_PYTHON)  #  AND NOT WITH_PYTHON_MODULE  # WIN32 needs
 		link_directories(${PYTHON_LIBPATH})
 	endif()
-	if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
+	if(WITH_INTERNATIONAL)
+		link_directories(${ICONV_LIBPATH})
+		link_directories(${GETTEXT_LIBPATH})
+	endif()
+	if(WITH_SDL)
 		link_directories(${SDL_LIBPATH})
 	endif()
 	if(WITH_CODEC_FFMPEG)
@@ -239,9 +212,6 @@ macro(SETUP_LIBDIRS)
 	if(WITH_OPENIMAGEIO)
 		link_directories(${OPENIMAGEIO_LIBPATH})
 	endif()
-	if(WITH_OPENCOLORIO)
-		link_directories(${OPENCOLORIO_LIBPATH})
-	endif()
 	if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
 		link_directories(${OPENJPEG_LIBPATH})
 	endif()
@@ -251,7 +221,7 @@ macro(SETUP_LIBDIRS)
 	if(WITH_OPENAL)
 		link_directories(${OPENAL_LIBPATH})
 	endif()
-	if(WITH_JACK AND NOT WITH_JACK_DYNLOAD)
+	if(WITH_JACK)
 		link_directories(${JACK_LIBPATH})
 	endif()
 	if(WITH_CODEC_SNDFILE)
@@ -265,9 +235,6 @@ macro(SETUP_LIBDIRS)
 		link_directories(${PCRE_LIBPATH})
 		link_directories(${EXPAT_LIBPATH})
 	endif()
-	if(WITH_LLVM)
-		link_directories(${LLVM_LIBPATH})
-	endif()
 	if(WITH_MEM_JEMALLOC)
 		link_directories(${JEMALLOC_LIBPATH})
 	endif()
@@ -284,7 +251,8 @@ macro(setup_liblinks
 	set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")
 
 	target_link_libraries(${target}
-			${BLENDER_GL_LIBRARIES}
+			${OPENGL_gl_LIBRARY}
+			${OPENGL_glu_LIBRARY}
 			${PNG_LIBRARIES}
 			${ZLIB_LIBRARIES}
 			${FREETYPE_LIBRARY})
@@ -304,24 +272,30 @@ macro(setup_liblinks
 	endif()
 
 	if(WITH_SYSTEM_GLEW)
-		target_link_libraries(${target} ${BLENDER_GLEW_LIBRARIES})
+		target_link_libraries(${target} ${GLEW_LIBRARY})
 	endif()
-	if(WITH_BULLET AND WITH_SYSTEM_BULLET)
-		target_link_libraries(${target} ${BULLET_LIBRARIES})
+
+	if(WITH_INTERNATIONAL)
+		target_link_libraries(${target} ${GETTEXT_LIBRARIES})
+
+		if(WIN32 AND NOT UNIX)
+			target_link_libraries(${target} ${ICONV_LIBRARIES})
+		endif()
 	endif()
+
 	if(WITH_OPENAL)
 		target_link_libraries(${target} ${OPENAL_LIBRARY})
 	endif()
 	if(WITH_FFTW3)
 		target_link_libraries(${target} ${FFTW3_LIBRARIES})
 	endif()
-	if(WITH_JACK AND NOT WITH_JACK_DYNLOAD)
+	if(WITH_JACK)
 		target_link_libraries(${target} ${JACK_LIBRARIES})
 	endif()
 	if(WITH_CODEC_SNDFILE)
 		target_link_libraries(${target} ${SNDFILE_LIBRARIES})
 	endif()
-	if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
+	if(WITH_SDL)
 		target_link_libraries(${target} ${SDL_LIBRARY})
 	endif()
 	if(WITH_CODEC_QUICKTIME)
@@ -333,14 +307,8 @@ macro(setup_liblinks
 	if(WITH_OPENIMAGEIO)
 		target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES})
 	endif()
-	if(WITH_OPENCOLORIO)
-		target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
-	endif()
 	if(WITH_BOOST)
 		target_link_libraries(${target} ${BOOST_LIBRARIES})
-		if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU)
-			target_link_libraries(${target} ${ICU_LIBRARIES})
-		endif()
 	endif()
 	target_link_libraries(${target} ${JPEG_LIBRARIES})
 	if(WITH_IMAGE_OPENEXR)
@@ -358,12 +326,9 @@ macro(setup_liblinks
 	endif()
 	if(WITH_CODEC_FFMPEG)
 
-		# Strange! Without this ffmpeg gives linking errors (on linux),
-		# even though it's linked above.
-		# XXX: Does FFMPEG depend on GLU?
-		if(WITH_GLU)
-			target_link_libraries(${target} ${OPENGL_glu_LIBRARY})
-		endif()
+		# Strange!, without this ffmpeg gives linking errors (on linux)
+		# even though its linked above
+		target_link_libraries(${target} ${OPENGL_glu_LIBRARY})
 
 		target_link_libraries(${target} ${FFMPEG_LIBRARIES})
 	endif()
@@ -402,263 +367,11 @@ macro(setup_liblinks
 	if(WITH_MOD_CLOTH_ELTOPO)
 		target_link_libraries(${target} ${LAPACK_LIBRARIES})
 	endif()
-	if(WITH_CYCLES_OSL)
-		target_link_libraries(${target} ${OSL_LIBRARIES})
-	endif()
-	if(WITH_LLVM)
-		target_link_libraries(${target} ${LLVM_LIBRARY})
-	endif()
 	if(WIN32 AND NOT UNIX)
 		target_link_libraries(${target} ${PTHREADS_LIBRARIES})
 	endif()
 
-	target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
-
-	# We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them..
-	if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
-		target_link_libraries(${target} "extern_clew")
-		target_link_libraries(${target} "extern_cuew")
-	endif()
-endmacro()
-
-macro(SETUP_BLENDER_SORTED_LIBS)
-	get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
-
-	list(APPEND BLENDER_LINK_LIBS
-		bf_windowmanager
-		bf_render
-	)
-
-	if(WITH_MOD_FLUID)
-		list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
-	endif()
-
-	if(WITH_CYCLES)
-		list(APPEND BLENDER_LINK_LIBS
-			cycles_render
-			cycles_bvh
-			cycles_device
-			cycles_kernel
-			cycles_util
-			cycles_subd)
-		if(WITH_CYCLES_OSL)
-			list(APPEND BLENDER_LINK_LIBS cycles_kernel_osl)
-		endif()
-	endif()
-
-	# Sort libraries
-	set(BLENDER_SORTED_LIBS
-		bf_windowmanager
-
-		bf_editor_space_api
-		bf_editor_space_action
-		bf_editor_space_buttons
-		bf_editor_space_console
-		bf_editor_space_file
-		bf_editor_space_graph
-		bf_editor_space_image
-		bf_editor_space_info
-		bf_editor_space_logic
-		bf_editor_space_nla
-		bf_editor_space_node
-		bf_editor_space_outliner
-		bf_editor_space_script
-		bf_editor_space_sequencer
-		bf_editor_space_text
-		bf_editor_space_time
-		bf_editor_space_userpref
-		bf_editor_space_view3d
-		bf_editor_space_clip
-
-		bf_editor_transform
-		bf_editor_util
-		bf_editor_uvedit
-		bf_editor_curve
-		bf_editor_gpencil
-		bf_editor_interface
-		bf_editor_mesh
-		bf_editor_metaball
-		bf_editor_object
-		bf_editor_armature
-		bf_editor_physics
-		bf_editor_render
-		bf_editor_screen
-		bf_editor_sculpt_paint
-		bf_editor_sound
-		bf_editor_animation
-		bf_editor_datafiles
-		bf_editor_mask
-		bf_editor_io
-
-		bf_render
-		bf_python
-		bf_python_ext
-		bf_python_mathutils
-		bf_python_bmesh
-		bf_freestyle
-		bf_ikplugin
-		bf_modifiers
-		bf_bmesh
-		bf_blenkernel
-		bf_nodes
-		bf_rna
-		bf_gpu
-		bf_blenloader
-		bf_imbuf
-		bf_blenlib
-		bf_intern_ghost
-		bf_intern_string
-		bf_avi
-		bf_imbuf_cineon
-		bf_imbuf_openexr
-		bf_imbuf_openimageio
-		bf_imbuf_dds
-		bf_collada
-		bf_intern_elbeem
-		bf_intern_memutil
-		bf_intern_guardedalloc
-		bf_intern_ctr
-		bf_intern_utfconv
-		ge_blen_routines
-		ge_converter
-		ge_phys_dummy
-		ge_phys_bullet
-		bf_intern_smoke
-		extern_minilzo
-		extern_lzma
-		extern_colamd
-		ge_logic_ketsji
-		extern_recastnavigation
-		ge_logic
-		ge_rasterizer
-		ge_oglrasterizer
-		ge_logic_expressions
-		ge_scenegraph
-		ge_logic_network
-		ge_logic_ngnetwork
-		ge_logic_loopbacknetwork
-		bf_intern_moto
-		extern_openjpeg
-		extern_redcode
-		ge_videotex
-		bf_dna
-		bf_blenfont
-		bf_intern_audaspace
-		bf_intern_mikktspace
-		bf_intern_dualcon
-		bf_intern_cycles
-		cycles_render
-		cycles_bvh
-		cycles_device
-		cycles_kernel
-		cycles_util
-		cycles_subd
-		bf_intern_raskter
-		bf_intern_opencolorio
-		extern_rangetree
-		extern_wcwidth
-		extern_libmv
-		extern_glog
-		extern_sdlew
-
-		bf_intern_glew_mx
-	)
-
-	if(WITH_COMPOSITOR)
-		# added for opencl compositor
-		list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor")
-		list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_intern_opencl")
-	endif()
-
-	if(WITH_LIBMV)
-		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
-	endif()
-
-	if(WITH_MOD_CLOTH_ELTOPO)
-		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
-	endif()
-
-	if(NOT WITH_SYSTEM_GLEW)
-		list(APPEND BLENDER_SORTED_LIBS ${BLENDER_GLEW_LIBRARIES})
-	endif()
-
-	if(WITH_BINRELOC)
-		list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
-	endif()
-
-	if(WITH_CXX_GUARDEDALLOC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
-	endif()
-
-	if(WITH_IK_SOLVER)
-		list_insert_after(BLENDER_SORTED_LIBS "bf_intern_elbeem" "bf_intern_iksolver")
-	endif()
-
-	if(WITH_IK_ITASC)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
-	endif()
-
-	if(WITH_CODEC_QUICKTIME)
-		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
-	endif()
-
-	if(WITH_INPUT_NDOF)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_ghostndof3dconnexion)
-	endif()
-	
-	if(WITH_MOD_BOOLEAN)
-		list(APPEND BLENDER_SORTED_LIBS extern_carve)
-	endif()
-
-	if(WITH_GHOST_XDND)
-		list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
-	endif()
-
-	if(WITH_CYCLES_OSL)
-		list_insert_after(BLENDER_SORTED_LIBS "cycles_kernel" "cycles_kernel_osl")
-	endif()
-
-	if(WITH_INTERNATIONAL)
-		list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
-	endif()
-
-	if(WITH_OPENNL)
-		list_insert_after(BLENDER_SORTED_LIBS "bf_render" "bf_intern_opennl")
-	endif()
-
-	if(WITH_BULLET)
-		list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
-	endif()
-
-	if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
-		list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
-	endif()
-
-	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
-		set(REMLIB ${SORTLIB})
-		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
-			if(${SEARCHLIB} STREQUAL ${SORTLIB})
-				set(REMLIB "")
-			endif()
-		endforeach()
-		if(REMLIB)
-			# message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
-			list(APPEND REM_MSG ${REMLIB})
-			list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
-		endif()
-	endforeach()
-	if(REM_MSG)
-		list(SORT REM_MSG)
-		message(STATUS "Blender Skipping: (${REM_MSG})")
-	endif()
-
-	unset(SEARCHLIB)
-	unset(SORTLIB)
-	unset(REMLIB)
-	unset(REM_MSG)
-
-	# for top-level tests
-	set_property(GLOBAL PROPERTY BLENDER_SORTED_LIBS_PROP ${BLENDER_SORTED_LIBS})
+	target_link_libraries(${target} ${PLATFORM_LINKLIBS})
 endmacro()
 
 macro(TEST_SSE_SUPPORT
@@ -672,14 +385,8 @@ macro(TEST_SSE_SUPPORT
 		set(${_sse_flags} "-msse")
 		set(${_sse2_flags} "-msse2")
 	elseif(MSVC)
-		# x86_64 has this auto enabled
-		if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-			set(${_sse_flags} "")
-			set(${_sse2_flags} "")
-		else()
-			set(${_sse_flags} "/arch:SSE")
-			set(${_sse2_flags} "/arch:SSE2")
-		endif()
+		set(${_sse_flags} "/arch:SSE")
+		set(${_sse2_flags} "/arch:SSE2")
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		set(${_sse_flags} "")  # icc defaults to -msse
 		set(${_sse2_flags} "-msse2")
@@ -722,160 +429,6 @@ macro(TEST_SSE_SUPPORT
 	unset(CMAKE_REQUIRED_FLAGS)
 endmacro()
 
-macro(TEST_STDBOOL_SUPPORT)
-	include(CheckCSourceRuns)
-
-	# This program will compile correctly if and only if
-	# this C compiler supports C99 stdbool.
-	check_c_source_runs("
-		#include <stdbool.h>
-		int main(void) { return (int)false; }"
-	HAVE_STDBOOL_H)
-endmacro()
-
-macro(TEST_UNORDERED_MAP_SUPPORT)
-	# - Detect unordered_map availability
-	# Test if a valid implementation of unordered_map exists
-	# and define the include path
-	# This module defines
-	#  HAVE_UNORDERED_MAP, whether unordered_map implementation was found
-	#  
-	#  HAVE_STD_UNORDERED_MAP_HEADER, <unordered_map.h> was found
-	#  HAVE_UNORDERED_MAP_IN_STD_NAMESPACE, unordered_map is in namespace std
-	#  HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE, unordered_map is in namespace std::tr1
-	#  
-	#  UNORDERED_MAP_INCLUDE_PREFIX, include path prefix for unordered_map, if found
-	#  UNORDERED_MAP_NAMESPACE, namespace for unordered_map, if found
-
-	include(CheckIncludeFileCXX)
-	CHECK_INCLUDE_FILE_CXX("unordered_map" HAVE_STD_UNORDERED_MAP_HEADER)
-	if(HAVE_STD_UNORDERED_MAP_HEADER)
-		# Even so we've found unordered_map header file it doesn't
-		# mean unordered_map and unordered_set will be declared in
-		# std namespace.
-		#
-		# Namely, MSVC 2008 have unordered_map header which declares
-		# unordered_map class in std::tr1 namespace. In order to support
-		# this, we do extra check to see which exactly namespace is
-		# to be used.
-
-		include(CheckCXXSourceCompiles)
-		CHECK_CXX_SOURCE_COMPILES("#include <unordered_map>
-		                          int main() {
-		                            std::unordered_map<int, int> map;
-		                            return 0;
-		                          }"
-		                          HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
-		if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
-			message(STATUS "Found unordered_map/set in std namespace.")
-
-			set(HAVE_UNORDERED_MAP "TRUE")
-			set(UNORDERED_MAP_INCLUDE_PREFIX "")
-			set(UNORDERED_MAP_NAMESPACE "std")
-		else()
-			CHECK_CXX_SOURCE_COMPILES("#include <unordered_map>
-			                          int main() {
-			                            std::tr1::unordered_map<int, int> map;
-			                            return 0;
-			                          }"
-			                          HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
-			if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
-				message(STATUS "Found unordered_map/set in std::tr1 namespace.")
-
-				set(HAVE_UNORDERED_MAP "TRUE")
-				set(UNORDERED_MAP_INCLUDE_PREFIX "")
-				set(UNORDERED_MAP_NAMESPACE "std::tr1")
-			else()
-				message(STATUS "Found <unordered_map> but cannot find either std::unordered_map "
-				        "or std::tr1::unordered_map.")
-			endif()
-		endif()
-	else()
-		CHECK_INCLUDE_FILE_CXX("tr1/unordered_map" HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
-		if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
-			message(STATUS "Found unordered_map/set in std::tr1 namespace.")
-
-			set(HAVE_UNORDERED_MAP "TRUE")
-			set(UNORDERED_MAP_INCLUDE_PREFIX "tr1")
-			set(UNORDERED_MAP_NAMESPACE "std::tr1")
-		else()
-			message(STATUS "Unable to find <unordered_map> or <tr1/unordered_map>. ")
-		endif()
-	endif()
-endmacro()
-
-macro(TEST_SHARED_PTR_SUPPORT)
-	# This check are coming from Ceres library.
-	#
-	# Find shared pointer header and namespace.
-	#
-	# This module defines the following variables:
-	#
-	# SHARED_PTR_FOUND: TRUE if shared_ptr found.
-	# SHARED_PTR_TR1_MEMORY_HEADER: True if <tr1/memory> header is to be used
-	# for the shared_ptr object, otherwise use <memory>.
-	# SHARED_PTR_TR1_NAMESPACE: TRUE if shared_ptr is defined in std::tr1 namespace,
-	# otherwise it's assumed to be defined in std namespace.
-
-	include(CheckIncludeFileCXX)
-	set(SHARED_PTR_FOUND FALSE)
-	CHECK_INCLUDE_FILE_CXX(memory HAVE_STD_MEMORY_HEADER)
-	if(HAVE_STD_MEMORY_HEADER)
-		# Finding the memory header doesn't mean that shared_ptr is in std
-		# namespace.
-		#
-		# In particular, MSVC 2008 has shared_ptr declared in std::tr1.  In
-		# order to support this, we do an extra check to see which namespace
-		# should be used.
-		include(CheckCXXSourceCompiles)
-		CHECK_CXX_SOURCE_COMPILES("#include <memory>
-		                           int main() {
-		                             std::shared_ptr<int> int_ptr;
-		                             return 0;
-		                           }"
-		                          HAVE_SHARED_PTR_IN_STD_NAMESPACE)
-
-		if(HAVE_SHARED_PTR_IN_STD_NAMESPACE)
-			message("-- Found shared_ptr in std namespace using <memory> header.")
-			set(SHARED_PTR_FOUND TRUE)
-		else()
-			CHECK_CXX_SOURCE_COMPILES("#include <memory>
-			                           int main() {
-			                           std::tr1::shared_ptr<int> int_ptr;
-			                           return 0;
-			                           }"
-			                          HAVE_SHARED_PTR_IN_TR1_NAMESPACE)
-			if(HAVE_SHARED_PTR_IN_TR1_NAMESPACE)
-				message("-- Found shared_ptr in std::tr1 namespace using <memory> header.")
-				set(SHARED_PTR_TR1_NAMESPACE TRUE)
-				set(SHARED_PTR_FOUND TRUE)
-			endif()
-		endif()
-	endif()
-
-	if(NOT SHARED_PTR_FOUND)
-		# Further, gcc defines shared_ptr in std::tr1 namespace and
-		# <tr1/memory> is to be included for this. And what makes things
-		# even more tricky is that gcc does have <memory> header, so
-		# all the checks above wouldn't find shared_ptr.
-		CHECK_INCLUDE_FILE_CXX("tr1/memory" HAVE_TR1_MEMORY_HEADER)
-		if(HAVE_TR1_MEMORY_HEADER)
-			CHECK_CXX_SOURCE_COMPILES("#include <tr1/memory>
-			                           int main() {
-			                           std::tr1::shared_ptr<int> int_ptr;
-			                           return 0;
-			                           }"
-			                           HAVE_SHARED_PTR_IN_TR1_NAMESPACE_FROM_TR1_MEMORY_HEADER)
-			if(HAVE_SHARED_PTR_IN_TR1_NAMESPACE_FROM_TR1_MEMORY_HEADER)
-				message("-- Found shared_ptr in std::tr1 namespace using <tr1/memory> header.")
-				set(SHARED_PTR_TR1_MEMORY_HEADER TRUE)
-				set(SHARED_PTR_TR1_NAMESPACE TRUE)
-				set(SHARED_PTR_FOUND TRUE)
-			endif()
-		endif()
-	endif()
-endmacro()
-
 # when we have warnings as errors applied globally this
 # needs to be removed for some external libs which we dont maintain.
 
@@ -908,14 +461,10 @@ macro(remove_strict_flags)
 
 	if(CMAKE_COMPILER_IS_GNUCC)
 		remove_cc_flag("-Wstrict-prototypes")
-		remove_cc_flag("-Wmissing-prototypes")
 		remove_cc_flag("-Wunused-parameter")
 		remove_cc_flag("-Wwrite-strings")
-		remove_cc_flag("-Wredundant-decls")
 		remove_cc_flag("-Wundef")
 		remove_cc_flag("-Wshadow")
-		remove_cc_flag("-Wdouble-promotion")
-		remove_cc_flag("-Wold-style-definition")
 		remove_cc_flag("-Werror=[^ ]+")
 		remove_cc_flag("-Werror")
 
@@ -923,14 +472,10 @@ macro(remove_strict_flags)
 		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
 	endif()
 
-	if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		remove_cc_flag("-Wunused-parameter")
 		remove_cc_flag("-Wunused-variable")
-		remove_cc_flag("-Werror=[^ ]+")
 		remove_cc_flag("-Werror")
-
-		# negate flags implied by '-Wall'
-		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
 	endif()
 
 	if(MSVC)
@@ -947,9 +492,7 @@ macro(remove_strict_flags_file
 
 	foreach(_SOURCE ${ARGV})
 
-		if(CMAKE_COMPILER_IS_GNUCC OR
-		  (CMAKE_C_COMPILER_ID MATCHES "Clang"))
-
+		if(CMAKE_COMPILER_IS_GNUCC)
 			set_source_files_properties(${_SOURCE}
 				PROPERTIES
 					COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}"
@@ -960,7 +503,7 @@ macro(remove_strict_flags_file
 			# TODO
 		endif()
 
-	endforeach()
+	endforeach()	
 
 	unset(_SOURCE)
 
@@ -999,10 +542,9 @@ macro(ADD_CHECK_CXX_COMPILER_FLAG
 	endif()
 endmacro()
 
-function(get_blender_version)
+macro(get_blender_version)
 	# So cmake depends on BKE_blender.h, beware of inf-loops!
-	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h
-	               ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
+	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
 
 	file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h _contents REGEX "^#define[ \t]+BLENDER_.*$")
 
@@ -1034,24 +576,31 @@ function(get_blender_version)
 
 	math(EXPR BLENDER_VERSION_MAJOR "${_out_version} / 100")
 	math(EXPR BLENDER_VERSION_MINOR "${_out_version} % 100")
-	set(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}" PARENT_SCOPE)
+	set(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}")
 
-	set(BLENDER_SUBVERSION ${_out_subversion} PARENT_SCOPE)
-	set(BLENDER_VERSION_CHAR ${_out_version_char} PARENT_SCOPE)
-	set(BLENDER_VERSION_CYCLE ${_out_version_cycle} PARENT_SCOPE)
+	set(BLENDER_SUBVERSION ${_out_subversion})
+	set(BLENDER_VERSION_CHAR ${_out_version_char})
+	set(BLENDER_VERSION_CYCLE ${_out_version_cycle})
 
 	# for packaging, alpha to numbers
 	string(COMPARE EQUAL "${BLENDER_VERSION_CHAR}" "" _out_version_char_empty)
 	if(${_out_version_char_empty})
-		set(BLENDER_VERSION_CHAR_INDEX "0" PARENT_SCOPE)
+		set(BLENDER_VERSION_CHAR_INDEX "0")
 	else()
 		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w x y z)
 		list(FIND _char_ls ${BLENDER_VERSION_CHAR} _out_version_char_index)
-		math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1" PARENT_SCOPE)
+		math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
+		unset(_char_ls)
+		unset(_out_version_char_index)
 	endif()
 
+	unset(_out_subversion)
+	unset(_out_version_char)
+	unset(_out_version_char_empty)
+	unset(_out_version_cycle)
+
 	# message(STATUS "Version (Internal): ${BLENDER_VERSION}.${BLENDER_SUBVERSION}, Version (external): ${BLENDER_VERSION}${BLENDER_VERSION_CHAR}-${BLENDER_VERSION_CYCLE}")
-endfunction()
+endmacro()
 
 
 # hacks to override initial project settings
@@ -1141,14 +690,9 @@ macro(delayed_install
 	destination)
 
 	foreach(f ${files})
-		if(IS_ABSOLUTE ${f})
-			set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${f})
-		else()
-			set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${base}/${f})
-		endif()
+		set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_FILES ${base}/${f})
 		set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_DESTINATIONS ${destination})
 	endforeach()
-	unset(f)
 endmacro()
 
 # note this is a function instead of a macro so that ${BUILD_TYPE} in targetdir
@@ -1168,10 +712,20 @@ function(delayed_do_install
 			list(GET destinations ${i} d)
 			install(FILES ${f} DESTINATION ${targetdir}/${d})
 		endforeach()
-		unset(f)
 	endif()
 endfunction()
 
+macro(set_lib_path
+		lvar
+		lproj)
+
+	if(MSVC10)
+		set(${lvar} ${LIBDIR}/${lproj}/vc2010)
+	else()
+		set(${lvar} ${LIBDIR}/${lproj})
+	endif()
+endmacro()
+
 
 macro(data_to_c
       file_from file_to
@@ -1186,9 +740,6 @@ macro(data_to_c
 		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
 		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
 		DEPENDS ${file_from} datatoc)
-
-	set_source_files_properties(${file_to} PROPERTIES GENERATED TRUE)
-
 	unset(_file_to_path)
 endmacro()
 
@@ -1212,185 +763,7 @@ macro(data_to_c_simple
 		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
 		DEPENDS ${_file_from} datatoc)
 
-	set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
-
 	unset(_file_from)
 	unset(_file_to)
 	unset(_file_to_path)
 endmacro()
-
-# macro for converting pixmap directory to a png and then a c file
-macro(data_to_c_simple_icons
-      path_from
-      list_to_add
-      )
-
-	# Conversion steps
-	#  path_from  ->  _file_from  ->  _file_to
-	#  foo/*.dat  ->  foo.png     ->  foo.png.c
-
-	get_filename_component(_path_from_abs ${path_from} ABSOLUTE)
-	# remove ../'s
-	get_filename_component(_file_from ${CMAKE_CURRENT_BINARY_DIR}/${path_from}.png   REALPATH)
-	get_filename_component(_file_to   ${CMAKE_CURRENT_BINARY_DIR}/${path_from}.png.c REALPATH)
-
-	list(APPEND ${list_to_add} ${_file_to})
-
-	get_filename_component(_file_to_path ${_file_to} PATH)
-
-	# ideally we wouldn't glob, but storing all names for all pixmaps is a bit heavy
-	file(GLOB _icon_files "${path_from}/*.dat")
-
-	add_custom_command(
-		OUTPUT  ${_file_from} ${_file_to}
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-		#COMMAND python3 ${CMAKE_SOURCE_DIR}/source/blender/datatoc/datatoc_icon.py ${_path_from_abs} ${_file_from}
-		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc_icon ${_path_from_abs} ${_file_from}
-		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
-		DEPENDS
-			${_icon_files}
-			datatoc_icon
-			datatoc
-			# could be an arg but for now we only create icons depending on UI_icons.h
-			${CMAKE_SOURCE_DIR}/source/blender/editors/include/UI_icons.h
-		)
-
-	set_source_files_properties(${_file_from} ${_file_to} PROPERTIES GENERATED TRUE)
-
-	unset(_path_from_abs)
-	unset(_file_from)
-	unset(_file_to)
-	unset(_file_to_path)
-	unset(_icon_files)
-
-endmacro()
-
-# XXX Not used for now...
-macro(svg_to_png
-      file_from
-      file_to
-      dpi
-      list_to_add)
-
-	# remove ../'s
-	get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
-	get_filename_component(_file_to   ${CMAKE_CURRENT_SOURCE_DIR}/${file_to}   REALPATH)
-
-	list(APPEND ${list_to_add} ${_file_to})
-
-	find_program(INKSCAPE_EXE inkscape)
-	mark_as_advanced(INKSCAPE_EXE)
-
-	if(INKSCAPE_EXE)
-		if(APPLE)
-			# in OS X app bundle, the binary is a shim that doesn't take any
-			# command line arguments, replace it with the actual binary
-			string(REPLACE "MacOS/Inkscape" "Resources/bin/inkscape" INKSCAPE_REAL_EXE ${INKSCAPE_EXE})
-			if(EXISTS "${INKSCAPE_REAL_EXE}")
-				set(INKSCAPE_EXE ${INKSCAPE_REAL_EXE})
-			endif()
-		endif()
-
-		add_custom_command(
-			OUTPUT  ${_file_to}
-			COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi}  --without-gui --export-png=${_file_to}
-			DEPENDS ${_file_from} ${INKSCAPE_EXE}
-		)
-	else()
-		message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!")
-	endif()
-
-	unset(_file_from)
-	unset(_file_to)
-
-endmacro()
-
-macro(msgfmt_simple
-      file_from
-      list_to_add)
-
-	# remove ../'s
-	get_filename_component(_file_from_we ${file_from} NAME_WE)
-
-	get_filename_component(_file_from ${file_from} REALPATH)
-	get_filename_component(_file_to ${CMAKE_CURRENT_BINARY_DIR}/${_file_from_we}.mo REALPATH)
-
-	list(APPEND ${list_to_add} ${_file_to})
-
-	get_filename_component(_file_to_path ${_file_to} PATH)
-
-	add_custom_command(
-		OUTPUT  ${_file_to}
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
-		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/msgfmt ${_file_from} ${_file_to}
-		DEPENDS msgfmt ${_file_from})
-
-	set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
-
-	unset(_file_from_we)
-	unset(_file_from)
-	unset(_file_to)
-	unset(_file_to_path)
-endmacro()
-
-macro(find_python_package
-      package)
-
-	string(TOUPPER ${package} _upper_package)
-
-	# set but invalid
-	if((NOT ${PYTHON_${_upper_package}_PATH} STREQUAL "") AND
-	   (NOT ${PYTHON_${_upper_package}_PATH} MATCHES NOTFOUND))
-#		if(NOT EXISTS "${PYTHON_${_upper_package}_PATH}/${package}")
-#			message(WARNING "PYTHON_${_upper_package}_PATH is invalid, ${package} not found in '${PYTHON_${_upper_package}_PATH}' "
-#			                "WITH_PYTHON_INSTALL_${_upper_package} option will be ignored when installing python")
-#			set(WITH_PYTHON_INSTALL${_upper_package} OFF)
-#		endif()
-	# not set, so initialize
-	else()
-		string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
-		list(GET _PY_VER_SPLIT 0 _PY_VER_MAJOR)
-
-		# re-cache
-		unset(PYTHON_${_upper_package}_PATH CACHE)
-		find_path(PYTHON_${_upper_package}_PATH
-		  NAMES
-		    ${package}
-		  HINTS
-		    "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
-		    "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
-		  PATH_SUFFIXES
-		    site-packages
-		    dist-packages
-		   NO_DEFAULT_PATH
-		)
-
-		 if(NOT EXISTS "${PYTHON_${_upper_package}_PATH}")
-			message(WARNING "'${package}' path could not be found in:\n"
-			                "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${package}', "
-			                "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', "
-			                "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', "
-			                "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', "
-			                "WITH_PYTHON_INSTALL_${_upper_package} option will be ignored when installing python")
-			set(WITH_PYTHON_INSTALL_${_upper_package} OFF)
-		else()
-			message(STATUS "${package} found at '${PYTHON_${_upper_package}_PATH}'")
-		endif()
-
-		unset(_PY_VER_SPLIT)
-		unset(_PY_VER_MAJOR)
-	  endif()
-
-	  unset(_upper_package)
-endmacro()
-
-# like Python's 'print(dir())'
-macro(print_all_vars)
-	get_cmake_property(_vars VARIABLES)
-	foreach(_var ${_vars})
-		message("${_var}=${${_var}}")
-	endforeach()
-	unset(_vars)
-	unset(_var)
-endmacro()
-

build_files/cmake/packaging.cmake

@@ -2,6 +2,7 @@ set(PROJECT_DESCRIPTION  "Blender is a very fast and versatile 3D modeller/rende
 set(PROJECT_COPYRIGHT    "Copyright (C) 2001-2012 Blender Foundation")
 set(PROJECT_CONTACT      "foundation@blender.org")
 set(PROJECT_VENDOR       "Blender Foundation")
+set(ORG_WEBSITE          "www.blender.org")
 
 set(MAJOR_VERSION ${BLENDER_VERSION_MAJOR})
 set(MINOR_VERSION ${BLENDER_VERSION_MINOR})
@@ -19,35 +20,29 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${PATCH_VERSION}")
 
 
 # Get the build revision, note that this can get out-of-sync, so for packaging run cmake first.
-set(MY_WC_HASH "unknown")
-if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
-	include(FindGit)
-	if(GIT_FOUND)
-		message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
-		execute_process(COMMAND git rev-parse --short @{u}
-		                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		                OUTPUT_VARIABLE MY_WC_HASH
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
+include(FindSubversion)
+set(MY_WC_REVISION "unknown")
+if(EXISTS ${CMAKE_SOURCE_DIR}/.svn/)
+	if(Subversion_FOUND)
+		Subversion_WC_INFO(${CMAKE_SOURCE_DIR} MY)
 	endif()
 endif()
-set(BUILD_REV ${MY_WC_HASH})
-unset(MY_WC_HASH)
+set(BUILD_REV ${MY_WC_REVISION})
 
 
 # Force Package Name
-execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE CPACK_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-1.r${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	# RPM packages
 	include(build_files/cmake/RpmBuild.cmake)
-	if(RPMBUILD_FOUND)
+	if(RPMBUILD_FOUND AND NOT WIN32)
 		set(CPACK_GENERATOR "RPM")
-		set(CPACK_RPM_PACKAGE_RELEASE "git${CPACK_DATE}.${BUILD_REV}")
+		set(CPACK_RPM_PACKAGE_RELEASE "1.r${BUILD_REV}")
 		set(CPACK_SET_DESTDIR "true")
 		set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
 		set(CPACK_PACKAGE_RELOCATABLE "false")
-		set(CPACK_RPM_PACKAGE_LICENSE "GPLv2+ and Apache 2.0")
+		set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 		set(CPACK_RPM_PACKAGE_GROUP "Amusements/Multimedia")
 		set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/build_files/package_spec/rpm/blender.spec.in")
 	endif()
@@ -61,25 +56,7 @@ if(APPLE)
 	set(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)
 endif()
 
-if(WIN32)
-	set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender")
-	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender")
-
-	set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico)
-	set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
-
-	set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt)
-	set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico)
-	set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
-
-	set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
-	set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
-
-	#force lzma instead of deflate
-	set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high)
-endif()
-
-set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")
+set(CPACK_PACKAGE_EXECUTABLES "blender")
 include(CPack)
 
 # Target for build_archive.py script, to automatically pass along
@@ -94,20 +71,18 @@ macro(add_package_archive packagename extension)
 		OUTPUT ${package_output}
 		COMMAND ${build_archive} ${packagename} ${extension} bin release
 		WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-	unset(build_archive)
-	unset(package_output)
 endmacro()
 
 if(APPLE)
 	add_package_archive(
-		"${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
+		"${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-OSX-${CMAKE_OSX_ARCHITECTURES}"
 		"zip")
 elseif(UNIX)
 	# platform name could be tweaked, to include glibc, and ensure processor is correct (i386 vs i686)
 	string(TOLOWER ${CMAKE_SYSTEM_NAME} PACKAGE_SYSTEM_NAME)
 
 	add_package_archive(
-		"${PROJECT_NAME}-${BLENDER_VERSION}-${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
+		"${PROJECT_NAME}-${BLENDER_VERSION}-r${BUILD_REV}-${PACKAGE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
 		"tar.bz2")
 endif()
 

build_files/cmake/project_info.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -26,8 +26,8 @@
 Example Win32 usage:
  c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
 
-Example Linux usage:
- python ~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
+example linux usage
+ python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
 """
 
 __all__ = (
@@ -97,7 +97,7 @@ def is_cmake(filename):
 
 def is_c_header(filename):
     ext = splitext(filename)[1]
-    return (ext in {".h", ".hpp", ".hxx", ".hh"})
+    return (ext in (".h", ".hpp", ".hxx"))
 
 
 def is_py(filename):
@@ -112,7 +112,7 @@ def is_glsl(filename):
 
 def is_c(filename):
     ext = splitext(filename)[1]
-    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".osl"})
+    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
 
 
 def is_c_any(filename):
@@ -133,35 +133,22 @@ def cmake_advanced_info():
     """ Extracr includes and defines from cmake.
     """
 
-    make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
-    make_exe_basename = os.path.basename(make_exe)
-
     def create_eclipse_project():
         print("CMAKE_DIR %r" % CMAKE_DIR)
         if sys.platform == "win32":
             cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
         else:
-            if make_exe_basename.startswith(("make", "gmake")):
-                cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
-            elif make_exe_basename.startswith("ninja"):
-                cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR
-            else:
-                raise Exception("Unknown make program %r" % make_exe)
+            cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
 
         os.system(cmd)
-        return join(CMAKE_DIR, ".cproject")
 
     includes = []
     defines = []
 
-    project_path = create_eclipse_project()
-
-    if not exists(project_path):
-        print("Generating Eclipse Prokect File Failed: %r not found" % project_path)
-        return None, None
+    create_eclipse_project()
 
     from xml.dom.minidom import parse
-    tree = parse(project_path)
+    tree = parse(join(CMAKE_DIR, ".cproject"))
 
     # to check on nicer xml
     # f = open(".cproject_pretty", 'w')
@@ -239,5 +226,26 @@ def cmake_compiler_defines():
     return lines
 
 
-def project_name_get():
-    return cmake_cache_var("CMAKE_PROJECT_NAME")
+def project_name_get(path, fallback="Blender", prefix="Blender_"):
+    if not os.path.isdir(os.path.join(path, ".svn")):
+        return fallback
+
+    import subprocess
+    try:
+        info = subprocess.Popen(["svn", "info", path],
+                                stdout=subprocess.PIPE).communicate()[0]
+    except:
+        # possibly 'svn' isnt found/installed
+        return fallback
+
+    # string version, we only want the URL
+    info = info.decode(encoding="utf-8", errors="ignore")
+
+    for l in info.split("\n"):
+        l = l.strip()
+        if l.startswith("URL"):
+            # https://svn.blender.org/svnroot/bf-blender/branches/bmesh/blender
+            # --> bmesh
+            if "/branches/" in l:
+                return prefix + l.rsplit("/branches/", 1)[-1].split("/", 1)[0]
+    return fallback

build_files/cmake/project_source_info.py

@@ -43,12 +43,12 @@ SOURCE_DIR = abspath(SOURCE_DIR)
 
 def is_c_header(filename):
     ext = os.path.splitext(filename)[1]
-    return (ext in {".h", ".hpp", ".hxx", ".hh"})
+    return (ext in (".h", ".hpp", ".hxx"))
 
 
 def is_c(filename):
     ext = os.path.splitext(filename)[1]
-    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".osl"})
+    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
 
 
 def is_c_any(filename):
@@ -82,20 +82,10 @@ def makefile_log():
     import subprocess
     import time
 
-    # support both make and ninja
-    make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
-    make_exe_basename = os.path.basename(make_exe)
-
-    if make_exe_basename.startswith(("make", "gmake")):
-        print("running 'make' with --dry-run ...")
-        process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
-                                   stdout=subprocess.PIPE,
-                                   )
-    elif make_exe_basename.startswith("ninja"):
-        print("running 'ninja' with -t commands ...")
-        process = subprocess.Popen([make_exe, "-t", "commands"],
-                                   stdout=subprocess.PIPE,
-                                   )
+    print("running make with --dry-run ...")
+    process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
+                                stdout=subprocess.PIPE,
+                                )
 
     while process.poll():
         time.sleep(1)
@@ -155,12 +145,6 @@ def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None):
 
             source.append((c, inc_dirs, defs))
 
-        # make relative includes absolute
-        # not totally essential but useful
-        for i, f in enumerate(inc_dirs):
-            if not os.path.isabs(f):
-                inc_dirs[i] = os.path.abspath(os.path.join(CMAKE_DIR, f))
-
         # safety check that our includes are ok
         for f in inc_dirs:
             if not os.path.exists(f):
@@ -171,26 +155,6 @@ def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None):
     return source
 
 
-def build_defines_as_source():
-    """
-    Returns a string formatted as an include:
-        '#defines A=B\n#define....'
-    """
-    import subprocess
-    # works for both gcc and clang
-    cmd = (cmake_cache_var("CMAKE_C_COMPILER"), "-dM", "-E", "-")
-    return subprocess.Popen(cmd,
-                            stdout=subprocess.PIPE,
-                            stdin=subprocess.DEVNULL,
-                            ).stdout.read().strip().decode('ascii')
-
-
-def build_defines_as_args():
-    return [("-D" + "=".join(l.split(maxsplit=2)[1:]))
-            for l in build_defines_as_source().split("\n")
-            if l.startswith('#define')]
-
-
 # could be moved elsewhere!, this just happens to be used by scripts that also
 # use this module.
 def queue_processes(process_funcs, job_total=-1):

build_files/package_spec/pacman/PKGBUILD

@@ -17,7 +17,7 @@ else
 	blender_version_full=${blender_version}
 fi
 
-blender_ver_string=$blender_version+git$blender_version_full
+blender_ver_string=$blender_version+svn$blender_version_full
 
 pkgname=blender-snapshot
 pkgver=$blender_ver_string
@@ -27,8 +27,8 @@ arch=('i686' 'x86_64')
 url="www.blender.org"
 license=('GPL')
 groups=()
-depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr'  'python>=3.4' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'ffmpeg')
-makedepends=('cmake' 'git')
+depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr'  'python>=3.2' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'ffmpeg')
+makedepends=('cmake' 'svn')
 optdepends=()
 provides=()
 conflicts=('blender')
@@ -36,7 +36,7 @@ replaces=('blender')
 backup=()
 options=()
 install=blender.install
-# use current git to make the package.
+# use current svn to make the package.
 # source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
 # md5sums=('27edb80c82c25252d43d6a01980d953a') #generate with 'makepkg -g'
 source=()
@@ -51,7 +51,11 @@ build() {
     -DCMAKE_BUILD_TYPE:STRING=Release \
     -DWITH_INSTALL_PORTABLE:BOOL=OFF \
     -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=OFF
+    -DWITH_OPENCOLLADA:BOOL=OFF \
+	-DPYTHON_VERSION:STRING=3.2 \
+	-DPYTHON_LIBPATH:STRING=/usr/lib \
+	-DPYTHON_LIBRARY:STRING=python3.2mu \
+	-DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu
 
   make $MAKEFLAGS
 }

build_files/package_spec/rpm/blender.spec.in

@@ -76,8 +76,6 @@ fi || :
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/%{name}/%{blender_api}/datafiles/fonts
-%{_datadir}/%{name}/%{blender_api}/datafiles/colormanagement
-%{_datadir}/%{name}/%{blender_api}/datafiles/locale/languages
 %{_datadir}/%{name}/%{blender_api}/scripts
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/%{name}.desktop

build_files/scons/Modules/FindPython.py

@@ -1,50 +0,0 @@
-import os
-import platform
-
-def FindPython():
-    all_abi_flags = ['m', 'mu', '']
-
-    python = "/usr"
-    abi_flags = "m"  # Most common for linux distros
-    version = "3.4"
-
-    _arch = platform.uname()[4] + "-linux-gnu"
-
-    # Determine ABI flags used on this system
-    include = os.path.join(python, "include")
-    for cur_flags in all_abi_flags:
-        inc = os.path.join(include, "python" + version + cur_flags, "Python.h")
-        if os.path.exists(inc):
-            abi_flags = cur_flags
-            break
-
-    # Find config.h. In some distros, such as ubuntu 12.10 they are not in standard include dir.
-    incconf = os.path.join(include, _arch, "python" + version + cur_flags)
-    if not os.path.exists(os.path.join(incconf, "pyconfig.h")):
-        incconf = ''
-
-    # Determine whether python is in /usr/lib or /usr/lib64
-    lib32 = os.path.join(python, "lib", "python" + version, "sysconfig.py")
-    lib64 = os.path.join(python, "lib64", "python" + version, "sysconfig.py")
-    if os.path.exists(lib32):
-        libpath = "${BF_PYTHON}/lib"
-    elif os.path.exists(lib64):
-        libpath = "${BF_PYTHON}/lib64"
-    else:
-        # roll back to default value
-        libpath = "${BF_PYTHON}/lib"
-
-    libpath_arch = libpath
-    _libpath_arch = os.path.join(python, "lib", _arch)  # No lib64 stuff with recent deb-like distro afaik...
-    _libs = ["libpython" + version + abi_flags + ext for ext in (".so", ".a")]
-    for l in _libs:
-        if not os.path.exists(os.path.join(libpath, l)) and os.path.exists(os.path.join(_libpath_arch, l)):
-            libpath_arch = os.path.join(libpath, _arch)
-            break
-
-    return {"PYTHON": python,
-            "VERSION": version,
-            "LIBPATH": libpath,
-            "LIBPATH_ARCH": libpath_arch,
-            "ABI_FLAGS": abi_flags,
-            "CONFIG": incconf}

build_files/scons/Modules/FindSharedPtr.py

@@ -1,42 +0,0 @@
-def FindSharedPtr(conf):
-    """
-    Detect shared_ptr availability
-    """
-
-    found = False
-    namespace = None
-    header = None
-
-    if conf.CheckCXXHeader("memory"):
-        # Finding the memory header doesn't mean that shared_ptr is in std
-        # namespace.
-        #
-        # In particular, MSVC 2008 has shared_ptr declared in std::tr1.  In
-        # order to support this, we do an extra check to see which namespace
-        # should be used.
-
-        if conf.CheckType('std::shared_ptr<int>', language = 'C++', includes="#include <memory>"):
-            print("-- Found shared_ptr in std namespace using <memory> header.")
-            namespace = 'std'
-            header = 'memory'
-        elif conf.CheckType('std::tr1::shared_ptr<int>', language = 'C++', includes="#include <memory>"):
-            print("-- Found shared_ptr in std::tr1 namespace using <memory> header..")
-            namespace = 'std::tr1'
-            header = 'memory'
-
-    if not namespace and conf.CheckCXXHeader("tr1/memory"):
-        # Further, gcc defines shared_ptr in std::tr1 namespace and
-        # <tr1/memory> is to be included for this. And what makes things
-        # even more tricky is that gcc does have <memory> header, so
-        # all the checks above wouldn't find shared_ptr.
-        if conf.CheckType('std::tr1::shared_ptr<int>', language = 'C++', includes="#include <tr1/memory>"):
-            print("-- Found shared_ptr in std::tr1 namespace using <tr1/memory> header..")
-            namespace = 'std::tr1'
-            header = 'tr1/memory'
-
-    if not namespace:
-        print("-- Unable to find shared_ptrred_map>.")
-
-    conf.env['WITH_SHARED_PTR_SUPPORT'] = namespace and header
-    conf.env['SHARED_PTR_NAMESPACE'] = namespace
-    conf.env['SHARED_PTR_HEADER'] = header

build_files/scons/Modules/FindUnorderedMap.py

@@ -1,38 +0,0 @@
-def FindUnorderedMap(conf):
-    """
-    Detect unordered_map availability
-    """
-
-    namespace = None
-    header = None
-
-    if conf.CheckCXXHeader("unordered_map"):
-        # Even so we've found unordered_map header file it doesn't
-        # mean unordered_map and unordered_set will be declared in
-        # std namespace.
-        #
-        # Namely, MSVC 2008 have unordered_map header which declares
-        # unordered_map class in std::tr1 namespace. In order to support
-        # this, we do extra check to see which exactly namespace is
-        # to be used.
-
-        if conf.CheckType('std::unordered_map<int, int>', language = 'CXX', includes="#include <unordered_map>"):
-            print("-- Found unordered_map/set in std namespace.")
-            namespace = 'std'
-            header = 'unordered_map'
-        elif conf.CheckType('std::tr1::unordered_map<int, int>', language = 'CXX', includes="#include <unordered_map>"):
-            print("-- Found unordered_map/set in std::tr1 namespace.")
-            namespace = 'std::tr1'
-            header = 'unordered_map'
-        else:
-            print("-- Found <unordered_map> but can not find neither std::unordered_map nor std::tr1::unordered_map.")
-    elif conf.CheckCXXHeader("tr1/unordered_map"):
-        print("-- Found unordered_map/set in std::tr1 namespace.")
-        namespace = 'std::tr1'
-        header = 'tr1/unordered_map'
-    else:
-        print("-- Unable to find <unordered_map> or <tr1/unordered_map>. ")
-
-    conf.env['WITH_UNORDERED_MAP_SUPPORT'] = namespace and header
-    conf.env['UNORDERED_MAP_NAMESPACE'] = namespace
-    conf.env['UNORDERED_MAP_HEADER'] = header

build_files/scons/config/Modules/FindPython.py

@@ -0,0 +1,32 @@
+import os
+
+def FindPython():
+    all_abi_flags = ['m', 'mu', '']
+
+    python = "/usr"
+    abi_flags = "m"  # Most common for linux distros
+    version = "3.2"
+
+    # Determine ABI flags used on this system
+    include = os.path.join(python, "include")
+    for cur_flags in all_abi_flags:
+        inc = os.path.join(include, "python" + version + cur_flags, "Python.h")
+        if os.path.exists(inc):
+            abi_flags = cur_flags
+            break
+
+    # Determine whether python is in /usr/lib or /usr/lib64
+    lib32 = os.path.join(python, "lib", "python" + version, "sysconfig.py")
+    lib64 = os.path.join(python, "lib64", "python" + version, "sysconfig.py")
+    if os.path.exists(lib32):
+        libpath = "${BF_PYTHON}/lib"
+    elif os.path.exists(lib64):
+        libpath = "${BF_PYTHON}/lib64"
+    else:
+        # roll back to default value
+        libpath = "${BF_PYTHON}/lib"
+
+    return {'PYTHON': python,
+            "VERSION": version,
+            'LIBPATH': libpath,
+            'ABI_FLAGS': abi_flags}

build_files/scons/config/darwin-config.py

@@ -1,23 +1,115 @@
+#
+# Note : if you want to alter this file
+# copy it as a whole in the upper folder
+# as user-config.py
+# dont create a new file with only some
+# vars changed.
+
 import commands
 
-#############################################################################
-###################     Compiler & architecture settings      ##################
-#############################################################################
+# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
+USE_SDK=True
 
-MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
-MACOSX_SDK='' # set an sdk name like '10.7' or leave empty for automatic choosing highest available
-MACOSX_DEPLOYMENT_TARGET = '10.6'
+#############################################################################
+###################     Cocoa & architecture settings      ##################
+#############################################################################
+WITH_GHOST_COCOA=True
+MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+
+
+cmd = 'uname -p'
+MAC_PROC=commands.getoutput(cmd)
+cmd = 'uname -r'
+cmd_res=commands.getoutput(cmd)
+
+if cmd_res[:1]=='7':
+    MAC_CUR_VER='10.3'
+elif cmd_res[:1]=='8':
+    MAC_CUR_VER='10.4'
+elif cmd_res[:1]=='9':
+    MAC_CUR_VER='10.5'
+elif cmd_res[:2]=='10':
+    MAC_CUR_VER='10.6'
+elif cmd_res[:2]=='11':
+    MAC_CUR_VER='10.7'
+elif cmd_res[:2]=='12':
+    MAC_CUR_VER='10.8'
+cmd = 'xcodebuild -version'
+cmd_xcode=commands.getoutput(cmd)
+XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
+cmd = 'xcodebuild -showsdks'
+cmd_sdk=commands.getoutput(cmd)
+MACOSX_SDK_CHECK=cmd_sdk
+
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+    USE_QTKIT=True # Carbon quicktime is not available for 64bit
+
+
+# Default target OSX settings per architecture
+# Can be customized
+
+if MACOSX_ARCHITECTURE == 'ppc' and MAC_CUR_VER == '10.4':
+# all releases are now made for 10.5 !
+#   MAC_MIN_VERS = '10.3'
+#   MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
+#   LCGDIR = '#../lib/darwin-6.1-powerpc'
+#   CC = 'gcc-3.3'
+#   CXX = 'g++-3.3'
+    MAC_MIN_VERS = '10.4'
+    MACOSX_DEPLOYMENT_TARGET = '10.4'
+    MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+    LCGDIR = '#../lib/darwin-8.0.0-powerpc'
+    CC = 'gcc-4.0'
+    CXX = 'g++-4.0'
+elif MACOSX_ARCHITECTURE == 'i386' and MAC_CUR_VER == '10.4':
+    MAC_MIN_VERS = '10.4'
+    MACOSX_DEPLOYMENT_TARGET = '10.4'
+    MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+    LCGDIR = '#../lib/darwin-8.x.i386'
+    CC = 'gcc-4.0'
+    CXX = 'g++-4.0'
+else :
+    if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
+        # OSX 10.5/6 with Xcode 3.x
+        MAC_MIN_VERS = '10.5'
+        MACOSX_DEPLOYMENT_TARGET = '10.5'
+        MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+        LCGDIR = '#../lib/darwin-9.x.universal'
+        CC = 'gcc-4.2'
+        CXX = 'g++-4.2'
+    elif 'Mac OS X 10.6' in MACOSX_SDK_CHECK:
+        # OSX 10.6/7 with Xcode 4.x
+        MAC_MIN_VERS = '10.6'
+        MACOSX_DEPLOYMENT_TARGET = '10.6'
+        MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
+        LCGDIR = '#../lib/darwin-9.x.universal'
+        CC = 'gcc-4.2'
+        CXX = 'g++-4.2'
+    else:
+        # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
+        MAC_MIN_VERS = '10.6'
+        MACOSX_DEPLOYMENT_TARGET = '10.6'
+        MACOSX_SDK='/Developer/SDKs/MacOSX10.7.sdk'
+        LCGDIR = '#../lib/darwin-9.x.universal'
+        CC = 'gcc'
+        CXX = 'g++'
 
-# gcc always defaults to the system standard compiler linked by a shim or symlink
-CC = 'gcc'
-CXX = 'g++'
-LCGDIR = '#../lib/darwin-9.x.universal'
 LIBDIR = '${LCGDIR}'
 
+if XCODE_CUR_VER >= '4.3':  ## since version 4.3, XCode and developer dir are bundled ##
+	MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
+
 #############################################################################
 ###################          Dependency settings           ##################
 #############################################################################
 
+#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
+# if your compiler does not have accurate suffix you may have to enable it by hand !
+if CC[:-2].endswith('4.6'):
+    WITH_BF_OPENMP = True  # multithreading for fluids, cloth, sculpt and smoke
+else:
+    WITH_BF_OPENMP = False
+
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR + '/ffmpeg'
@@ -26,19 +118,36 @@ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'
 #bz2 is a standard osx dynlib
 
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.2'
 WITH_OSX_STATICPYTHON = True
 
-# python 3.4 uses precompiled libraries in bf svn /lib by default
-BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}m'
-# BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}m'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
-# BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
+if WITH_OSX_STATICPYTHON:
+    # python 3.2 uses precompiled libraries in bf svn /lib by default
+
+    BF_PYTHON = LIBDIR + '/python'
+    BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+    # BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+    BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+    BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
+    # BF_PYTHON_LINKFLAGS = ['-u', '_PyMac_Error', '-framework', 'System']
+else:
+    # python 3.2 uses Python-framework additionally installed in /Library/Frameworks
+
+    BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+    BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}m'
+    BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+    #BF_PYTHON_LIB = ''
+    BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config-3.2m'
 
 WITH_BF_OPENAL = True
-BF_OPENAL = LIBDIR + '/openal'
+#different lib must be used  following version of gcc
+# for gcc 3.3
+#BF_OPENAL = LIBDIR + '/openal'
+# for gcc 3.4 and ulterior
+if MAC_PROC == 'powerpc':
+    BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+else :
+    BF_OPENAL = LIBDIR + '/openal'
 
 WITH_BF_STATICOPENAL = False
 BF_OPENAL_INC = '${BF_OPENAL}/include' # only headers from libdir needed for proper use of framework !!!!
@@ -56,7 +165,7 @@ BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 WITH_BF_JACK = True
 BF_JACK = '/Library/Frameworks/Jackmp.framework'
 BF_JACK_INC = '${BF_JACK}/headers'
-#BF_JACK_LIB = 'jack' # not used due framework
+BF_JACK_LIB = 'jack'
 BF_JACK_LIBPATH = '${BF_JACK}'
 
 WITH_BF_SNDFILE = True
@@ -68,7 +177,7 @@ BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib ${BF_FFMPEG}/lib' #ogg libs are stored i
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL2' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 WITH_BF_OPENEXR = True
@@ -82,18 +191,19 @@ BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf
 
 WITH_BF_DDS = True
 
+#Color Management System
+WITH_BF_LCMS = False
+BF_LCMS = LIBDIR + '/lcms'
+BF_LCMS_INC = '${BF_LCMS}/include'
+BF_LCMS_LIB = 'lcms'
+BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
+
 WITH_BF_JPEG = True
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'jpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
-WITH_BF_OPENJPEG = True
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
 WITH_BF_PNG = True
 BF_PNG = LIBDIR + '/png'
 BF_PNG_INC = '${BF_PNG}/include'
@@ -108,11 +218,16 @@ BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
 
 WITH_BF_ZLIB = True
 BF_ZLIB = '/usr'
-#BF_ZLIB_INC = '${BF_ZLIB}/include' # don't use this, it breaks -isysroot ${MACOSX_SDK}
+BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'z'
 
 WITH_BF_INTERNATIONAL = True
 
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
 WITH_BF_OCEANSIM = True
@@ -154,7 +269,7 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
 BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa'
 BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada'
 BF_PCRE = LIBDIR + '/opencollada'
 BF_PCRE_LIB = 'pcre'
@@ -166,56 +281,31 @@ BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
 # Cycles
 WITH_BF_CYCLES = True
 
-#OSL
-
-WITH_BF_CYCLES_OSL = True
-BF_OSL = LIBDIR + '/osl'
-BF_OSL_INC = '${BF_OSL}/include'
-# note oslexec would passed via program linkflags, which is needed to
-# make llvm happy with osl_allocate_closure_component
-#BF_OSL_LIB = 'oslcomp oslquery'
-BF_OSL_LIBPATH = '${BF_OSL}/lib'
-BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-
-WITH_BF_LLVM = True
-BF_LLVM = LIBDIR + '/llvm'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \
-    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
-    'LLVMTarget LLVMMC LLVMCore LLVMSupport LLVMObject'
-BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
-
 WITH_BF_OIIO = True
 BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_INC = BF_OIIO + '/include'
 BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_OCIO = True
-BF_OCIO = LIBDIR + '/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+BF_OIIO_LIBPATH = BF_OIIO + '/lib'
 
 WITH_BF_BOOST = True
 BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt boost_wave-mt'
-BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mt'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+BF_BOOST_INC = BF_BOOST + '/include'
+BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt'
+BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']
-
-#Freestyle
-WITH_BF_FREESTYLE = True
-
-#OpenMP ( will be checked for compiler support and turned off eventually )
-WITH_BF_OPENMP = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
 
 #Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = []
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
+    WITH_BF_RAYOPTIMIZATION = True
+else:
+    WITH_BF_RAYOPTIMIZATION = False
+if MACOSX_ARCHITECTURE == 'i386':
+    BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+elif MACOSX_ARCHITECTURE == 'x86_64':
+    BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
 
 # SpaceNavigator and related 3D mice, driver must be 3DxWare 10 Beta 4 (Mac OS X) or later !
 WITH_BF_3DMOUSE = True
@@ -226,18 +316,65 @@ WITH_BF_3DMOUSE = True
 
 BF_QUIET = '1' # suppress verbose output
 
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+    ARCH_FLAGS = ['-m64']
+else:
+    ARCH_FLAGS = ['-m32']
+
 CFLAGS = []
 CXXFLAGS = []
 CCFLAGS = ['-pipe','-funsigned-char']
-CPPFLAGS = []
 
-PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']
+CPPFLAGS = list(ARCH_FLAGS)
 
-LLIBS = ['stdc++']
+if WITH_GHOST_COCOA:
+    PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
+else:
+    PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
 
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2']
+if WITH_BF_QUICKTIME:
+    if USE_QTKIT:
+        PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
+    else:
+        PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
+
+if not WITH_OSX_STATICPYTHON:
+    PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','Python']
+
+
+#note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
+#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
+    LLIBS = ['stdc++']
+else:
+    LLIBS = ['stdc++', 'SystemStubs']
+
+# some flags shuffling for different OS versions
+if MAC_MIN_VERS == '10.3':
+    CCFLAGS = ['-fuse-cxa-atexit'] + CCFLAGS
+    PLATFORM_LINKFLAGS = ['-fuse-cxa-atexit'] + PLATFORM_LINKFLAGS
+    LLIBS.append('crt3.o')
+
+if USE_SDK:
+    SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE]
+    PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
+    CCFLAGS=SDK_FLAGS+CCFLAGS
+    CXXFLAGS=SDK_FLAGS+CXXFLAGS
+
+#Intel Macs are CoreDuo and Up
+if MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'x86_64':
+    REL_CFLAGS = []
+    REL_CXXFLAGS = []
+    REL_CCFLAGS = ['-DNDEBUG', '-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mfpmath=sse']
+else:
+    CCFLAGS += ['-fno-strict-aliasing']
+    REL_CFLAGS = []
+    REL_CXXFLAGS = []
+    REL_CCFLAGS = ['-DNDEBUG', '-O2']
+
+# Intel 64bit Macs are Core2Duo and up
+if MACOSX_ARCHITECTURE == 'x86_64':
+    REL_CCFLAGS += ['-march=core2','-mssse3','-with-tune=core2','-enable-threads']
 
 CC_WARN = ['-Wall']
 C_WARN = ['-Wno-char-subscripts', '-Wpointer-arith', '-Wcast-align', '-Wdeclaration-after-statement', '-Wno-unknown-pragmas', '-Wstrict-prototypes']
@@ -253,7 +390,7 @@ BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE = False
 
 BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
 
 #############################################################################
 ###################           Output directories           ##################

build_files/scons/config/freebsd7-config.py

@@ -0,0 +1,212 @@
+CC = 'gcc44'
+CXX = 'g++44'
+
+LCGDIR = '../lib/freebsd7'
+LIBDIR = "${LCGDIR}"
+
+BF_PYTHON_ABI_FLAGS = ''
+BF_PYTHON = '/usr/local'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_VERSION = '3.2'
+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}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = '/usr/local'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+BF_CXX = '/usr/local'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_JACK = True
+BF_JACK = '/usr/local'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = '/usr/local'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr/local'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr/local'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr/local'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+
+WITH_BF_TIFF = True
+BF_TIFF = '/usr/local'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr/local'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_FREETYPE = '/usr/local'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+
+### XXX Find what this actually wants; it doesn't want libquicktime.
+WITH_BF_QUICKTIME = False
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = True
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True
+BF_FFMPEG = '/usr/local'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = True
+BF_OGG = '/usr/local'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
+
+WITH_BF_OPENJPEG = True
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/usr/local'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_REDCODE = False
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+# BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = '/usr/local'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+BF_OPENCOLLADA = '/usr'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_PCRE = '/usr/local'
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+BF_EXPAT = '/usr/local'
+BF_EXPAT_LIB = 'expat'
+BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
+
+WITH_GHOST_XDND = False
+
+WITH_BF_OPENMP = True
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
+
+CPPFLAGS = []
+CXXFLAGS = []
+if WITH_BF_FFMPEG:
+    # libavutil needs UINT64_C()
+    CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-DNDEBUG', '-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
+CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
+
+BF_BUILDDIR = '../build/freebsd7'
+BF_INSTALLDIR='../install/freebsd7'
+
+#Link against pthread
+PLATFORM_LINKFLAGS = ['-pthread']

build_files/scons/config/freebsd8-config.py

@@ -0,0 +1,212 @@
+CC = 'gcc44'
+CXX = 'g++44'
+
+LCGDIR = '../lib/freebsd8'
+LIBDIR = "${LCGDIR}"
+
+BF_PYTHON_ABI_FLAGS = ''
+BF_PYTHON = '/usr/local'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_VERSION = '3.2'
+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}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = '/usr/local'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+BF_CXX = '/usr/local'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_JACK = True
+BF_JACK = '/usr/local'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = '/usr/local'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr/local'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr/local'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr/local'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+
+WITH_BF_TIFF = True
+BF_TIFF = '/usr/local'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr/local'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_FREETYPE = '/usr/local'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+
+### XXX Find what this actually wants; it doesn't want libquicktime.
+WITH_BF_QUICKTIME = False
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = True
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True
+BF_FFMPEG = '/usr/local'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = True
+BF_OGG = '/usr/local'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
+
+WITH_BF_OPENJPEG = True
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/usr/local'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_REDCODE = False
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+# BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = '/usr/local'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+BF_OPENCOLLADA = '/usr'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_PCRE = '/usr/local'
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+BF_EXPAT = '/usr/local'
+BF_EXPAT_LIB = 'expat'
+BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
+
+WITH_BF_OPENMP = True
+
+WITH_GHOST_XDND = False
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
+
+CPPFLAGS = []
+CXXFLAGS = []
+if WITH_BF_FFMPEG:
+    # libavutil needs UINT64_C()
+    CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-DNDEBUG', '-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
+CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
+
+BF_BUILDDIR = '../build/freebsd8'
+BF_INSTALLDIR='../install/freebsd8'
+
+#Link against pthread
+PLATFORM_LINKFLAGS = ['-pthread']

build_files/scons/config/freebsd9-config.py

@@ -0,0 +1,212 @@
+CC = 'gcc44'
+CXX = 'g++44'
+
+LCGDIR = '../lib/freebsd9'
+LIBDIR = "${LCGDIR}"
+
+BF_PYTHON_ABI_FLAGS = ''
+BF_PYTHON = '/usr/local'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_VERSION = '3.2'
+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}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = '/usr/local'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+BF_CXX = '/usr/local'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_JACK = True
+BF_JACK = '/usr/local'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = '/usr/local'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '/usr/local'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = '/usr/local'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr/local'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+
+WITH_BF_TIFF = True
+BF_TIFF = '/usr/local'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = '/usr/local'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = True
+WITH_BF_OCEANSIM = True
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_FREETYPE = '/usr/local'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+
+### XXX Find what this actually wants; it doesn't want libquicktime.
+WITH_BF_QUICKTIME = False
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = True
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True
+BF_FFMPEG = '/usr/local'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = True
+BF_OGG = '/usr/local'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'
+
+WITH_BF_OPENJPEG = True
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/usr/local'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_REDCODE = False
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+# BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_INC = '${BF_REDCODE}/../' #C files request "libredcode/format.h" which is in "#extern/libredcode/format.h", stupid but compiles for now.
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = '/usr/local'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
+
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+BF_OPENCOLLADA = '/usr'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_PCRE = '/usr/local'
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+BF_EXPAT = '/usr/local'
+BF_EXPAT_LIB = 'expat'
+BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
+
+WITH_BF_OPENMP = True
+
+WITH_GHOST_XDND = False
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
+CXXFLAGS = []
+
+CPPFLAGS = []
+if WITH_BF_FFMPEG:
+    # libavutil needs UINT64_C()
+    CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-DNDEBUG', '-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
+CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['util', 'c', 'm', 'pthread', 'stdc++']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
+
+BF_BUILDDIR = '../build/freebsd9'
+BF_INSTALLDIR='../install/freebsd9'
+
+#Link against pthread
+PLATFORM_LINKFLAGS = ['-pthread']

build_files/scons/config/linux-config.py

@@ -1,19 +1,27 @@
-from FindPython import FindPython
+# find library directory
+import platform
+import os
+from Modules.FindPython import FindPython
+
+bitness = platform.architecture()[0]
+if bitness == '64bit':
+    LCGDIR = '../lib/linux64'
+else:
+    LCGDIR = '../lib/linux'
+LIBDIR = "#${LCGDIR}"
 
 py = FindPython()
 
 BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS']
 BF_PYTHON = py['PYTHON']
 BF_PYTHON_LIBPATH = py['LIBPATH']
-BF_PYTHON_LIBPATH_ARCH = py['LIBPATH_ARCH']
-BF_PYTHON_CONFIG = py['CONFIG']
 BF_PYTHON_VERSION = py['VERSION']
 WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS} ' + BF_PYTHON_CONFIG
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'  # 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_LIBPATH_ARCH}/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a'
 
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False
@@ -81,6 +89,13 @@ BF_ZLIB_LIB = 'z'
 
 WITH_BF_INTERNATIONAL = True
 
+BF_GETTEXT = '/usr'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextlib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+#WITH_BF_GETTEXT_STATIC = True
+#BF_GETTEXT_LIB_STATIC = '${BF_GETTEXT}/lib/libgettextlib.a'
+
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
 WITH_BF_OCEANSIM = True
@@ -100,8 +115,12 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 #BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a'
 
+WITH_BF_QUICKTIME = False
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
 WITH_BF_ICONV = False
-BF_ICONV = "/usr"
+BF_ICONV = LIBDIR + "/iconv"
 BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
@@ -110,7 +129,18 @@ WITH_BF_BINRELOC = True
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True
-BF_FFMPEG = '/usr'
+BF_FFMPEG = LIBDIR + '/ffmpeg'
+if os.path.exists(LCGDIR + '/ffmpeg'):
+    WITH_BF_STATICFFMPEG = True
+    BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+        '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+        '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+        '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+        '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+        '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
+        '${BF_FFMPEG_LIBPATH}/libfaad.a'
+else:
+    BF_FFMPEG = '/usr'
 BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -148,7 +178,7 @@ BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
 WITH_BF_STATICOPENGL = False
 BF_OPENGL = '/usr'
 BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU X11 Xi Xxf86vm'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
@@ -157,9 +187,9 @@ BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 BF_OPENCOLLADA = '/usr'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}'
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 BF_PCRE = ''
 BF_PCRE_LIB = 'pcre'
 BF_PCRE_LIBPATH = '/usr/lib'
@@ -175,38 +205,31 @@ BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
 BF_JEMALLOC_LIB = 'jemalloc'
 BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
 
-WITH_BF_OIIO = False
+WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = False
-BF_OIIO = '/usr'
-BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO = LIBDIR + '/oiio'
+if not os.path.exists(LCGDIR + '/oiio'):
+    WITH_BF_OIIO = False
+    BF_OIIO = '/usr'
+BF_OIIO_INC = BF_OIIO + '/include'
 BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_OCIO = False
-WITH_BF_STATICOCIO = False
-BF_OCIO = '/usr'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO yaml-cpp tinyxml'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+BF_OIIO_LIBPATH = BF_OIIO + '/lib'
 
 WITH_BF_BOOST = True
 WITH_BF_STATICBOOST = False
-BF_BOOST = '/usr'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'boost_filesystem boost_regex boost_system boost_thread boost_date_time'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIB_INTERNATIONAL = 'boost_locale'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+BF_BOOST = LIBDIR + '/boost'
+if not os.path.exists(LCGDIR + '/boost'):
+    WITH_BF_BOOST = False
+    BF_BOOST = '/usr'
+BF_BOOST_INC = BF_BOOST + '/include'
+BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
+BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 
 WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
 
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
 
 WITH_BF_OPENMP = True
 
@@ -223,12 +246,11 @@ BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
 BF_3DMOUSE_LIB = 'spnav'
 BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
 
-#Freestyle
-WITH_BF_FREESTYLE = True
-
 ##
 CC = 'gcc'
 CXX = 'g++'
+##ifeq ($CPU),alpha)
+##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
 
 CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
 CXXFLAGS = []
@@ -241,20 +263,30 @@ if WITH_BF_FFMPEG:
     CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
 REL_CFLAGS = []
 REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2']
-
+REL_CCFLAGS = ['-DNDEBUG', '-O2']
+##BF_DEPEND = True
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wunused-parameter', '-Wstrict-prototypes', '-Werror=declaration-after-statement', '-Werror=implicit-function-declaration', '-Werror=return-type']
 CC_WARN = ['-Wall']
 CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
 
-LLIBS = ['util', 'c', 'm', 'dl', 'pthread']
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
 
 BF_PROFILE = False
 BF_PROFILE_CCFLAGS = ['-pg','-g']
 BF_PROFILE_LINKFLAGS = ['-pg']
 
 BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
 
 BF_BUILDDIR = '../build/linux'
 BF_INSTALLDIR='../install/linux'
@@ -262,6 +294,3 @@ BF_INSTALLDIR='../install/linux'
 #Link against pthread
 PLATFORM_LINKFLAGS = ['-pthread']
 
-#Fix for LLVM conflict with Mesa llvmpipe, SDL dynload also requires symbols to be hidden.
-# TODO(sergey): Move this to SConstruct, so we can have this line depended on user config.
-PLATFORM_LINKFLAGS += ['-Wl,--version-script=source/creator/blender.map']

build_files/scons/config/linuxcross-config.py

@@ -0,0 +1,195 @@
+LCGDIR = '#../lib/windows'
+LIBDIR = '${LCGDIR}'
+
+BF_PYTHON = LIBDIR + '/python'
+BF_PYTHON_VERSION = '3.2'
+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 = 'python31'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+
+WITH_BF_OPENAL = True
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_JACK = False
+BF_JACK = LIBDIR + '/jack'
+BF_JACK_INC = '${BF_JACK}/include'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile-1'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+BF_PTHREADS = LIBDIR + '/pthreads'
+BF_PTHREADS_INC = '${BF_PTHREADS}/include'
+BF_PTHREADS_LIB = 'pthreadGC2'
+BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = LIBDIR + '/gcc/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = ' Half IlmImf Iex IlmThread '
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = LIBDIR + '/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'libjpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/png'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+WITH_BF_TIFF = True
+BF_TIFF = LIBDIR + '/gcc/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = LIBDIR + '/zlib'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'libz'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = True
+
+BF_GETTEXT = LIBDIR + '/gcc/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = False
+WITH_BF_OCEANSIM = True
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_WINTAB = LIBDIR + '/wintab'
+BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
+
+BF_WITH_FREETYPE = True
+BF_FREETYPE = LIBDIR + '/gcc/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = False
+BF_ICONV = LIBDIR + "/gcc/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = False
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True
+BF_FFMPEG = LIBDIR + '/ffmpeg'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+
+WITH_BF_OPENJPEG = True
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_FFTW3 = False
+BF_FFTW3 = LIBDIR + '/gcc/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_REDCODE = False
+BF_REDCODE_INC = '#extern'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = False
+BF_OPENGL = 'C:\\MingW'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB = 'opengl32 glu32'
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a']
+
+WITH_BF_OPENMP = False
+BF_OPENMP = LIBDIR + '/gcc/gomp'
+BF_OPENMP_INC = '${BF_OPENMP}/include'
+BF_OPENMP_LIBPATH = '${BF_OPENMP}/lib'
+
+WITH_BF_COLLADA = False
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+
+BF_OPENCOLLADA = LIBDIR + '/gcc/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib ${BF_ICONV_LIBPATH}'
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+
+CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
+CXXFLAGS = []
+
+CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+REL_CCFLAGS = ['-DNDEBUG',  '-O2']
+C_WARN = ['-Wall', '-Wstrict-prototypes', '-Wno-char-subscripts', '-Wdeclaration-after-statement']
+
+CC_WARN = [ '-Wall' ]
+
+LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++', '-luuid', '-lole32'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
+
+PLATFORM_LINKFLAGS = ['--stack,2097152']
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
+
+BF_PROFILE = False
+BF_PROFILE_CCFLAGS = ['-pg','-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+
+BF_BUILDDIR = '../build/linuxcross'
+BF_INSTALLDIR='../install/linuxcross'

build_files/scons/config/win32-mingw-config.py

@@ -2,12 +2,12 @@ LCGDIR = '#../lib/mingw32'
 LIBDIR = "${LCGDIR}"
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.2'
 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 = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
+BF_PYTHON_DLL = 'python32'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
 
@@ -18,10 +18,10 @@ BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = True
-BF_FFMPEG_LIB = 'avformat-55 avcodec-55 avdevice-55 avutil-52 swscale-2'
+BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 WITH_BF_JACK = False
 BF_JACK = LIBDIR + '/jack'
@@ -78,11 +78,16 @@ BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
 WITH_BF_ZLIB = True
 BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = True
 
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
 WITH_BF_OPENJPEG = True
 BF_OPENJPEG = '#extern/libopenjpeg'
 BF_OPENJPEG_LIB = ''
@@ -112,6 +117,10 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
+WITH_BF_QUICKTIME = False
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
 WITH_BF_ICONV = False
 BF_ICONV = LIBDIR + "/iconv"
 BF_ICONV_INC = '${BF_ICONV}/include'
@@ -137,48 +146,33 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
-BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
+WITH_BF_CYCLES = True 
 
 WITH_BF_OIIO = True
 BF_OIIO = LIBDIR + '/openimageio'
-BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_INC = BF_OIIO + '/include'
 BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-WITH_BF_OCIO = True
-BF_OCIO = LIBDIR + '/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
+BF_OIIO_LIBPATH = BF_OIIO + '/lib'
 
 WITH_BF_BOOST = True
 BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_49 boost_filesystem-mgw46-mt-s-1_49 boost_regex-mgw46-mt-s-1_49 boost_system-mgw46-mt-s-1_49 boost_thread-mgw46-mt-s-1_49'
-BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mgw46-mt-s-1_49'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+BF_BOOST_INC = BF_BOOST + '/include'
+BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_47 boost_filesystem-mgw46-mt-s-1_47 boost_regex-mgw46-mt-s-1_47 boost_system-mgw46-mt-s-1_47 boost_thread-mgw46-mt-s-1_47'
+BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 
-WITH_BF_OPENMP = True
-
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
-
-#Freestyle
-WITH_BF_FREESTYLE = True
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
 
 ##
 CC = 'gcc'
@@ -190,22 +184,22 @@ CXXFLAGS = []
 CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2']
+REL_CCFLAGS = ['-DNDEBUG',  '-O2']
 
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
 
 CC_WARN = [ '-Wall' ]
 
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32', '-lpsapi', '-limm32']
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32', '-lpsapi']
 
 PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
 
 ## DISABLED, causes linking errors!
-## for re-distribution, so users dont need mingw installed
+## for re-distrobution, so users dont need mingw installed
 # PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
 
 BF_DEBUG = False
-BF_DEBUG_CCFLAGS= ['-g']
+BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
 
 BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE_LINKFLAGS = ['-pg']

build_files/scons/config/win32-vc-config.py

@@ -1,35 +1,21 @@
-import subprocess
-
-CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-CL_STDOUT, CL_STDERR = CL_OUT.communicate()
-
-if "18.00." in CL_STDERR:
-    VC_VERSION = '12.0'
-    LCGDIR = '#../lib/windows_vc12'
-else:
-    import sys
-    print("Visual C version not supported {}\n".format(CL_STDERR))
-    sys.exit(1)
-
+LCGDIR = '#../lib/windows'
 LIBDIR = '${LCGDIR}'
 
 WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-55.lib avcodec-55.lib avdevice-55.lib avutil-52.lib swscale-2.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.2'
 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]}'
+BF_PYTHON_LIB = 'python32'
 BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
@@ -57,7 +43,7 @@ BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL2.lib'
+BF_SDL_LIB = 'SDL.lib'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 BF_PTHREADS = LIBDIR + '/pthreads'
@@ -68,8 +54,8 @@ BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR '
-BF_OPENEXR_LIB = ' Iex-2_1 Half IlmImf-2_1 Imath-2_1 IlmThread-2_1 '
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
 
@@ -96,11 +82,16 @@ BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
 WITH_BF_ZLIB = True
 BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz_st'
+BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = True
 
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
 WITH_BF_OCEANSIM = True
@@ -126,6 +117,12 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype2ST'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
+WITH_BF_QUICKTIME = False
+BF_QUICKTIME = LIBDIR + '/QTDevWin'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
+BF_QUICKTIME_LIB = 'qtmlClient'
+BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
+
 WITH_BF_OPENJPEG = True 
 BF_OPENJPEG = '#extern/libopenjpeg'
 BF_OPENJPEG_LIB = ''
@@ -147,9 +144,9 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 WITH_BF_3DMOUSE = True
 
@@ -158,54 +155,27 @@ WITH_BF_OPENMP = True
 #Cycles
 WITH_BF_CYCLES = True 
 
-WITH_BF_CYCLES_OSL = True
-WITH_BF_STATICOSL = True
-BF_OSL = '${LIBDIR}/osl'
-BF_OSL_INC = '${BF_OSL}/include'
-BF_OSL_LIBPATH = '${BF_OSL}/lib'
-BF_OSL_LIB_STATIC = '${BF_OSL_LIBPATH}/oslcomp.lib ${BF_OSL_LIBPATH}/oslexec.lib ${BF_OSL_LIBPATH}/oslquery.lib '
-BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-
-WITH_BF_LLVM = True
-BF_LLVM = LIBDIR + '/llvm'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \
-    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
-    'LLVMTarget LLVMMC LLVMCore LLVMObject LLVMRuntimeDyld LLVMSupport'
-BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
-
 WITH_BF_OIIO = True
 BF_OIIO = '${LIBDIR}/openimageio'
 BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/OpenImageIO.lib'
-WITH_BF_STATICOIIO = True
-
-WITH_BF_OCIO = True
-BF_OCIO = '${LIBDIR}/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/OpenColorIO.lib'
-WITH_BF_STATICOCIO = True
 
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc120-mt-s-1_55 libboost_filesystem-vc120-mt-s-1_55 libboost_regex-vc120-mt-s-1_55 libboost_system-vc120-mt-s-1_55 libboost_thread-vc120-mt-s-1_55 libboost_wave-vc120-mt-s-1_55'
-BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc120-mt-s-1_55'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
 
-#Freestyle
-WITH_BF_FREESTYLE = True
-
 WITH_BF_STATICOPENGL = False
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
@@ -217,25 +187,22 @@ BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a'
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/J', '/W3', '/Gd', '/w34062', '/wd4018', '/wd4065', '/wd4127', '/wd4181', '/wd4200', '/wd4244', '/wd4267', '/wd4305', '/wd4800', '/we4013', '/we4431']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
 CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/Ob2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
 
-if VC_VERSION == '12.0':
-    CCFLAGS.append('/DOIIO_STATIC_BUILD')  # OIIO api changed with 1.4 making this needed 
-
-BF_DEBUG_CCFLAGS = ['/Zi', '/Ob0', '/Od', '/FR${TARGET}.sbr']
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
 CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2', '/Ob2']
+REL_CCFLAGS = ['-O2', '-DNDEBUG']
 
 C_WARN = []
 CC_WARN = []
 CXX_WARN = []
 
-LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid', 'psapi', 'imm32']
+LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
 PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
 
@@ -246,6 +213,5 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/IN
 
 BF_BSC=False
 
-BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
 BF_BUILDDIR = '..\\build\\win32-vc'
 BF_INSTALLDIR='..\\install\\win32-vc'

build_files/scons/config/win64-mingw-config.py

@@ -2,12 +2,12 @@ LCGDIR = '#../lib/mingw64'
 LIBDIR = "${LCGDIR}"
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.2'
 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 = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
+BF_PYTHON_DLL = 'python32'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = True
@@ -80,6 +80,11 @@ BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = True
 
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
 WITH_BF_OPENJPEG = True
 BF_OPENJPEG = '#extern/libopenjpeg'
 BF_OPENJPEG_LIB = ''
@@ -111,7 +116,9 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2/'
 BF_FREETYPE_LIB = 'freetype'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
-WITH_BF_ICONV = False
+WITH_BF_QUICKTIME = False
+
+WITH_BF_ICONV = True
 BF_ICONV = LIBDIR + "/iconv"
 BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
@@ -136,15 +143,15 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Cycles
 WITH_BF_CYCLES = True
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
 
 WITH_BF_OIIO = True
 BF_OIIO = LIBDIR + '/openimageio'
@@ -152,27 +159,18 @@ BF_OIIO_INC = '${BF_OIIO}/include'
 BF_OIIO_LIB = 'OpenImageIO'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 
-WITH_BF_OCIO = True
-BF_OCIO = LIBDIR + '/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB = 'OpenColorIO'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
 WITH_BF_BOOST = True
 BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_INC = BF_BOOST + '/include'
 BF_BOOST_LIB = 'boost_date_time-mgw47-mt-s-1_49 boost_date_time-mgw47-mt-sd-1_49 boost_filesystem-mgw47-mt-s-1_49 boost_filesystem-mgw47-mt-sd-1_49 boost_regex-mgw47-mt-s-1_49 boost_regex-mgw47-mt-sd-1_49 boost_system-mgw47-mt-s-1_49 boost_system-mgw47-mt-sd-1_49 boost_thread-mgw47-mt-s-1_49 boost_thread-mgw47-mt-sd-1_49'
-BF_BOOST_LIB_INTERNATIONAL = ' boost_locale-mgw47-mt-s-1_49 boost_locale-mgw47-mt-sd-1_49'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
 
-WITH_BF_OPENMP = True
-
-#Freestyle
-WITH_BF_FREESTYLE = True
+#May produce errors with unsupported MinGW-w64 builds
+WITH_BF_OPENMP = False
 
 ##
 CC = 'gcc'
@@ -184,22 +182,22 @@ CXXFLAGS = [ '-fpermissive' ]
 CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2', '-ftree-vectorize']
+REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize']
 
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
 
 CC_WARN = [ '-Wall' ]
 
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32', '-lpsapi', '-lpthread', '-limm32']
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid', '-lwsock32', '-lpsapi', '-lpthread']
 
 PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
 
 ## DISABLED, causes linking errors!
-## for re-distribution, so users dont need mingw installed
+## for re-distrobution, so users dont need mingw installed
 # PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
 
 BF_DEBUG = False
-BF_DEBUG_CCFLAGS= ['-g']
+BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
 
 BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE_LINKFLAGS = ['-pg']

build_files/scons/config/win64-vc-config.py

@@ -1,36 +1,21 @@
-import subprocess
-
-CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-CL_STDOUT, CL_STDERR = CL_OUT.communicate()
-
-if "18.00." in CL_STDERR:
-    VC_VERSION = '12.0'
-    LCGDIR = '#../lib/win64_vc12'
-else:
-    import sys
-    print("Visual C version not supported {}\n".format(CL_STDERR))
-    sys.exit(1)
- 
+LCGDIR = '#../lib/win64'
 LIBDIR = '${LCGDIR}'
 
 WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat-55.lib avcodec-55.lib avdevice-55.lib avutil-52.lib swscale-2.lib'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-55.dll ${BF_FFMPEG_LIBPATH}/avcodec-55.dll ${BF_FFMPEG_LIBPATH}/avdevice-55.dll ${BF_FFMPEG_LIBPATH}/avutil-52.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
-    
+BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.4'
+BF_PYTHON_VERSION = '3.2'
 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]}'
+BF_PYTHON_LIB = 'python32'
 BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
@@ -52,7 +37,7 @@ BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
-BF_SDL_LIB = 'SDL2.lib'
+BF_SDL_LIB = 'SDL.lib'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 WITH_BF_JACK = False
@@ -65,8 +50,8 @@ BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR '
-BF_OPENEXR_LIB = ' Iex-2_1 Half IlmImf-2_1 Imath-2_1 IlmThread-2_1 '
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
 
@@ -93,11 +78,16 @@ BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
 WITH_BF_ZLIB = True
 BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'libz_st'
+BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = True
 
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
 WITH_BF_GAMEENGINE = True
 WITH_BF_PLAYER = True
 WITH_BF_OCEANSIM = True
@@ -150,9 +140,9 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 WITH_BF_3DMOUSE = True
 
@@ -161,55 +151,29 @@ WITH_BF_OPENMP = True
 #Cycles
 WITH_BF_CYCLES = True
 
-WITH_BF_CYCLES_OSL = True
-WITH_BF_STATICOSL = True
-BF_OSL = '${LIBDIR}/osl'
-BF_OSL_INC = '${BF_OSL}/include'
-BF_OSL_LIBPATH = '${BF_OSL}/lib'
-BF_OSL_LIB_STATIC = '${BF_OSL_LIBPATH}/oslcomp.lib ${BF_OSL_LIBPATH}/oslexec.lib ${BF_OSL_LIBPATH}/oslquery.lib '
-BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-
-WITH_BF_LLVM = True
-BF_LLVM = LIBDIR + '/llvm'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \
-    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
-    'LLVMTarget LLVMMC LLVMCore LLVMObject LLVMRuntimeDyld LLVMSupport'
-BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
-
 WITH_BF_OIIO = True
 BF_OIIO = '${LIBDIR}/openimageio'
 BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
 BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/OpenImageIO.lib ${BF_OIIO_LIBPATH}/OpenImageIO_Util.lib'
-WITH_BF_STATICOIIO = True
-
-WITH_BF_OCIO = True
-BF_OCIO = '${LIBDIR}/opencolorio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/OpenColorIO.lib'
-WITH_BF_STATICOCIO = True
 
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc120-mt-s-1_55 libboost_filesystem-vc120-mt-s-1_55 libboost_regex-vc120-mt-s-1_55 libboost_system-vc120-mt-s-1_55 libboost_thread-vc120-mt-s-1_55 libboost_wave-vc120-mt-s-1_55'
-BF_BOOST_LIB_INTERNATIONAL = ' libboost_locale-vc120-mt-s-1_55'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 # No need to manually specify SSE/SSE2 on x64 systems.
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['']
 
-#Freestyle
-WITH_BF_FREESTYLE = True
-
 WITH_BF_STATICOPENGL = False
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
@@ -221,31 +185,25 @@ CC = 'cl.exe'
 CXX = 'cl.exe'
 
 CFLAGS = []
-CCFLAGS = ['/nologo', '/J', '/W3', '/Gd', '/w34062', '/wd4018', '/wd4065', '/wd4127', '/wd4181', '/wd4200', '/wd4244', '/wd4267', '/wd4305', '/wd4800', '/we4013', '/we4431']
-
-# We want to support Vista level ABI for x64
-if VC_VERSION == '12.0':
-    CCFLAGS.append('/D_WIN32_WINNT=0x600')
-    CCFLAGS.append('/DOIIO_STATIC_BUILD')  # OIIO api changed with 1.4 making this needed 
-
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
-BGE_CXXFLAGS = ['/O2', '/Ob2', '/EHsc', '/GR', '/fp:fast']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
 
-BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od', '/Ob0']
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
 
 CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2', '/Ob2']
+REL_CCFLAGS = ['-O2', '-DNDEBUG']
 
 C_WARN = []
 CC_WARN = []
 CXX_WARN = []
 
-LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid', 'psapi', 'imm32']
+LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
 PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
 
-BF_CYCLES_CUDA_ENV="C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd"
 BF_BUILDDIR = '..\\build\\win64-vc'
 BF_INSTALLDIR='..\\install\\win64-vc'
+

build_files/scons/tools/Blender.py

@@ -15,8 +15,8 @@ to kill any code duplication
 """
 
 import os
+import os.path
 import string
-import ctypes as ct
 import glob
 import time
 import sys
@@ -29,7 +29,6 @@ from SCons.Script.SConscript import SConsEnvironment
 import SCons.Action
 import SCons.Util
 import SCons.Builder
-import SCons.Subst
 import SCons.Tool
 import bcolors
 bc = bcolors.bcolors()
@@ -51,8 +50,10 @@ program_list = [] # A list holding Nodes to final binaries, used to create insta
 arguments = None
 targets = None
 resources = []
-allowed_bitnesses = {4 : 32, 8 : 64} # only expecting 32-bit or 64-bit
-bitness = allowed_bitnesses[ct.sizeof(ct.c_void_p)]
+bitness = 0
+
+#some internals
+blenderdeps = [] # don't manipulate this one outside this module!
 
 ##### LIB STUFF ##########
 
@@ -135,37 +136,39 @@ def setup_staticlibs(lenv):
         lenv['BF_ICONV_LIBPATH']
         ])
 
-    if lenv['WITH_BF_STATICJPEG']:
-        statlibs += Split(lenv['BF_JPEG_LIB_STATIC'])
-    if lenv['WITH_BF_STATICPNG']:
-        statlibs += Split(lenv['BF_PNG_LIB_STATIC'])
-
     libincs += Split(lenv['BF_FREETYPE_LIBPATH'])
     if lenv['WITH_BF_PYTHON']:
         libincs += Split(lenv['BF_PYTHON_LIBPATH'])
-    if lenv['WITH_BF_SDL'] and not lenv['WITH_BF_SDL_DYNLOAD']:
+    if lenv['WITH_BF_SDL']:
         libincs += Split(lenv['BF_SDL_LIBPATH'])
-    if lenv['WITH_BF_JACK'] and not lenv['WITH_BF_JACK_DYNLOAD']:
+    if lenv['WITH_BF_JACK']:
         libincs += Split(lenv['BF_JACK_LIBPATH'])
     if lenv['WITH_BF_SNDFILE']:
         libincs += Split(lenv['BF_SNDFILE_LIBPATH'])
+    if lenv['WITH_BF_OPENEXR']:
+        libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
+        if lenv['WITH_BF_STATICOPENEXR']:
+            statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
     if lenv['WITH_BF_TIFF']:
         libincs += Split(lenv['BF_TIFF_LIBPATH'])
         if lenv['WITH_BF_STATICTIFF']:
             statlibs += Split(lenv['BF_TIFF_LIB_STATIC'])
+    if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
+        statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
     if lenv['WITH_BF_FFTW3']:
         libincs += Split(lenv['BF_FFTW3_LIBPATH'])
         if lenv['WITH_BF_STATICFFTW3']:
             statlibs += Split(lenv['BF_FFTW3_LIB_STATIC'])
-    '''
     if lenv['WITH_BF_ELTOPO']:
         libincs += Split(lenv['BF_LAPACK_LIBPATH'])
         if lenv['WITH_BF_STATICLAPACK']:
-            statlibs += Split(lenv['BF_LAPACK_LIB_STATIC'])
-    '''
+		    statlibs += Split(lenv['BF_LAPACK_LIB_STATIC'])        
     if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']:
         statlibs += Split(lenv['BF_FFMPEG_LIB_STATIC'])
     if lenv['WITH_BF_INTERNATIONAL']:
+        libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
+        if lenv['WITH_BF_GETTEXT_STATIC']:
+            statlibs += Split(lenv['BF_GETTEXT_LIB_STATIC'])
         if lenv['WITH_BF_FREETYPE_STATIC']:
             statlibs += Split(lenv['BF_FREETYPE_LIB_STATIC'])
     if lenv['WITH_BF_OPENAL']:
@@ -191,45 +194,24 @@ def setup_staticlibs(lenv):
         if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
             libincs += Split(lenv['BF_PCRE_LIBPATH'])
             libincs += Split(lenv['BF_EXPAT_LIBPATH'])
-        if lenv['WITH_BF_STATICOPENCOLLADA']:
-            statlibs += Split(lenv['BF_OPENCOLLADA_LIB_STATIC'])
 
     if lenv['WITH_BF_OPENMP']:
         if lenv['OURPLATFORM'] == 'linuxcross':
             libincs += Split(lenv['BF_OPENMP_LIBPATH'])
-        if lenv['WITH_BF_STATICOPENMP']:
-            statlibs += Split(lenv['BF_OPENMP_LIB_STATIC'])
             
     if lenv['WITH_BF_OIIO']:
         libincs += Split(lenv['BF_OIIO_LIBPATH'])
         if lenv['WITH_BF_STATICOIIO']:
             statlibs += Split(lenv['BF_OIIO_LIB_STATIC'])
-    if lenv['WITH_BF_OPENEXR']:
-        libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
-        if lenv['WITH_BF_STATICOPENEXR']:
-            statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC'])
-    if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']:
-        statlibs += Split(lenv['BF_ZLIB_LIB_STATIC'])
-
-    if lenv['WITH_BF_OCIO']:
-        libincs += Split(lenv['BF_OCIO_LIBPATH'])
-        if lenv['WITH_BF_STATICOCIO']:
-            statlibs += Split(lenv['BF_OCIO_LIB_STATIC'])
 
     if lenv['WITH_BF_BOOST']:
         libincs += Split(lenv['BF_BOOST_LIBPATH'])
         if lenv['WITH_BF_STATICBOOST']:
             statlibs += Split(lenv['BF_BOOST_LIB_STATIC'])
 
-    if lenv['WITH_BF_CYCLES_OSL']:
-        libincs += Split(lenv['BF_OSL_LIBPATH'])
-        if lenv['WITH_BF_STATICOSL']:
-            statlibs += Split(lenv['BF_OSL_LIB_STATIC'])
-
-    if lenv['WITH_BF_LLVM']:
-        libincs += Split(lenv['BF_LLVM_LIBPATH'])
-        if lenv['WITH_BF_STATICLLVM']:
-            statlibs += Split(lenv['BF_LLVM_LIB_STATIC'])
+    # setting this last so any overriding of manually libs could be handled
+    if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross', 'win64-mingw'):
+        libincs.append('/usr/lib')
 
     if lenv['WITH_BF_JEMALLOC']:
         libincs += Split(lenv['BF_JEMALLOC_LIBPATH'])
@@ -242,17 +224,6 @@ def setup_staticlibs(lenv):
             if lenv['WITH_BF_STATIC3DMOUSE']:
                 statlibs += Split(lenv['BF_3DMOUSE_LIB_STATIC'])
 
-    # setting this last so any overriding of manually libs could be handled
-    if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross', 'win64-mingw'):
-        # We must remove any previous items defining this path, for same reason stated above!
-        libincs = [e for e in libincs if SCons.Subst.scons_subst(e, lenv, gvars=lenv.Dictionary()) != "/usr/lib"]
-        libincs.append('/usr/lib')
-
-    # Hack to pass OSD libraries to linker before extern_{clew,cuew}
-    # Here we only store library path, actual library name will be added in setup_syslibs()
-    for syslib in create_blender_liblist(lenv, 'system'):
-        libincs.append(os.path.dirname(syslib))
-
     return statlibs, libincs
 
 def setup_syslibs(lenv):
@@ -265,10 +236,12 @@ def setup_syslibs(lenv):
             syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
         else:
             syslibs.append(lenv['BF_PYTHON_LIB'])
+    if lenv['WITH_BF_INTERNATIONAL'] and not lenv['WITH_BF_GETTEXT_STATIC']:
+        syslibs += Split(lenv['BF_GETTEXT_LIB'])
     if lenv['WITH_BF_OPENAL']:
         if not lenv['WITH_BF_STATICOPENAL']:
             syslibs += Split(lenv['BF_OPENAL_LIB'])
-    if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc' and lenv['C_COMPILER_ID'] != 'clang' and not lenv['WITH_BF_STATICOPENMP']:
+    if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc':
         if lenv['CC'] == 'cl.exe':
             syslibs += ['vcomp']
         else:
@@ -279,37 +252,31 @@ def setup_syslibs(lenv):
         if not lenv['WITH_BF_STATICOIIO']:
             syslibs += Split(lenv['BF_OIIO_LIB'])
 
-    if lenv['WITH_BF_OCIO']:
-        if not lenv['WITH_BF_STATICOCIO']:
-            syslibs += Split(lenv['BF_OCIO_LIB'])
-
     if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']:
         syslibs += Split(lenv['BF_OPENEXR_LIB'])
-    if lenv['WITH_BF_ZLIB'] and not lenv['WITH_BF_STATICZLIB']:
-        syslibs += Split(lenv['BF_ZLIB_LIB'])
     if lenv['WITH_BF_TIFF'] and not lenv['WITH_BF_STATICTIFF']:
         syslibs += Split(lenv['BF_TIFF_LIB'])
+    if lenv['WITH_BF_ZLIB'] and not lenv['WITH_BF_STATICZLIB']:
+        syslibs += Split(lenv['BF_ZLIB_LIB'])
     if lenv['WITH_BF_FFMPEG'] and not lenv['WITH_BF_STATICFFMPEG']:
         syslibs += Split(lenv['BF_FFMPEG_LIB'])
         if lenv['WITH_BF_OGG']:
             syslibs += Split(lenv['BF_OGG_LIB'])
-    if lenv['WITH_BF_JACK'] and not lenv['WITH_BF_JACK_DYNLOAD']:
+    if lenv['WITH_BF_JACK']:
         syslibs += Split(lenv['BF_JACK_LIB'])
     if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']:
         syslibs += Split(lenv['BF_SNDFILE_LIB'])
     if lenv['WITH_BF_FFTW3'] and not lenv['WITH_BF_STATICFFTW3']:
         syslibs += Split(lenv['BF_FFTW3_LIB'])
-    '''
     if lenv['WITH_BF_ELTOPO']:
         syslibs += Split(lenv['BF_LAPACK_LIB'])
-    '''
-    if lenv['WITH_BF_SDL'] and not lenv['WITH_BF_SDL_DYNLOAD']:
+    if lenv['WITH_BF_SDL']:
         syslibs += Split(lenv['BF_SDL_LIB'])
     if not lenv['WITH_BF_STATICOPENGL']:
         syslibs += Split(lenv['BF_OPENGL_LIB'])
     if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'):
         syslibs += Split(lenv['BF_PTHREADS_LIB'])
-    if lenv['WITH_BF_COLLADA'] and not lenv['WITH_BF_STATICOPENCOLLADA']:
+    if lenv['WITH_BF_COLLADA']:
         syslibs.append(lenv['BF_PCRE_LIB'])
         if lenv['BF_DEBUG'] and (lenv['OURPLATFORM'] != 'linux'):
             syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
@@ -328,25 +295,9 @@ def setup_syslibs(lenv):
                 
     if lenv['WITH_BF_BOOST'] and not lenv['WITH_BF_STATICBOOST']:
         syslibs += Split(lenv['BF_BOOST_LIB'])
-        
-        if lenv['WITH_BF_INTERNATIONAL']:
-            syslibs += Split(lenv['BF_BOOST_LIB_INTERNATIONAL'])
 
-    if lenv['WITH_BF_CYCLES_OSL'] and not lenv['WITH_BF_STATICOSL']:
-        syslibs += Split(lenv['BF_OSL_LIB'])
-
-    if lenv['WITH_BF_LLVM'] and not lenv['WITH_BF_STATICLLVM']:
-        syslibs += Split(lenv['BF_LLVM_LIB'])
-
-    if not lenv['WITH_BF_STATICJPEG']:
-        syslibs += Split(lenv['BF_JPEG_LIB'])
-
-    if not lenv['WITH_BF_STATICPNG']:
-        syslibs += Split(lenv['BF_PNG_LIB'])
-
-    # Hack to pass OSD libraries to linker before extern_{clew,cuew}
-    for syslib in create_blender_liblist(lenv, 'system'):
-        syslibs.append(os.path.basename(syslib))
+    syslibs += Split(lenv['BF_JPEG_LIB'])
+    syslibs += Split(lenv['BF_PNG_LIB'])
 
     syslibs += lenv['LLIBS']
 
@@ -381,19 +332,12 @@ def creator(env):
         defs.append('WITH_BINRELOC')
 
     if env['WITH_BF_SDL']:
-        if env['WITH_BF_SDL_DYNLOAD']:
-            defs.append('WITH_SDL_DYNLOAD')
-            incs.append('#/extern/sdlew/include')
         defs.append('WITH_SDL')
 
     if env['WITH_BF_LIBMV']:
         incs.append('#/extern/libmv')
         defs.append('WITH_LIBMV')
 
-    if env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']:
-        incs.append('#/intern/cycles/blender')
-        defs.append('WITH_CYCLES_LOGGING')
-
     if env['WITH_BF_FFMPEG']:
         defs.append('WITH_FFMPEG')
 
@@ -403,10 +347,6 @@ def creator(env):
         if env['BF_DEBUG']:
             defs.append('_DEBUG')
 
-    if env['WITH_BF_FREESTYLE']:
-        incs.append('#/source/blender/freestyle')
-        defs.append('WITH_FREESTYLE')
-
     if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
         incs.append(env['BF_PTHREADS_INC'])
         incs.append('#/intern/utfconv')
@@ -422,71 +362,11 @@ def buildinfo(lenv, build_type):
     """
     Generate a buildinfo object
     """
-    import subprocess
-
     build_date = time.strftime ("%Y-%m-%d")
     build_time = time.strftime ("%H:%M:%S")
-
-    if os.path.isdir(os.path.abspath('.git')):
-        try:
-            build_commit_timestamp = btools.get_command_output(args=['git', 'log', '-1', '--format=%ct']).strip()
-        except OSError:
-            build_commit_timestamp = None
-        if not build_commit_timestamp:
-            # Git command not found
-            build_hash = 'unknown'
-            build_commit_timestamp = '0'
-            build_branch = 'unknown'
-        else:
-            no_upstream = False
-
-            try :
-                build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']).strip()
-            except subprocess.CalledProcessError:
-                # assume branch has no upstream configured
-                build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
-                no_upstream = True
-
-            build_branch = btools.get_command_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip()
-
-            if build_branch == 'HEAD':
-                master_check = btools.get_command_output(['git', 'branch', '--list', 'master', '--contains', build_hash]).strip()
-                if master_check == 'master':
-                    build_branch = 'master'
-                else:
-                    head_hash = btools.get_command_output(['git', 'rev-parse', 'HEAD']).strip()
-                    tag_hashes = btools.get_command_output(['git', 'show-ref', '--tags', '-d'])
-                    if tag_hashes.find(head_hash) != -1:
-                        build_branch = 'master'
-
-            if not no_upstream:
-                older_commits = btools.get_command_output(['git', 'log', '--oneline', 'HEAD..@{u}']).strip()
-                if older_commits:
-                    build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
-
-            # ## Check for local modifications
-            has_local_changes = False
-
-            # Update GIT index before getting dirty files
-            os.system('git update-index -q --refresh')
-            changed_files = btools.get_command_output(['git', 'diff-index', '--name-only', 'HEAD', '--']).strip()
-
-            if changed_files:
-                has_local_changes = True
-            elif no_upstream == False:
-                unpushed_log = btools.get_command_output(['git', 'log', '--oneline', '@{u}..']).strip()
-                has_local_changes = unpushed_log != ''
-
-            if build_branch.startswith('blender-v'):
-                build_branch = 'master'
-
-            if has_local_changes:
-                build_branch += ' (modified)'
-    else:
-        build_hash = 'unknown'
-        build_commit_timestamp = '0'
-        build_branch = 'unknown'
-
+    build_rev = os.popen('svnversion').read()[:-1] # remove \n
+    if build_rev == '': 
+        build_rev = '-UNKNOWN-'
     if lenv['BF_DEBUG']:
         build_type = "Debug"
         build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['BF_DEBUG_CCFLAGS'] + lenv['CPPFLAGS'])
@@ -503,9 +383,7 @@ def buildinfo(lenv, build_type):
         lenv.Append (CPPDEFINES = ['BUILD_TIME=\\"%s\\"'%(build_time),
                                     'BUILD_DATE=\\"%s\\"'%(build_date),
                                     'BUILD_TYPE=\\"%s\\"'%(build_type),
-                                    'BUILD_HASH=\\"%s\\"'%(build_hash),
-                                    'BUILD_COMMIT_TIMESTAMP=%s'%(build_commit_timestamp),
-                                    'BUILD_BRANCH=\\"%s\\"'%(build_branch),
+                                    'BUILD_REV=\\"%s\\"'%(build_rev),
                                     'WITH_BUILDINFO',
                                     'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
                                     'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
@@ -533,22 +411,22 @@ def my_print_cmd_line(self, s, target, source, env):
 def my_compile_print(target, source, env):
     a = '%s' % (source[0])
     d, f = os.path.split(a)
-    return bc.OKBLUE + "Compiling" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
+    return bc.OKBLUE+"Compiling"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
 
 def my_moc_print(target, source, env):
     a = '%s' % (source[0])
     d, f = os.path.split(a)
-    return bc.OKBLUE + "Creating MOC" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
+    return bc.OKBLUE+"Creating MOC"+bc.ENDC+ " ==> '"+bc.OKGREEN+"%s" %(f) + "'"+bc.ENDC
 
 def my_linking_print(target, source, env):
     t = '%s' % (target[0])
     d, f = os.path.split(t)
-    return bc.OKBLUE + "Linking library" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
+    return bc.OKBLUE+"Linking library"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
 
 def my_program_print(target, source, env):
     t = '%s' % (target[0])
     d, f = os.path.split(t)
-    return bc.OKBLUE + "Linking program" + bc.ENDC + " ==> '" + bc.OKGREEN + ("%s" % f) + bc.ENDC + "'"
+    return bc.OKBLUE+"Linking program"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC
 
 def msvc_hack(env):
     static_lib = SCons.Tool.createStaticLibBuilder(env)
@@ -623,13 +501,17 @@ def my_winpybundle_print(target, source, env):
 
 def WinPyBundle(target=None, source=None, env=None):
     import re
-    py_tar = env.subst(env['LCGDIR']).lstrip("#")
+    py_tar= env.subst( env['LCGDIR'] )
+    if py_tar[0]=='#':
+        py_tar= py_tar[1:]
     if env['BF_DEBUG']:
         py_tar+= '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '_d.tar.gz'
     else:
         py_tar+= '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '.tar.gz'
 
-    py_target = env.subst(env['BF_INSTALLDIR']).lstrip("#")
+    py_target = env.subst( env['BF_INSTALLDIR'] )
+    if py_target[0]=='#':
+        py_target=py_target[1:]
     py_target = os.path.join(py_target, VERSION, 'python', 'lib')
     def printexception(func,path,ex):
         if os.path.exists(path): #do not report if path does not exist. eg on a fresh build.
@@ -650,34 +532,6 @@ def WinPyBundle(target=None, source=None, env=None):
     print "Unpacking '" + py_tar + "' to '" + py_target + "'"
     untar_pybundle(py_tar,py_target,exclude_re)
 
-    # -------------
-    # 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_target = env.subst(env['BF_INSTALLDIR']).lstrip("#")
-        py_target = os.path.join(py_target, VERSION, 'python', 'lib', 'site-packages')
-        # rmtree handled above
-        # files are cleaned up in their archive
-        exclude_re = []
-        print("Unpacking '" + py_tar + "' to '" + py_target + "'")
-        untar_pybundle(py_tar, py_target, exclude_re)
-
-    # --------------------
-    # Copy 'site-packages'
-    py_dir = env.subst(env['LCGDIR']).lstrip("#")
-    py_dir += '/release/site-packages'
-    # grr, we have to do one by one because the dir exists
-    for f in os.listdir(py_dir):
-        fn_src = os.path.join(py_dir, f)
-        fn_dst = os.path.join(py_target, f)
-
-        shutil.rmtree(fn_dst, False, printexception)
-        shutil.copytree(fn_src, fn_dst)
-
-
-
 def  my_appit_print(target, source, env):
     a = '%s' % (target[0])
     d, f = os.path.split(a)
@@ -705,8 +559,8 @@ def AppIt(target=None, source=None, env=None):
     bldroot = env.Dir('.').abspath
     binary = env['BINARYKIND']
      
-    sourcedir = bldroot + '/release/darwin/%s.app' % binary
-    sourceinfo = bldroot + "/release/darwin/%s.app/Contents/Info.plist"%binary
+    sourcedir = bldroot + '/source/darwin/%s.app'%binary
+    sourceinfo = bldroot + "/source/darwin/%s.app/Contents/Info.plist"%binary
     targetinfo = installdir +'/' + "%s.app/Contents/Info.plist"%binary
     cmd = installdir + '/' +'%s.app'%binary
     
@@ -718,37 +572,28 @@ def AppIt(target=None, source=None, env=None):
     commands.getoutput(cmd)
     cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,installdir, binary, binary)
     commands.getoutput(cmd)
-    cmd = 'mkdir %s/%s.app/Contents/Resources/%s/'%(installdir, binary, VERSION)
+    cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(installdir, binary, VERSION)
     commands.getoutput(cmd)
     cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
 
     # blenderplayer doesn't need all the files
     if binary == 'blender':
-        cmd = 'mkdir %s/%s.app/Contents/Resources/%s/datafiles'%(installdir, binary, VERSION)
+        cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary, VERSION)
         commands.getoutput(cmd)
-        cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/Resources/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+        cmd = 'cp -R %s/release/datafiles/locale %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
         commands.getoutput(cmd)
-        mo_dir = os.path.join(builddir[:-4], "locale")
-        for f in os.listdir(mo_dir):
-            cmd = 'ditto %s/%s %s/%s.app/Contents/Resources/%s/datafiles/locale/%s/LC_MESSAGES/blender.mo'%(mo_dir, f, installdir, binary, VERSION, f[:-3])
-            commands.getoutput(cmd)
-        cmd = 'cp %s/release/datafiles/locale/languages %s/%s.app/Contents/Resources/%s/datafiles/locale/'%(bldroot, installdir, binary, VERSION)
+        cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
         commands.getoutput(cmd)
-
-        if env['WITH_BF_OCIO']:
-            cmd = 'cp -R %s/release/datafiles/colormanagement %s/%s.app/Contents/Resources/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
-            commands.getoutput(cmd)
-        
-        cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/Resources/%s/'%(bldroot,installdir,binary,VERSION)
+        cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
         commands.getoutput(cmd)
 
         if VERSION_RELEASE_CYCLE == "release":
-            cmd = 'rm -rf %s/%s.app/Contents/Resources/%s/scripts/addons_contrib'%(installdir,binary,VERSION)
+            cmd = 'rm -rf %s/%s.app/Contents/MacOS/%s/scripts/addons_contrib'%(installdir,binary,VERSION)
             commands.getoutput(cmd)
 
         if env['WITH_BF_CYCLES']:
             croot = '%s/intern/cycles' % (bldroot)
-            cinstalldir = '%s/%s.app/Contents/Resources/%s/scripts/addons/cycles' % (installdir,binary,VERSION)
+            cinstalldir = '%s/%s.app/Contents/MacOS/%s/scripts/addons/cycles' % (installdir,binary,VERSION)
 
             cmd = 'mkdir %s' % (cinstalldir)
             commands.getoutput(cmd)
@@ -762,25 +607,15 @@ def AppIt(target=None, source=None, env=None):
             commands.getoutput(cmd)
             cmd = 'cp -R %s/kernel/*.h %s/kernel/*.cl %s/kernel/*.cu %s/kernel/' % (croot, croot, croot, cinstalldir)
             commands.getoutput(cmd)
-            cmd = 'cp -R %s/kernel/svm %s/kernel/closure %s/kernel/geom %s/util/util_color.h %s/util/util_half.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, croot, croot, croot, cinstalldir)
+            cmd = 'cp -R %s/kernel/svm %s/util/util_color.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, cinstalldir)
             commands.getoutput(cmd)
             cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
             commands.getoutput(cmd)
 
-            if env['WITH_BF_CYCLES_OSL']:
-                cmd = 'mkdir %s/shader' % (cinstalldir)
-                commands.getoutput(cmd)
-                cmd = 'cp -R %s/kernel/shaders/*.h %s/shader' % (croot, cinstalldir)
-                commands.getoutput(cmd)
-                cmd = 'cp -R %s/../intern/cycles/kernel/shaders/*.oso %s/shader' % (builddir, cinstalldir)
-                commands.getoutput(cmd)
-
     if env['WITH_OSX_STATICPYTHON']:
-        cmd = 'mkdir %s/%s.app/Contents/Resources/%s/python/'%(installdir,binary, VERSION)
+        cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
         commands.getoutput(cmd)
-        cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/Resources/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
-        commands.getoutput(cmd)
-        cmd = 'cp -R %s/release/site-packages/ %s/%s.app/Contents/Resources/%s/python/lib/python%s/site-packages/'%(libdir,installdir,binary,VERSION,env['BF_PYTHON_VERSION'])
+        cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
         commands.getoutput(cmd)
 
     cmd = 'chmod +x  %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
@@ -791,31 +626,20 @@ def AppIt(target=None, source=None, env=None):
     commands.getoutput(cmd)
     cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary)
     commands.getoutput(cmd)
-    cmd = 'SetFile -d "%s)" -m "%s)" %s/%s.app'%(time.strftime("%m/%d/%Y %H:%M"),time.strftime("%m/%d/%Y %H:%M"),installdir,binary) # give the bundles actual creation/modification date
-    commands.getoutput(cmd)
-    if env['WITH_BF_OPENMP']:
-        if env['C_COMPILER_ID'] == 'gcc' and env['CCVERSION'] >= '4.6.1': # for correct errorhandling with gcc >= 4.6.1 we need the gcc.dylib and gomp.dylib to link, thus distribute in app-bundle
-            print "Bundling libgcc and libgomp"
-            instname = env['BF_CXX']
-            cmd = 'ditto --arch %s %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) # copy libgcc
-            commands.getoutput(cmd)
-            cmd = 'install_name_tool -id @executable_path/../Resources/lib/libgcc_s.1.dylib %s/%s.app/Contents/Resources/lib/libgcc_s.1.dylib'%(installdir, binary) # change id of libgcc
-            commands.getoutput(cmd)
-            cmd = 'ditto --arch %s %s/lib/libgomp.1.dylib %s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) # copy libgomp
-            commands.getoutput(cmd)
-            cmd = 'install_name_tool -id @executable_path/../Resources/lib/libgomp.1.dylib %s/%s.app/Contents/Resources/lib/libgomp.1.dylib'%(installdir, binary) # change id of libgomp
-            commands.getoutput(cmd)
-            cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib  @executable_path/../Resources/lib/libgcc_s.1.dylib %s/%s.app/Contents/Resources/lib/libgomp.1.dylib'%(instname, installdir, binary) # change ref to libgcc
-            commands.getoutput(cmd)
-            cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib  @executable_path/../Resources/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary) # change ref to libgcc ( blender )
-            commands.getoutput(cmd)
-            cmd = 'install_name_tool -change %s/lib/libgomp.1.dylib  @executable_path/../Resources/lib/libgomp.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary) # change ref to libgomp ( blender )
-            commands.getoutput(cmd)
-        if env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.4':
-            print "Bundling libiomp5"
-            instname = env['LCGDIR'][1:] # made libiomp5 part of blender libs
-            cmd = 'ditto --arch %s %s/openmp/lib/libiomp5.dylib %s/%s.app/Contents/Resources/lib/'%(osxarch, instname, installdir, binary) # copy libiomp5
-            commands.getoutput(cmd)
+    if env['CC'][:-2].endswith('4.6'): # for correct errorhandling with gcc 4.6.x we need the gcc.dylib to link, thus distribute in app-bundle
+        cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
+        commands.getoutput(cmd)
+        instname = env['BF_CXX']
+        cmd = 'cp %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/'%(instname, installdir, binary)
+        commands.getoutput(cmd)
+        cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary)
+        commands.getoutput(cmd)
+        cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib  @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary)
+        commands.getoutput(cmd)
+        cmd = 'rm -rf  %s/set_simulation_threads.app'%(installdir) # first clear omp_num_threads applescript
+        commands.getoutput(cmd)
+        cmd = 'cp -R %s/source/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript
+        commands.getoutput(cmd)
 
 # extract copy system python, be sure to update other build systems
 # when making changes to the files that are copied.
@@ -885,27 +709,8 @@ def UnixPyBundle(target=None, source=None, env=None):
             print '\t"%s"\n' % numpy_target
 
             run("cp -R '%s' '%s'" % (numpy_src, os.path.dirname(numpy_target)))
-            run("rm -rf '%s/distutils'" % numpy_target)
-            run("rm -rf '%s/oldnumeric'" % numpy_target)
-            run("rm -rf '%s/doc'" % numpy_target)
-            run("rm -rf '%s/tests'" % numpy_target)
-            run("rm -rf '%s/f2py'" % numpy_target)
-            run("find '%s' -type d -name 'include' -prune -exec rm -rf {} ';'" % numpy_target)
-            run("find '%s' -type d -name '*.h' -prune -exec rm -rf {} ';'" % numpy_target)
-            run("find '%s' -type d -name '*.a' -prune -exec rm -rf {} ';'" % numpy_target)
         else:
             print 'Failed to find numpy at %s, skipping copying' % numpy_src
-        del numpy_src, numpy_target
-
-    if env['WITH_BF_PYTHON_INSTALL_REQUESTS']:
-        requests_src = py_src + "/site-packages/requests"
-        requests_target = py_target + "/site-packages/requests"
-        if os.path.exists(requests_src):
-            run("cp -R '%s' '%s'" % (requests_src, os.path.dirname(requests_target)))
-            run("find '%s' -type d -name '*.pem -prune -exec rm -rf {} ';'" % requests_target)
-        else:
-            print('Failed to find requests at %s, skipping copying' % requests_src)
-        del requests_src, requests_target
 
     run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target)
     run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target)
@@ -961,27 +766,13 @@ class BlenderEnvironment(SConsEnvironment):
 
     def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None, cc_compilerchange=None, cxx_compilerchange=None):
         global vcp
-        
-        # sanity check
-        # run once in a while to check we dont have duplicates
-        if 0:
-            for name, dirs in (("source", sources), ("include", includes)):
-                files_clean = [os.path.normpath(f) for f in dirs]
-                files_clean_set = set(files_clean)
-                if len(files_clean) != len(files_clean_set):
-                    for f in sorted(files_clean_set):
-                        if f != '.' and files_clean.count(f) > 1:
-                            raise Exception("Found duplicate %s %r" % (name, f))
-            del name, dirs, files_clean, files_clean_set, f
-        # end sanity check
-
         if not self or not libname or not sources:
             print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
             self.Exit()
 
         def list_substring(quickie, libname):
             for q in quickie:
-                if q in libname:
+                if libname.find(q) != -1:
                     return True
             return False
 
@@ -1054,7 +845,6 @@ class BlenderEnvironment(SConsEnvironment):
         print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
         lenv = self.Clone()
         lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
-        lenv.Append(LINKFLAGS = lenv['BF_PROGRAM_LINKFLAGS'])
         if lenv['OURPLATFORM'] in ('win32-mingw', 'win64-mingw', 'linuxcross', 'cygwin', 'linux'):
             lenv.Replace(LINK = '$CXX')
         if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):

build_files/scons/tools/btools.py

@@ -8,27 +8,13 @@ try:
 except ImportError:
     pass
 import string
+import glob
 import shutil
 import sys
 
 Variables = SCons.Variables
 BoolVariable = SCons.Variables.BoolVariable
 
-def get_command_output(*popenargs, **kwargs):
-    if hasattr(subprocess, "check_output"):
-        return subprocess.check_output(*popenargs, **kwargs)
-    if 'stdout' in kwargs:
-        raise ValueError('stdout argument not allowed, it will be overridden.')
-    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
-    output, unused_err = process.communicate()
-    retcode = process.poll()
-    if retcode:
-        cmd = kwargs.get("args")
-        if cmd is None:
-            cmd = popenargs[0]
-        raise subprocess.CalledProcessError(retcode, cmd)
-    return output
-
 def get_version():
     import re
 
@@ -61,37 +47,41 @@ def get_version():
 
         if (ver_base is not None) and (ver_char is not None) and (ver_cycle is not None):
             # eg '2.56a-beta'
-            if ver_cycle != "release":
+            if ver_cycle:
                 ver_display = "%s%s-%s" % (ver_base, ver_char, ver_cycle)
             else:
-                ver_display = "%s%s" % (ver_base, ver_char)
+                ver_display = "%s%s" % (ver_base, ver_char)  # assume release
 
             return ver_base, ver_display, ver_cycle
 
     raise Exception("%s: missing version string" % fname)
 
-def get_hash():
-    try:
-        build_hash = get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
-    except OSError:
-        build_hash = None
-        print("WARNING: could not use git to retrieve current Blender repository hash...")
-    except subprocess.CalledProcessError as e:
-        build_hash = None
-        print("WARNING: git errored while retrieving current Blender repository hash (%d)..." % e.returncode)
-    if build_hash == '' or build_hash == None:
-        build_hash = 'UNKNOWN'
+def get_revision():
+    build_rev = os.popen('svnversion').read()[:-1] # remove \n
+    if build_rev == '' or build_rev==None: 
+        build_rev = 'UNKNOWN'
 
-    return build_hash
+    return 'r' + build_rev
 
 
+# copied from: http://www.scons.org/wiki/AutoconfRecipes
 def checkEndian():
-    return sys.byteorder
+    import struct
+    array = struct.pack('cccc', '\x01', '\x02', '\x03', '\x04')
+    i = struct.unpack('i', array)
+    # Little Endian
+    if i == struct.unpack('<i', array):
+        return "little"
+    # Big Endian
+    elif i == struct.unpack('>i', array):
+        return "big"
+    else:
+        raise Exception("cant find endian")
 
 
 # This is used in creating the local config directories
 VERSION, VERSION_DISPLAY, VERSION_RELEASE_CYCLE = get_version()
-HASH = get_hash()
+REVISION = get_revision()
 ENDIAN = checkEndian()
 
 
@@ -106,10 +96,10 @@ def print_arguments(args, bc):
 
 def validate_arguments(args, bc):
     opts_list = [
-            'WITH_BF_FREESTYLE', 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'WITH_BF_PYTHON_SECURITY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LIBPATH_ARCH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
+            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 
             'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
-            'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', 'WITH_BF_SDL_DYNLOAD',
-            'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'WITH_BF_JACK_DYNLOAD',
+            'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
+            'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
             'WITH_BF_SNDFILE', 'BF_SNDFILE', 'BF_SNDFILE_INC', 'BF_SNDFILE_LIB', 'BF_SNDFILE_LIBPATH', 'WITH_BF_STATICSNDFILE', 'BF_SNDFILE_LIB_STATIC',
             'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH',
             'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC',
@@ -118,29 +108,25 @@ def validate_arguments(args, bc):
             'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
             'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
             'WITH_BF_FRAMESERVER',
-            'WITH_BF_COMPOSITOR',
-            'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_STATICJPEG', 'BF_JPEG_LIB_STATIC',
+            'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY',
+            'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
             'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
             'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
-            'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', 'WITH_BF_STATICPNG', 'BF_PNG_LIB_STATIC',
+            'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH',
             'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH', 'WITH_BF_STATICTIFF', 'BF_TIFF_LIB_STATIC',
             'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH', 'WITH_BF_STATICZLIB', 'BF_ZLIB_LIB_STATIC',
             'WITH_BF_INTERNATIONAL',
+            'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
             'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
             'WITH_BF_GAMEENGINE',
             'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
-            # 'WITH_BF_ELTOPO',  # now only available in a branch
-            'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
+            'WITH_BF_ELTOPO', 'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
             'BF_WINTAB', 'BF_WINTAB_INC',
             'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
             'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
             'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
             'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
-            'WITH_BF_EGL', 'WITH_BF_GLEW_ES', 'BF_GLEW_INC', 'WITH_BF_GL_PROFILE_CORE', 'WITH_BF_GL_PROFILE_COMPAT', 'WITH_BF_GL_PROFILE_ES20',
-            'WITH_BF_GLEW_MX', 'WITH_BF_GL_EGL', 'WITH_BF_GL_ANGLE',
-
             'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
-            'WITH_BF_STATICOPENCOLLADA', 'BF_OPENCOLLADA_LIB_STATIC',
             'WITH_BF_PLAYER',
             'WITH_BF_NOBLENDER',
             'WITH_BF_BINRELOC',
@@ -149,15 +135,14 @@ def validate_arguments(args, bc):
             'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
             'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
             'WITHOUT_BF_INSTALL',
-            'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
-            'WITH_BF_PYTHON_INSTALL_NUMPY', 'WITH_BF_PYTHON_INSTALL_REQUESTS',
+            'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK', 'WITH_BF_PYTHON_INSTALL_NUMPY'
             'WITHOUT_BF_OVERWRITE_INSTALL',
-            'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH', 'WITH_BF_STATICOPENMP', 'BF_OPENMP_STATIC_STATIC',
+            'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
+            'WITH_GHOST_COCOA',
             'WITH_GHOST_SDL',
             'WITH_GHOST_XDND',
-            'WITH_X11_XINPUT',
-            'WITH_X11_XF86VMODE',
             'BF_GHOST_DEBUG',
+            'USE_QTKIT',
             'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
             'BF_X264_CONFIG',
             'BF_XVIDCORE_CONFIG',
@@ -167,6 +152,7 @@ def validate_arguments(args, bc):
             'WITH_BF_RAYOPTIMIZATION',
             'BF_RAYOPTIMIZATION_SSE_FLAGS',
             'WITH_BF_FLUID',
+            'WITH_BF_DECIMATE',
             'WITH_BF_BOOLEAN',
             'WITH_BF_REMESH',
             'WITH_BF_OCEANSIM',
@@ -175,39 +161,34 @@ def validate_arguments(args, bc):
             'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
             'BUILDBOT_BRANCH',
             'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
-            'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'BF_CYCLES_CUDA_ENV',
+            'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
             'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
-            'WITH_BF_OCIO', 'WITH_BF_STATICOCIO', 'BF_OCIO', 'BF_OCIO_INC', 'BF_OCIO_LIB', 'BF_OCIO_LIB_STATIC', 'BF_OCIO_LIBPATH',
-            'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_INTERNATIONAL', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
-            'WITH_BF_LIBMV', 'WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS',
-            'WITH_BF_CYCLES_OSL', 'WITH_BF_STATICOSL', 'BF_OSL', 'BF_OSL_INC', 'BF_OSL_LIB', 'BF_OSL_LIBPATH', 'BF_OSL_LIB_STATIC', 'BF_OSL_COMPILER',
-            'WITH_BF_LLVM', 'WITH_BF_STATICLLVM', 'BF_LLVM', 'BF_LLVM_LIB', 'BF_LLVM_LIBPATH', 'BF_LLVM_LIB_STATIC', 'BF_PROGRAM_LINKFLAGS'
+            'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
+            'WITH_BF_LIBMV'
             ]
-
+    
     # Have options here that scons expects to be lists
     opts_list_split = [
             'BF_PYTHON_LINKFLAGS',
             'BF_OPENGL_LINKFLAGS',
-            'BF_GL_DEFINITIONS',
             'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
             'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
             'BGE_CXXFLAGS',
             'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS', 'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS',
             'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
             'C_WARN', 'CC_WARN', 'CXX_WARN',
-            'LLIBS', 'PLATFORM_LINKFLAGS', 'MACOSX_ARCHITECTURE', 'MACOSX_SDK', 'XCODE_CUR_VER', 'C_COMPILER_ID',
-            'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS', 'MACOSX_DEPLOYMENT_TARGET',
-            'WITH_BF_CYCLES_DEBUG', 'WITH_BF_CYCLES_LOGGING'
+            'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 'MACOSX_SDK_CHECK', 'XCODE_CUR_VER',
+            'BF_CYCLES_CUDA_BINARIES_ARCH',
     ]
-
-
+    
+    
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
             'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
             'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_LINE_OVERWRITE',
             'BF_BSC', 'BF_CONFIG',
             'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG',
             'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG',
-            'BF_UNIT_TEST', 'BF_BITNESS', 'MSVS_VERSION']
+            'BF_UNIT_TEST', 'BF_BITNESS']
 
     okdict = {}
 
@@ -231,8 +212,7 @@ def print_targets(targs, bc):
 def validate_targets(targs, bc):
     valid_list = ['.', 'blender', 'blenderstatic', 'blenderplayer', 'webplugin',
             'blendernogame', 'blenderstaticnogame', 'blenderlite', 'release',
-            'everything', 'clean', 'install-bin', 'install', 'nsis','buildslave',
-            'cudakernels']
+            'everything', 'clean', 'install-bin', 'install', 'nsis','buildslave']
     oklist = []
     for t in targs:
         if t in valid_list:
@@ -241,21 +221,25 @@ def validate_targets(targs, bc):
             print '\t'+bc.WARNING+'Invalid target: '+bc.ENDC+t
     return oklist
 
-class OurSpawn:
+class ourSpawn:
     def ourspawn(self, sh, escape, cmd, args, env):
-        newargs = " ".join(args[1:])
+        newargs = string.join(args[1:], ' ')
         cmdline = cmd + " " + newargs
         startupinfo = subprocess.STARTUPINFO()
+        #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
         proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env=env)
+            stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False)
         data, err = proc.communicate()
         rv = proc.wait()
+        if data:
+            print(data)
         if err:
             print(err)
         return rv
 
 def SetupSpawn( env ):
-    buf = OurSpawn()
+    buf = ourSpawn()
+    buf.ourenv = env
     env['SPAWN'] = buf.ourspawn
 
 
@@ -266,13 +250,11 @@ def read_opts(env, cfg, args):
         ('LIBDIR', 'Root dir of libs'),
         (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
         (BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)),
-        (BoolVariable('WITH_BF_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default', True)),
         ('BF_PYTHON', 'Base path for python', ''),
         ('BF_PYTHON_VERSION', 'Python version to use', ''),
         ('BF_PYTHON_INC', 'Include path for Python headers', ''),
         ('BF_PYTHON_BINARY', 'Path to the Python interpreter', ''),
         ('BF_PYTHON_LIB', 'Python library', ''),
-        ('BF_PYTHON_LIBPATH_ARCH', 'Additional Python library under some linux flavors (arch-dependent)', ''),
         ('BF_PYTHON_DLL', 'Python dll - used on Windows only', ''),
         ('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''),
         ('BF_PYTHON_LIBPATH', 'Library path', ''),
@@ -282,6 +264,7 @@ def read_opts(env, cfg, args):
         ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
 
         (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
+        (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
         (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
         (BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
         (BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)),
@@ -300,14 +283,12 @@ def read_opts(env, cfg, args):
         ('BF_SDL_INC', 'SDL include path', ''),
         ('BF_SDL_LIB', 'SDL library', ''),
         ('BF_SDL_LIBPATH', 'SDL library path', ''),
-        (BoolVariable('WITH_BF_SDL_DYNLOAD', 'Enable runtime dynamic SDL libraries loading (works only on Linux)', False)),
 
         (BoolVariable('WITH_BF_JACK', 'Enable jack support if true', True)),
         ('BF_JACK', 'jack base path', ''),
         ('BF_JACK_INC', 'jack include path', ''),
         ('BF_JACK_LIB', 'jack library', ''),
         ('BF_JACK_LIBPATH', 'jack library path', ''),
-        (BoolVariable('WITH_BF_JACK_DYNLOAD', 'Enable runtime dynamic Jack libraries loading (works only on Linux)', False)),
 
         (BoolVariable('WITH_BF_SNDFILE', 'Enable sndfile support if true', True)),
         ('BF_SNDFILE', 'sndfile base path', ''),
@@ -335,7 +316,7 @@ def read_opts(env, cfg, args):
         (BoolVariable('WITH_BF_CINEON', 'Support CINEON and DPX image formats if true', True)),
 
         (BoolVariable('WITH_BF_HDR', 'Support HDR image formats if true', True)),
-
+        
         (BoolVariable('WITH_BF_FRAMESERVER', 'Support export to a frameserver', True)),
 
         (BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)),
@@ -348,19 +329,17 @@ def read_opts(env, cfg, args):
         ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''),
         (BoolVariable('WITH_BF_STATICFFMPEG', 'Use static FFMPEG if true', False)),
         ('BF_FFMPEG_LIB_STATIC', 'Static FFMPEG libraries', ''),
-
+        
         (BoolVariable('WITH_BF_OGG', 'Link OGG, THEORA, VORBIS with FFMPEG if true',
                     False)),
         ('BF_OGG', 'OGG base path', ''),
         ('BF_OGG_LIB', 'OGG library', ''),
 
         (BoolVariable('WITH_BF_JPEG', 'Use JPEG if true', True)),
-        (BoolVariable('WITH_BF_STATICJPEG', 'Staticly link to JPEG', False)),
         ('BF_JPEG', 'JPEG base path', ''),
         ('BF_JPEG_INC', 'JPEG include path', ''),
         ('BF_JPEG_LIB', 'JPEG library', ''),
         ('BF_JPEG_LIBPATH', 'JPEG library path', ''),
-        ('BF_JPEG_LIB_STATIC', 'JPEG static library', ''),
 
         (BoolVariable('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', False)),
         ('BF_OPENJPEG', 'OPENJPEG base path', ''),
@@ -375,12 +354,10 @@ def read_opts(env, cfg, args):
         ('BF_REDCODE_LIBPATH', 'REDCODE library path', ''),
 
         (BoolVariable('WITH_BF_PNG', 'Use PNG if true', True)),
-        (BoolVariable('WITH_BF_STATICPNG', 'Staticly link to PNG', False)),
         ('BF_PNG', 'PNG base path', ''),
         ('BF_PNG_INC', 'PNG include path', ''),
         ('BF_PNG_LIB', 'PNG library', ''),
         ('BF_PNG_LIBPATH', 'PNG library path', ''),
-        ('BF_PNG_LIB_STATIC', 'PNG static library', ''),
 
         (BoolVariable('WITH_BF_TIFF', 'Use TIFF if true', True)),
         (BoolVariable('WITH_BF_STATICTIFF', 'Staticly link to TIFF', False)),
@@ -398,30 +375,36 @@ def read_opts(env, cfg, args):
         ('BF_ZLIB_LIBPATH', 'ZLib library path', ''),
         ('BF_ZLIB_LIB_STATIC', 'ZLib static library', ''),
 
-        (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Boost::locale if true', True)),
+        (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Gettext if true', True)),
 
+        ('BF_GETTEXT', 'gettext base path', ''),
+        ('BF_GETTEXT_INC', 'gettext include path', ''),
+        ('BF_GETTEXT_LIB', 'gettext library', ''),
+        (BoolVariable('WITH_BF_GETTEXT_STATIC', 'Use static gettext library if true', False)),
+        ('BF_GETTEXT_LIB_STATIC', 'static gettext library', ''),
+        ('BF_GETTEXT_LIBPATH', 'gettext library path', ''),
+        
         (BoolVariable('WITH_BF_ICONV', 'Use iconv if true', True)),
         ('BF_ICONV', 'iconv base path', ''),
         ('BF_ICONV_INC', 'iconv include path', ''),
         ('BF_ICONV_LIB', 'iconv library', ''),
         ('BF_ICONV_LIBPATH', 'iconv library path', ''),
-
-        (BoolVariable('WITH_BF_FREESTYLE', 'Compile with freestyle', True)),
-
+        
         (BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
 
         (BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
-        # (BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),  # this is now only available in a branch
+        
+        (BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),
         ('BF_LAPACK', 'LAPACK base path', ''),
         ('BF_LAPACK_LIB', 'LAPACK library', ''),
         ('BF_LAPACK_LIB_STATIC', 'LAPACK library', ''),
         ('BF_LAPACK_LIBPATH', 'LAPACK library path', ''),
         (BoolVariable('WITH_BF_STATICLAPACK', 'Staticly link to LAPACK', False)),
-
+        
         ('BF_BULLET', 'Bullet base dir', ''),
         ('BF_BULLET_INC', 'Bullet include path', ''),
         ('BF_BULLET_LIB', 'Bullet library', ''),
-
+        
         ('BF_WINTAB', 'WinTab base dir', ''),
         ('BF_WINTAB_INC', 'WinTab include dir', ''),
         ('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''),
@@ -436,21 +419,19 @@ def read_opts(env, cfg, args):
         ('BF_FREETYPE_LIB_STATIC', 'Static Freetype library', ''),
 
         (BoolVariable('WITH_BF_OPENMP', 'Use OpenMP if true', False)),
-        (BoolVariable('WITH_BF_STATICOPENMP', 'Staticly link to OpenMP', False)),
         ('BF_OPENMP', 'Base path to OpenMP (used when cross-compiling with older versions of WinGW)', ''),
         ('BF_OPENMP_INC', 'Path to OpenMP includes (used when cross-compiling with older versions of WinGW)', ''),
         ('BF_OPENMP_LIBPATH', 'Path to OpenMP libraries (used when cross-compiling with older versions of WinGW)', ''),
+        (BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', False)),
         (BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL for windowing rather then the native APIs', False)),
-        (BoolVariable('WITH_X11_XINPUT', 'Enable X11 Xinput (tablet support and unicode input)', True)),
-        (BoolVariable('WITH_X11_XF86VMODE', 'Enable X11 video mode switching', True)),
-        ('BF_OPENMP_LIB_STATIC', 'OpenMP static library', ''),
+        (BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)),
 
         (BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)),
         ('BF_QUICKTIME', 'QuickTime base path', ''),
         ('BF_QUICKTIME_INC', 'QuickTime include path', ''),
         ('BF_QUICKTIME_LIB', 'QuickTime library', ''),
         ('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''),
-
+        
         (BoolVariable('WITH_BF_FFTW3', 'Use FFTW3 if true', False)),
         ('BF_FFTW3', 'FFTW3 base path', ''),
         ('BF_FFTW3_INC', 'FFTW3 include path', ''),
@@ -467,20 +448,7 @@ def read_opts(env, cfg, args):
         ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''),
         ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''),
 
-        (BoolVariable('WITH_BF_GLEW_MX', '', False)),
-        (BoolVariable('WITH_BF_GLEW_ES', '', False)),
-        (BoolVariable('WITH_BF_GL_EGL', '', False)),
-        (BoolVariable('WITH_BF_GL_PROFILE_COMPAT', '', True)),
-        (BoolVariable('WITH_BF_GL_PROFILE_CORE', '', False)),
-        (BoolVariable('WITH_BF_GL_PROFILE_ES20', '', False)),
-        (BoolVariable('WITH_BF_GL_ANGLE', '', False)),
-        ('BF_GL_DEFINITIONS', '', []),
-        ('BF_GLEW_INC', '', ''),
-    ) # end of opts.AddVariables()
-
-    localopts.AddVariables(
         (BoolVariable('WITH_BF_COLLADA', 'Build COLLADA import/export module if true', False)),
-        (BoolVariable('WITH_BF_STATICOPENCOLLADA', 'Staticly link to OpenCollada', False)),
         ('BF_COLLADA', 'COLLADA base path', ''),
         ('BF_COLLADA_INC', 'COLLADA include path', ''),
         ('BF_COLLADA_LIB', 'COLLADA library', ''),
@@ -494,8 +462,7 @@ def read_opts(env, cfg, args):
         ('BF_EXPAT', 'Expat base path', ''),
         ('BF_EXPAT_LIB', 'Expat library', ''),
         ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
-        ('BF_OPENCOLLADA_LIB_STATIC', 'OpenCollada static library', ''),
-
+        
         (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
         (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
         ('BF_JEMALLOC', 'jemalloc base path', ''),
@@ -531,10 +498,8 @@ def read_opts(env, cfg, args):
         ('LLIBS', 'Platform libs', []),
         ('PLATFORM_LINKFLAGS', 'Platform linkflags', []),
         ('MACOSX_ARCHITECTURE', 'python_arch.zip select', ''),
-        ('MACOSX_SDK', 'Set OS X SDK', ''),
-        ('XCODE_CUR_VER', 'Detect XCode version', ''),
-        ('MACOSX_DEPLOYMENT_TARGET', 'Detect OS X target version', ''),
-        ('C_COMPILER_ID', 'Detect the resolved compiler', ''),
+        ('MACOSX_SDK_CHECK', 'detect available OSX sdk`s', ''),
+        ('XCODE_CUR_VER', 'detect XCode version', ''),
 
         (BoolVariable('BF_PROFILE', 'Add profiling information if true', False)),
         ('BF_PROFILE_CFLAGS', 'C only profiling flags', []),
@@ -561,96 +526,65 @@ def read_opts(env, cfg, args):
         (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
         (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
         (BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
-        (BoolVariable('WITH_BF_PYTHON_INSTALL_NUMPY', 'install Python numpy module', False)),
-        (BoolVariable('WITH_BF_PYTHON_INSTALL_REQUESTS', 'install Python requests module', False)),
+        (BoolVariable('WITH_BF_PYTHON_INSTALL_NUMPY', 'install Python mumpy module', False)),
         (BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
         (BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
         (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
         (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
         (BoolVariable('BF_LINE_OVERWRITE', 'Enable overwriting of compile line in BF_QUIET mode if true', False)),
         (BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)),
-
+        
         (BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)),
         (BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)),
-
+        
         (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
-        (BoolVariable('WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS', 'Enable fixed-size schur specializations', True)),
-
+        
         (BoolVariable('WITH_BF_COMPOSITOR', 'Enable the tile based nodal compositor', True)),
-    ) # end of opts.AddOptions()
 
-    localopts.AddVariables(
         ('BF_X264_CONFIG', 'configuration flags for x264', ''),
         ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
 #        (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)),
-
+        
         ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'),
         ('BF_NUMJOBS', 'Number of build processes to spawn', '1'),
         ('BF_MSVS', 'Generate MSVS project files and solution', False),
 
         (BoolVariable('BF_UNIT_TEST', 'Build with unit test support.', False)),
-
+        
         (BoolVariable('BF_GHOST_DEBUG', 'Make GHOST print events and info to stdout. (very verbose)', False)),
-
+        
         (BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False)),
         ('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', ''),
         (BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)),
 
         ('BUILDBOT_BRANCH', 'Buildbot branch name', ''),
+    ) # end of opts.AddOptions()
 
+    localopts.AddVariables(
         (BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
         (BoolVariable('WITH_BF_CYCLES_CUDA_BINARIES', 'Build with precompiled CUDA binaries', False)),
         (BoolVariable('WITH_BF_CYCLES_CUDA_THREADED_COMPILE', 'Build several render kernels at once (using BF_NUMJOBS)', False)),
         ('BF_CYCLES_CUDA_NVCC', 'CUDA nvcc compiler path', ''),
-        ('BF_CYCLES_CUDA_ENV', 'preset environement nvcc will execute in', ''),
         ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
-        (BoolVariable('WITH_BF_CYCLES_DEBUG', 'Build Cycles engine with extra debugging capabilities', False)),
-        (BoolVariable('WITH_BF_CYCLES_LOGGING', 'Build Cycles engine with logging support', True)),
 
         (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
-        (BoolVariable('WITH_BF_STATICOIIO', 'Statically link to OpenImageIO', False)),
+        (BoolVariable('WITH_BF_STATICOIIO', 'Staticly link to OpenImageIO', False)),
         ('BF_OIIO', 'OIIO root path', ''),
         ('BF_OIIO_INC', 'OIIO include path', ''),
         ('BF_OIIO_LIB', 'OIIO library', ''),
         ('BF_OIIO_LIBPATH', 'OIIO library path', ''),
         ('BF_OIIO_LIB_STATIC', 'OIIO static library', ''),
 
-        (BoolVariable('WITH_BF_OCIO', 'Build with OpenColorIO', False)),
-        (BoolVariable('WITH_BF_STATICOCIO', 'Staticly link to OpenColorIO', False)),
-        ('BF_OCIO', 'OCIO root path', ''),
-        ('BF_OCIO_INC', 'OCIO include path', ''),
-        ('BF_OCIO_LIB', 'OCIO library', ''),
-        ('BF_OCIO_LIBPATH', 'OCIO library path', ''),
-        ('BF_OCIO_LIB_STATIC', 'OCIO static library', ''),
-
         (BoolVariable('WITH_BF_BOOST', 'Build with Boost', False)),
         (BoolVariable('WITH_BF_STATICBOOST', 'Staticly link to boost', False)),
         ('BF_BOOST', 'Boost root path', ''),
         ('BF_BOOST_INC', 'Boost include path', ''),
         ('BF_BOOST_LIB', 'Boost library', ''),
-        ('BF_BOOST_LIB_INTERNATIONAL', 'Boost library', ''),
         ('BF_BOOST_LIBPATH', 'Boost library path', ''),
         ('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
 
         (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)),
-
-        (BoolVariable('WITH_BF_CYCLES_OSL', 'Build with OSL sypport in Cycles', False)),
-        (BoolVariable('WITH_BF_STATICOSL', 'Staticly link to OSL', False)),
-        ('BF_OSL', 'OSL root path', ''),
-        ('BF_OSL_INC', 'OSL include path', ''),
-        ('BF_OSL_LIB', 'OSL library', ''),
-        ('BF_OSL_LIBPATH', 'OSL library path', ''),
-        ('BF_OSL_LIB_STATIC', 'OSL static library', ''),
-        ('BF_OSL_COMPILER', 'OSL compiler', ''),
-
-        (BoolVariable('WITH_BF_LLVM', 'Build with LLVM sypport (required for OSL)', False)),
-        (BoolVariable('WITH_BF_STATICLLVM', 'Staticly link to LLVM', False)),
-        ('BF_LLVM', 'LLVM root path', ''),
-        ('BF_LLVM_LIB', 'LLVM library', ''),
-        ('BF_LLVM_LIBPATH', 'LLVM library path', ''),
-        ('BF_LLVM_LIB_STATIC', 'LLVM static library', ''),
-
-        ('BF_PROGRAM_LINKFLAGS', 'Link flags applied only to final binaries (blender and blenderplayer, not makesrna/makesdna)', '')
+        (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', True))
     ) # end of opts.AddOptions()
 
     return localopts
@@ -710,24 +644,18 @@ def buildslave(target=None, source=None, env=None):
     if platform == 'linux':
         import platform
 
-        if "glibc27" in env['BF_INSTALLDIR']:
-            glibc = "glibc27"
-        elif "glibc211" in env['BF_INSTALLDIR']:
-            glibc = "glibc211"
-
         bitness = platform.architecture()[0]
         if bitness == '64bit':
-            platform = 'linux-' + glibc + '-x86_64'
+            platform = 'linux-glibc27-x86_64'
         elif bitness == '32bit':
-            platform = 'linux-' + glibc + '-i686'
+            platform = 'linux-glibc27-i686'
     if platform == 'darwin':
-        platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE']
-
+        platform = 'OSX-' + env['MACOSX_ARCHITECTURE']
 
     branch = env['BUILDBOT_BRANCH']
 
     outdir = os.path.abspath(env['BF_INSTALLDIR'])
-    package_name = 'blender-' + VERSION+'-'+HASH + '-' + platform
+    package_name = 'blender-' + VERSION+'-'+REVISION + '-' + platform
     if branch != '':
         package_name = branch + '-' + package_name
     package_dir = os.path.normpath(outdir + os.sep + '..' + os.sep + package_name)
@@ -754,7 +682,7 @@ def NSIS_Installer(target=None, source=None, env=None):
 
     if env['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
         print "NSIS installer is only available on Windows."
-        exit()
+        Exit()
     if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
         bitness = '32'
     elif env['OURPLATFORM'] in ('win64-vc', 'win64-mingw'):
@@ -773,7 +701,7 @@ def NSIS_Installer(target=None, source=None, env=None):
     deldatafiles = ''
     deldatadirs = ''
     l = len(bf_installdir)
-
+    
     for dp,dn,df in os.walk(bf_installdir):
         # install
         if not doneroot:
@@ -782,6 +710,7 @@ def NSIS_Installer(target=None, source=None, env=None):
             doneroot = True
         else:
             if len(df)>0:
+                dp_tmp = dp[l:]
                 datafiles += "\n" +r'SetOutPath $INSTDIR'+dp[l:]+"\n\n"
 
                 for f in df:
@@ -800,7 +729,7 @@ def NSIS_Installer(target=None, source=None, env=None):
 
     #### change to suit install dir ####
     inst_dir = install_base_dir + env['BF_INSTALLDIR']
-
+    
     os.chdir(rel_dir)
 
     ns = open("00.sconsblender.nsi","r")
@@ -860,18 +789,6 @@ def NSIS_Installer(target=None, source=None, env=None):
         print data.strip().split("\n")[-1]
     return rv
 
-def cudakernels_print(target, source, env):
-    return "Running cudakernels target"
-
-def cudakernels(target=None, source=None, env=None):
-    """
-    Builder for cuda kernels compilation. Used by release build environment only
-    """
-
-    # Currently nothing to do, everything is handled by a dependency resolver
-
-    pass
-
 def check_environ():
     problematic_envvars = ""
     for i in os.environ:

build_files/utils/build_tgz.sh

@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# This script can run from any location,
-# output is created in the $CWD
-
-BASE_DIR="$PWD"
-
-blender_srcdir=$(dirname -- $0)/../..
-blender_version=$(grep "BLENDER_VERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
-blender_version_char=$(grep "BLENDER_VERSION_CHAR\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
-blender_version_cycle=$(grep "BLENDER_VERSION_CYCLE\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
-blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
-
-if [ "$blender_version_cycle" = "release" ] ; then
-	VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)$blender_version_char
-	SUBMODULE_EXCLUDE="^\(release/scripts/addons_contrib\)$"
-else
-	VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)_$blender_subversion
-	SUBMODULE_EXCLUDE="^$"  # dummy regex
-fi
-
-MANIFEST="blender-$VERSION-manifest.txt"
-TARBALL="blender-$VERSION.tar.gz"
-
-cd "$blender_srcdir"
-
-# not so nice, but works
-FILTER_FILES_PY="import os, sys; [print(l[:-1]) for l in sys.stdin.readlines() if os.path.isfile(l[:-1])]"
-
-# Build master list
-echo -n "Building manifest of files:  \"$BASE_DIR/$MANIFEST\" ..."
-git ls-files | python3 -c "$FILTER_FILES_PY" > $BASE_DIR/$MANIFEST
-
-# Enumerate submodules
-for lcv in $(git submodule | awk '{print $2}' | grep -v "$SUBMODULE_EXCLUDE"); do
-	cd "$BASE_DIR"
-	cd "$blender_srcdir/$lcv"
-	git ls-files | python3 -c "$FILTER_FILES_PY" | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST
-	cd "$BASE_DIR"
-done
-echo "OK"
-
-
-# Create the tarball
-cd "$blender_srcdir"
-echo -n "Creating archive:            \"$BASE_DIR/$TARBALL\" ..."
-GZIP=-9 tar --transform "s,^,blender-$VERSION/,g" -zcf "$BASE_DIR/$TARBALL" -T "$BASE_DIR/$MANIFEST"
-echo "OK"
-
-
-# Create checksum file
-cd "$BASE_DIR"
-echo -n "Createing checksum:          \"$BASE_DIR/$TARBALL.md5sum\" ..."
-md5sum "$TARBALL" > "$TARBALL.md5sum"
-echo "OK"
-
-
-# Cleanup
-echo -n "Cleaning up ..."
-rm "$BASE_DIR/$MANIFEST"
-echo "OK"
-
-echo "Done!"

doc/blender_file_format/BlendFileDnaExporter_25.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -112,7 +112,7 @@ class DNACatalogHTML:
         # ${version} and ${revision}
         if bpy:
             version = '.'.join(map(str, bpy.app.version))
-            revision = bpy.app.build_hash
+            revision = bpy.app.build_revision[:-1]
         else:
             version = str(header.Version)
             revision = 'Unknown'
@@ -404,7 +404,7 @@ def main():
         # Files
         if '--dna-versioned' in sys.argv:
             blender_version = '_'.join(map(str, bpy.app.version))
-            filename = 'dna-{0}-{1}_endian-{2}-{3}'.format(sys.arch, sys.byteorder, blender_version, bpy.app.build_hash)
+            filename = 'dna-{0}-{1}_endian-{2}-r{3}'.format(sys.arch, sys.byteorder, blender_version, bpy.app.build_revision[2:-1])
         else:
             filename = 'dna'
         dir = os.path.dirname(__file__)
@@ -451,7 +451,7 @@ def main():
             os.remove(Path_Blend)
         
         # export dna to xhtml
-        log.info("6: export sdna to xhtml file: %r" % Path_HTML)
+        log.info("6: export sdna to xhtml file")
         handleHTML = open(Path_HTML, "w")
         catalog.WriteToHTML(handleHTML)
         handleHTML.close()

doc/blender_file_format/BlendFileReader.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.2
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #

doc/build_systems/cmake.txt

@@ -7,9 +7,12 @@
 
     1. Introduction
     2. Obtaining CMake
-    3. Building Blender
-    4. Generic Setup
-    5. Configuring the build after SVN updates
+    3. Obtaining Dependencies
+    4. Deciding on a Build Environment
+    5. Configuring the build for the first time
+    6. Configuring the build after SVN updates
+    7. Specify alternate Python library versions and locations
+
 
     1. Introduction
     ---------------
@@ -25,17 +28,36 @@
     The website also contains some documentation on CMake usage but I found
     the man page alone pretty helpful. 
 
-    3. Building Blender
-    -------------------
+    3. Obtaining Dependencies
+    -------------------------
 
-    Building Blender requires obtaining a compiler, library dependencies,
-    and correct setup depending on the system. For details on how to set
-    up a build on various operating systems, see the wiki documentation:
+    Check from the page
+    http://www.blender.org/cms/Getting_Dependencies.135.0.html that you
+    have all dependencies needed for building Blender. Note that for
+    windows many of these dependencies already come in the lib/windows
+    module from SVN.
 
-    http://wiki.blender.org/index.php/Dev:Doc/Building_Blender
+    4. Deciding on a Build Environment
+    ----------------------------------
 
-    4. Generic Setup
-    ----------------
+    To build Blender with the CMake scripts you first need to decide which
+    build environment you feel comfortable with. This decision will also be
+    influenced by the platform you are developing on. The current implementation
+    have been successfully used to generate build files for the following 
+    environments:
+
+    1. Microsoft Visual Studio 2008. There is a free version available
+       at http://http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
+
+    2. Xcode on Mac OSX
+
+    3. Unix Makefiles (On Linux and Mac OSX): CMake actually creates make 
+       files which generates nicely color coded output and a percentage 
+       progress indicator.
+
+
+    5. Configuring the build for the first time
+    -------------------------------------------
 
     CMake allows one to generate the build project files and binary objects
     outside the source tree which can be pretty handy in working and experimenting
@@ -91,14 +113,42 @@
     It is also possible to use the commandline of 'cmake' to override certain
     of these settings. 
 
-    5. Configuring the build after SVN updates
+    6. Configuring the build after SVN updates
     ------------------------------------------
 
     The $BLENDERBUILD directory maintains a file called CMakeCache.txt which 
     remembers the initial run's settings for subsequent generation runs. After
-    SVN updates that contain changes to the build system, rebuilding Blender will
-    automatically invoke CMake to regenerate the CMakeCache.txt and other files
-    as needed.
+    every SVN update it may be a good idea to rerun the generation before building
+    Blender again. Just rerun the original 'cmake' run to do this, the settings
+    will be remembered. For the example above the following will do after every
+    'svn up':
+
+        % cmake -G Xcode $BLENDERSOURCE
+
+    7. Specify alternate Python library versions and locations
+    ----------------------------------------------------------
+    
+    The commandline can be used to override detected/default settings, e.g:
+ 
+    On Unix: 
+      cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.2/config/libpython3.2.so -D PYTHON_INCLUDE_DIR=/usr/local/include/python3.2 ../blender
+    On Macs: 
+      cmake -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 -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.
+
+
+
+    To be continued...
+
+    TODO's
+    ------
+
+    1. Get CMake to create proper distribution directories for the various platforms
+       like scons does.
+    2. Investigate the viability of using CPack to package installs automatically.
+    3. Refine this document and write detailed developer's document.
+    4. Make sure all options (ffmpeg, openexr, quicktime) has proper CMake support
+       on the various platforms.    
 
     /Jacques Beaurain (jbinto)
-

doc/guides/interface_API.txt

@@ -19,22 +19,26 @@ Contents
 4. API for uiButton 
 4.1 UiDefBut
 	1. BUT
-	2. TOG or TOGN
+	2. TOG or TOGN or TOGR
 	   TOG|BIT|<nr>
-	3. ROW
-	4. NUMSLI or HSVSLI
-	5. NUM
-	6. TEX
-	7. LABEL
-	8  SEPR
-	9. MENU
-	10.	COL
+	3. TOG3|BIT|<nr>
+	4. ROW
+	5. SLI or NUMSLI or HSVSLI
+	6. NUM
+	7. TEX
+	8. LABEL
+	9  SEPR
+	10. MENU
+	11.	COL
 4.2 Icon buttons
+	12. ICONROW
+	13. ICONTEXTROW
 4.3 pulldown menus / block buttons
 	14. BLOCK
 4.4 specials
 	15. KEYEVT
 	16. LINK and INLINK
+	17. IDPOIN
 4.5 uiButton control fuctions
 
 
@@ -46,7 +50,7 @@ Contents
 - It works with only OpenGL calls, for the full 100%. This means that it has some quirks
   built-in to work with all OS's and OpenGL versions. Especially frontbuffer drawing is 
   a continuous point of attention. Buttons can be drawn with any window matrix. However,
-  errors can still occur when buttons are created in windows with non-standard glViewports.
+  errors can still occor when buttons are created in windows with non-standard glViewports.
   
 - The code was written to replace the old 1.8 button system, but under high pressure. Quite
   some button methods from the old system were copied for that reason.
@@ -91,7 +95,7 @@ blender/source/blender/src/toolbox.c (extra GUI elements built on top of this AP
 All GUI elements are collected in uiBlocks, which in turn are linked together in a list that's 
 part of a Blender Area-window.
 
-	uiBlock *block = uiNewBlock(&curarea->uiblocks, "stuff", UI_EMBOSSX, UI_HELV, curarea->win);
+	uiBlock *block= uiNewBlock(&curarea->uiblocks, "stuff", UI_EMBOSSX, UI_HELV, curarea->win);
 
 The next code example makes a new block, and puts it in the list of blocks of the current active 
 Area:
@@ -217,7 +221,7 @@ void uiBlockSetButmFunc(uiBlock *block, void (*menufunc)(void *arg, int event),
 void uiAutoBlock(uiBlock *block, float minx, float miny, float sizex, float sizey, UI_BLOCK_ROWS)
 
 	Sets the buttons in this block to automatically align, and fit within boundaries. 
-	Internally it allows multiple colums or rows as well. Only 'row order' has been implemented.
+	Internally it allows multiple collums or rows as well. Only 'row order' has been implemented.
 	The uiDefBut definitions don't need coordinates as input here, but instead:
 	- first value (x1) to indicate row number
 	- width and height values (if filled in) will be used to define a relative width/height.
@@ -285,49 +289,55 @@ type:
 	Activation button. (like "Render")
 	Passing on a pointer is not needed
 	
-2. TOG or TOGN
+2. TOG or TOGN or TOGR
 	Toggle button (like "Lock")
 	The pointer value is set either at 0 or 1
 	If pressed, it calls the optional function with arguments provided.
 	Type TOGN: works negative, when pressed it sets at 0
+	Type TOGR: is part of a row, redraws automatically all buttons with same *poin
 
 	"|BIT|<nr>"
 	When added to type, it works on a single bit <nr> (lowest order bit: nr = '0')
 
-3. ROW
+3. TOG3|BIT|<nr>
+	A toggle with 3 values!
+	Can be only used for short *poin.
+	In the third toggle setting, the bit <nr> of *( poin+1) is set.
+	
+4. ROW
 	Button that's part of a row. 
 	in "min" you set a row-id number, in "max" the value you want *poin to be
 	assigned when you press the button. Always pass on these values as floats.
 	When this button is pressed, it sets the "max" value to *poin, and redraws
 	all buttons with the same row-id number.
 
-4. NUMSLI or HSVSLI
-	Number-slider or hsv-slider button.
+5. SLI or NUMSLI or HSVSLI
+	Slider, number-slider or hsv-slider button.
 	"min" and "max" are to clamp the value to.
 	If you want a button type "Col" to be updated, make 'a1' equal to 'retval'
 	from the COL button.
 	
-5. NUM
+6. NUM
 	Number button
 	Set the clamping values 'min' and 'max' always as float.
 	For UiDefButF, set a 'step' in 'a1', in 1/100's. The step value is the increment or
 	decrement when you click once on the right or left side of a button.
 	The optional button function is additionally called for each change of the *poin value.
 	
-6. TEX
+7. TEX
 	Text string button.
 	Pointertype is standard a char. Value 'max' is length of string (pass as float).
 	When button is left with ESC, it doesn't put the 'retval' at the queue.
 	
-7. LABEL
+8. LABEL
 	Label button.
 	Only displays text. 
 	If 'min' is set at 1.0, the text is printed in white.
 	
-8  SEPR
+9  SEPR
 	A separator line, typically used within pulldown menus.
 	
-9. MENU
+10. MENU
 	Menu button.
 	The syntax of the string in *name defines the menu items:
 		- %t means the previous text becomes the title
@@ -336,7 +346,7 @@ type:
 			without returnvalues, the first item gets value 0 (incl. title!)
 	Example: "Do something %t| turn left %2| turn right %1| nothing %0"
 	
-10.	COLOR
+11.	COL
 	A special button that only visualizes a RGB value
 	In 'retval' you can put a code, which is used to identify for sliders if it needs
 	redraws while using the sliders. Check button '5'.
@@ -353,7 +363,7 @@ uiBut *uiDefIconBut(uiBlock *block, int type, int retval, int icon,
 			float min, float max, float a1, float a2,  char *tip)
 
 	Same syntax and types available as previous uiDefBut, but now with an icon code 
-	instead of a name. The icons are numbered in resources.c
+	instead of a name. THe icons are numbered in resources.c
 
 uiBut *uiDefIconTextButF(uiBlock *block, int type, int retval, int icon, char *str, 
 			short x1, short y1, short x2, short y2, float *poin, 
@@ -361,6 +371,19 @@ uiBut *uiDefIconTextButF(uiBlock *block, int type, int retval, int icon, char *s
 
 	Same again, but now with an icon and string as button name.
 
+Two special icon buttons are available in Blender:
+
+12. ICONROW
+	(uiDefIconBut)
+	This button pops up a vertical menu with a row of icons to choose from.
+	'max' = amount of icons. The icons are supposed to be ordered in a sequence
+	It writes in *poin which item in the menu was choosen (starting with 0).
+
+13. ICONTEXTROW
+	(uiDefIconTextBut)
+	Same as previous, but with the texts next to it.
+
+
 
 -----------4.3 pulldown menus / block buttons
 
@@ -374,9 +397,9 @@ void uiDefBlockBut(uiBlock *block, uiBlockFuncFP func, void *arg, char *str,
 	static uiBlock *info_file_importmenu(void *arg_unused)
 	{
 		uiBlock *block;
-		short yco = 0, xco = 20;
+		short yco= 0, xco = 20;
 	
-		block = uiNewBlock(&curarea->uiblocks, "importmenu", UI_EMBOSSW, UI_HELV, G.curscreen->mainwin);
+		block= uiNewBlock(&curarea->uiblocks, "importmenu", UI_EMBOSSW, UI_HELV, G.curscreen->mainwin);
 		uiBlockSetXOfs(block, -40);  // offset to parent button
 	
 		/* flags are defines */
@@ -386,7 +409,7 @@ void uiDefBlockBut(uiBlock *block, uiBlockFuncFP func, void *arg, char *str,
 		uiDefButS(block, TOG|BIT|2, 0, "Two Sided", xco, yco-=20, 75, 19, &U.vrmlflag, 0.0, 0.0, 0, 0, "");
 	
 		uiBlockSetDirection(block, UI_RIGHT);
-		uiTextBoundsBlock(block, 50);  /* checks for fontsize */
+		uiTextBoundsBlock(block, 50);	// checks for fontsize
 
 		return block;
 	}
@@ -442,6 +465,37 @@ uiDefIconBut(block, INLINK, 0, ICON_INLINK, x1, y1, w, h, void *poin, short from
 	
 
 
+17. IDPOIN
+void uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, int retval, char *str, 
+			short x1, short y1, short x2, short y2, void *idpp, char *tip)
+
+	The ID struct is a generic part in structs like Object, Material, Mesh, etc.
+	Most linking options in Blender happens using ID's. (Mesh -> Material).
+	
+	This special button in Blender visualizes an ID pointer with its name. Typing in
+	a new name, changes the pointer. For most ID types in Blender functions have been
+	written already, needed by this button, to check validity of names, and assign the pointer.
+	
+	(BTW: the 'void *idpp' has to be a pointer to the ID pointer!)
+
+	Example function that can be put in 'func':
+	
+	void test_scriptpoin_but(char *name, ID **idpp)
+	{
+		ID *id;
+		
+		id= G.main->text.first;
+		while(id) {
+			if( strcmp(name, id->name+2)==0 ) {
+				*idpp= id;
+				return;
+			}
+			id= id->next;
+		}
+		*idpp= 0;
+	}
+
+
 ------------- 4.5 uiButton control fuctions
 
 

doc/license/GPL3-license.txt

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

doc/license/bf-members.txt

@@ -35,7 +35,7 @@ Eric Van Hensbergen
 Christian Reichlin 
 brian moore 
 Anthony Walker 
-Carsten Höfer 
+Carsten H<EFBFBD>fer 
 Raymond Fordham 
 David Megginson 
 Jason Schmidt 
@@ -78,7 +78,7 @@ Ken Payne
 DEBEUX Sylvain 
 Douglas Philips 
 Lai Che Hung
-Johan Bolmsjö 
+Johan Bolmsj<EFBFBD> 
 Aaron Mitchell 
 Teinye Horsfall 
 Martin Marbach 
@@ -98,7 +98,7 @@ lukas schroeder
 Dan Lyke 
 Mark Thorpe 
 A.D. Arul Nirai Selvan 
-Herbert Pötzl 
+Herbert P<EFBFBD>tzl 
 Andy Payne 
 LAFFITTE Benoit (KenjForce)
 James Ertle 
@@ -148,7 +148,7 @@ Kendall Dugger
 Brice Due 
 Simon Vogl 
 Bernd Koestler 
-clément CORDIER 
+cl<EFBFBD>ment CORDIER 
 CreationAnimation.com
 Pete Carss 
 HERSEN Antoine 
@@ -197,9 +197,9 @@ cadic jean-yves
 Ralf Pietersz 
 KAZY
 serge Jadot 
-Hervé LOUINET 
+Herv<EFBFBD> LOUINET 
 Tom Houtman 
-Magnus Kööhler 
+Magnus K<EFBFBD><EFBFBD>hler 
 Martin Sinnaeve 
 Kevin Yank 
 Tomoichi Iriyama 
@@ -221,12 +221,12 @@ Gianluigi Belli
 Naoki Abe 
 NOTTE Jean-Pierre 
 Jack Way 
-Björn Westlin 
+Bj<EFBFBD>rn Westlin 
 Mitch Magee 
 wizoptic
 Jake Edge 
 David Hoover 
-Xabier Goñi 
+Xabier Go<EFBFBD>i 
 Daniel Fort 
 Erik Noteboom 
 Pavel Vostatek 
@@ -234,7 +234,7 @@ Javier Belanche Alonso
 Jeffrey Blank 
 Nathan Ryan 
 Peter Wrangell 
-Josef Sieß 
+Josef Sie<EFBFBD> 
 Timm Krumnack 
 Steve Martin 
 Shigeru Matsumoto 
@@ -261,7 +261,7 @@ Colin Foster
 Sascha Adler 
 Stuart Duncan 
 Brendon Smith 
-Sébastien COLLETTE 
+S<EFBFBD>bastien COLLETTE 
 Clemens Auer 
 Kay Fricke 
 Fabian Fagerholm 
@@ -282,7 +282,7 @@ STEMax
 Jeff Cox 
 Trevor Ratliff 
 Matt Henley 
-François VALETTE 
+Fran<EFBFBD>ois VALETTE 
 Rob Saunders 
 Mike Luethi 
 Rami Aubourg-Kaires 
@@ -290,9 +290,9 @@ Matthew Thomas
 Allan Jacobsen 
 Adam Lowe 
 David Hostetler 
-Loïc Vigneras 
+Lo<EFBFBD>c Vigneras 
 Dan Reiland 
-Pedro Díaz del Arco 
+Pedro D<EFBFBD>az del Arco 
 Pierre Beyssac 
 Chris Davey 
 YOSHIAKI Nishino 
@@ -385,7 +385,7 @@ Kiernan Holland
 Holger Malessa 
 Masanori Okuda 
 Andrea Maracci 
-Kai-Peter Bäckman 
+Kai-Peter B<EFBFBD>ckman 
 Gregg Patton 
 Luis M Ibarra
 Julian Green 
@@ -394,7 +394,7 @@ Mark Winkelman
 Ebbe L. Nielsen
 Carlos Orozco 
 magnetHead
-Krückel Oliver 
+Kr<EFBFBD>ckel Oliver 
 Thomas Ingham 
 Wes Devauld 
 Uwe Steinmann 
@@ -417,7 +417,7 @@ Steve Mackay
 NDNWarrior
 Christopher Gray 
 Darius Clarke (Socinian)
-Jean-Sébastien SEVESTRE 
+Jean-S<EFBFBD>bastien SEVESTRE 
 Douglas Fellows 
 Craig Symons 
 Quincin Gonjon 
@@ -447,7 +447,7 @@ Markus Q. Roberts
 Christoher Bartak 
 Peter Truog 
 Eric Dynowski 
-Philipp Gühring 
+Philipp G<EFBFBD>hring 
 Pierre-Yves RANNO 
 Jason Nollan (Cluh)
 Launay Jean-Claude 
@@ -465,7 +465,7 @@ TROJANI Cedric
 David Polston 
 Patrick Mullen 
 Tetsuya Okuno 
-Bodo Jäger 
+Bodo J<EFBFBD>ger 
 Leon Brooks 
 Cedric Adjih 
 Michael L. Fisher
@@ -521,7 +521,7 @@ Vincent Stoessel
 Adrian Virnig 
 Chris Dixon 
 Travis Cole 
-Mårten Mårtensson 
+M<EFBFBD>rten M<EFBFBD>rtensson 
 Evan Scott 
 Mark Coletti 
 Ken Burke 
@@ -541,7 +541,7 @@ Iain Russell
 Thomas Bleicher 
 Anthony Zishka 
 Jefferson Dubrule 
-Esa Piirilä 
+Esa Piiril<EFBFBD> 
 Bill Thiede 
 William Anderson 
 Alexander Kittel 
@@ -561,7 +561,7 @@ John DiLauro
 John Miller 
 Frederic Crozat 
 Matt Welland 
-Paul Calcé 
+Paul Calc<EFBFBD> 
 Joe Prochilo 
 Justin Shafer 
 Joe Croft 
@@ -571,7 +571,7 @@ Alain Gallo
 Phuoc Ngo 
 Krabat
 Derek Harmison 
-Sébastien Devine 
+S<EFBFBD>bastien Devine 
 Kenneth P. Stox
 Wade Felde 
 Kai Groshert 
@@ -603,7 +603,7 @@ Martin Forisch
 Guillermina Manon 
 Randal D. Adams
 Kevin Reagh (kevin3D)
-Wolfgang Kühn 
+Wolfgang K<EFBFBD>hn 
 BEAUSOLEIL Arnaud 
 Stan Jakubek 
 Klaus Brand 
@@ -628,7 +628,7 @@ Samuel Seay
 Mike Schaudies 
 Robert Sherwood 
 Fernando Villalon Panzano
-Jörg Roschke 
+J<EFBFBD>rg Roschke 
 Carl Symons 
 Peter Pichler 
 Alan Heckart 
@@ -714,7 +714,7 @@ Rau, Bernhard
 Stephen Uithoven 
 Ken Beyer 
 Matjaz Jakopec 
-Eckhard M. Jäger
+Eckhard M. J<EFBFBD>ger
 Mike Siebach 
 John Harger 
 Justin W. Carper
@@ -747,7 +747,7 @@ Karl Bartel
 Ralph Howes 
 Matthew J. Stott
 Omar Priego 
-Åke Westerström 
+<EFBFBD>ke Westerstr<EFBFBD>m 
 Imago Viva 
 James E Hill
 Rune Myrland 
@@ -785,7 +785,7 @@ Claude Bilat
 Mario Palomo 
 Neipi
 Grethus Bode 
-Jan Müller 
+Jan M<EFBFBD>ller 
 Mark Pearson 
 Stanislav Osicka 
 DataCare Solutions AG
@@ -804,9 +804,9 @@ Aaron Bredon
 Hideki Suzuki 
 josef radinger 
 Robert Friemer 
-Jörg Zastrau 
+J<EFBFBD>rg Zastrau 
 Burton Bicksler 
-Kimmo Mösö 
+Kimmo M<EFBFBD>s<EFBFBD> 
 Robert F Johnson
 Mark Johnson 
 Avi Bercovich 
@@ -821,21 +821,21 @@ Duffaud
 Marco Ardito 
 Simon Suter 
 Tobias Huelsdau 
-Winfried Engländer 
+Winfried Engl<EFBFBD>nder 
 Stephen Groundwater 
 Joel Ray Holveck
 Mag. Tibor Rudas
 Hartmut Wolf 
 Douglas Jones 
 brett hartshorn 
-Beat Mägert 
+Beat M<EFBFBD>gert 
 Javon Prince 
 bri
 James Klicman 
 Harvey Fong 
 jeroen v.d. Meulen
 Wim Vandersmissen 
-Carlos Moreno Rodríguez
+Carlos Moreno Rodr<EFBFBD>guez
 Trausti Kristjansson 
 Larry Snyder 
 olivier
@@ -887,7 +887,7 @@ Fred Roberts
 Njin-Zu Chen 
 GUILLON Marc 
 Felix Klock 
-Ernesto Salas Rodríguez
+Ernesto Salas Rodr<EFBFBD>guez
 Pavel Roskin 
 Jaap
 Stefan Maass 
@@ -911,7 +911,7 @@ delerue
 Dirk Behrens 
 Doc Holiday 
 Wouter Kerkhoven 
-Andreas Büttner 
+Andreas B<EFBFBD>ttner 
 James Black 
 Nicholas Ward 
 David Oberbeck 
@@ -940,7 +940,7 @@ Ian Whitworth
 Ruud H.G. van Tol 
 Pierre Lo Cicero
 Srinivas Digumarty 
-digitalvelocity®
+digitalvelocity<EFBFBD>
 Alan J Booth
 Tony OBrien 
 Douglas Toltzman 
@@ -957,12 +957,12 @@ Craig Spitzer
 Jeffrey Van Ness
 Lucas Vergnettes 
 Wolfgang Michaelis 
-Luis Jiménez Linares
+Luis Jim<EFBFBD>nez Linares
 Julian Eden 
 Ms Lilo von Hanffstengel 
 Kurt B. Kaiser
 Mark Ping 
-Combée
+Comb<EFBFBD>e
 Diego Matho 
 MELIN Philippe 
 Damian Sobieralski 
@@ -1028,7 +1028,7 @@ evolutie
 Stephane Portha 
 Robert Gentner 
 David B. Camhy
-René Foucart 
+Ren<EFBFBD> Foucart 
 Coyok Drio 
 Mark Ng 
 klein michael 
@@ -1094,14 +1094,14 @@ Stuart MacKinnon
 Dietrich Dietz - the IMaGiNation project (IMGN)
 Tina Hirsch 
 John R Thorp
-Frédéric Bouvier 
+Fr<EFBFBD>d<EFBFBD>ric Bouvier 
 LINETTE
 Felix Rabe 
 Chay Adamou 
 nick harron 
 stephen john ford
 Kino
-Daniel Sjölie 
+Daniel Sj<EFBFBD>lie 
 Matthias Derer 
 Alain VALLETON 
 Kervin Pierre 
@@ -1142,13 +1142,13 @@ Satoshi Yamasaki
 Rolf-Dieter Klein 
 J. Deetman 
 Helge Walter 
-Roland Strålberg 
+Roland Str<EFBFBD>lberg 
 Nicolas Morenas (Caronte)
 Simon Clarke 
 Maigrot Michel 
 Rod Robinson 
 Kevin Cozens 
-Germán Alonso (taz)
+Germ<EFBFBD>n Alonso (taz)
 Martin Stegeman 
 Henrik Jordfald Olsen
 Mitchell Skinner 
@@ -1157,7 +1157,7 @@ Spiridon G. Kontarakis
 Bas Denissen 
 Loic Dachary 
 Michael Rutter 
-Thorsten Schlüter 
+Thorsten Schl<EFBFBD>ter 
 hijothema
 Andreas Hauser 
 Holger Haase 
@@ -1232,9 +1232,9 @@ Starr Kline
 John Lullie 
 Chiffi Cosimo 
 Morgan McMillian 
-Stefan Hübner 
+Stefan H<EFBFBD>bner 
 Loic de MONTAIGNAC
-Andrés Castillo 
+Andr<EFBFBD>s Castillo 
 Francesco Anselmo 
 Ingo Guenther 
 James C. Davis, Jr. 
@@ -1314,7 +1314,7 @@ Luke Titley
 marinus meijers 
 Henry Kaminski 
 Alistair Riddoch 
-Daniel Nümm 
+Daniel N<EFBFBD>mm 
 Matthew Meadows 
 Bjoern Paschen 
 Paul Fredrickson 
@@ -1325,7 +1325,7 @@ Thomas Muldowney
 Cheyenne Cloud, LLC
 Helmut A. Goettl
 Martin A. Boegelund
-Benoît Cousson 
+Beno<EFBFBD>t Cousson 
 Scott Brooks 
 Ferlet Patrice 
 Aaron Porterfield 
@@ -1335,13 +1335,13 @@ Rui Paulo Sanguinheira Diogo
 Jason Saville 
 Active-Websight GbR 
 Bryon Roche 
-Gustavo Muñoz 
+Gustavo Mu<EFBFBD>oz 
 Christopher Gillanders 
 Phil Frost Tate
 Gilles Gonon 
 Kay
 James C. Franklin
-Luis Enrique Caamaño Navas 
+Luis Enrique Caama<EFBFBD>o Navas 
 Alexander "estartu" Felder
 Marc Ledermann 
 vrijschrift.org
@@ -1371,7 +1371,7 @@ Maurizio Sibaud
 Ron Bolger 
 Nathan Parton 
 Andrew Fry 
-VINCENT Stéphane 
+VINCENT St<EFBFBD>phane 
 Yan Yan 
 Justin L Graham
 Wade Beasley 

doc/manpage/blender.1

@@ -0,0 +1,429 @@
+.TH "BLENDER" "1" "July 19, 2012" "Blender Blender 2\&.63 (sub 14)"
+
+.SH NAME
+blender \- a 3D modelling and rendering package
+.SH SYNOPSIS
+.B blender [args ...] [file] [args ...]
+.br
+.SH DESCRIPTION
+.PP
+.B blender
+is a 3D modelling and rendering package. It is the in-house software of a high quality animation studio, Blender has proven to be an extremely fast and versatile design instrument. The software has a personal touch, offering a unique approach to the world of Three Dimensions.
+
+Use Blender to create TV commercials, to make technical visualizations, business graphics, to do some morphing, or design user interfaces. You can easy build and manage complex environments. The renderer is versatile and extremely fast. All basic animation principles (curves & keys) are well implemented.
+
+http://www.blender.org
+.SH OPTIONS
+
+Blender 2.63 (sub 14)
+Usage: blender [args ...] [file] [args ...]
+.br
+.SS "Render Options:"
+
+.TP
+.B \-b or \-\-background <file>
+.br
+Load <file> in background (often used for UI\-less rendering)
+.br
+
+.TP
+.B \-a or \-\-render\-anim
+.br
+Render frames from start to end (inclusive)
+.br
+
+.TP
+.B \-S or \-\-scene <name>
+.br
+Set the active scene <name> for rendering
+.br
+
+.TP
+.B \-f or \-\-render\-frame <frame>
+.br
+Render frame <frame> and save it.
+.br
++<frame> start frame relative, \-<frame> end frame relative.
+.br
+
+.TP
+.B \-s or \-\-frame\-start <frame>
+.br
+Set start to frame <frame> (use before the \-a argument)
+.br
+
+.TP
+.B \-e or \-\-frame\-end <frame>
+.br
+Set end to frame <frame> (use before the \-a argument)
+.br
+
+.TP
+.B \-j or \-\-frame\-jump <frames>
+.br
+Set number of frames to step forward after each rendered frame
+.br
+
+.TP
+.B \-o or \-\-render\-output <path>
+.br
+Set the render path and file name.
+.br
+Use // at the start of the path to
+.br
+    render relative to the blend file.
+.br
+The # characters are replaced by the frame number, and used to define zero padding.
+.br
+    ani_##_test.png becomes ani_01_test.png
+.br
+    test\-######.png becomes test\-000001.png
+.br
+    When the filename does not contain #, The suffix #### is added to the filename
+.br
+The frame number will be added at the end of the filename.
+.br
+    eg: blender \-b foobar.blend \-o //render_ \-F PNG \-x 1 \-a
+.br
+    //render_ becomes //render_####, writing frames as //render_0001.png//
+.br
+
+.TP
+.B \-E or \-\-engine <engine>
+.br
+Specify the render engine
+.br
+use \-E help to list available engines
+.br
+
+.IP
+
+.SS "Format Options:"
+
+.TP
+.B \-F or \-\-render\-format <format>
+.br
+Set the render format, Valid options are...
+.br
+    TGA IRIS JPEG MOVIE IRIZ RAWTGA
+.br
+    AVIRAW AVIJPEG PNG BMP FRAMESERVER
+.br
+(formats that can be compiled into blender, not available on all systems)
+.br
+    HDR TIFF EXR MULTILAYER MPEG AVICODEC QUICKTIME CINEON DPX DDS
+.br
+
+.TP
+.B \-x or \-\-use\-extension <bool>
+.br
+Set option to add the file extension to the end of the file
+.br
+
+.TP
+.B \-t or \-\-threads <threads>
+.br
+Use amount of <threads> for rendering in background
+.br
+[1\-64], 0 for systems processor count.
+.br
+
+.IP
+
+.SS "Animation Playback Options:"
+
+.TP
+.B \-a <options> <file(s)>
+.br
+Playback <file(s)>, only operates this way when not running in background.
+.br
+    \-p <sx> <sy> Open with lower left corner at <sx>, <sy>
+.br
+    \-m Read from disk (Don't buffer)
+.br
+    \-f <fps> <fps\-base> Specify FPS to start with
+.br
+    \-j <frame> Set frame step to <frame>
+.br
+
+.IP
+
+.SS "Window Options:"
+
+.TP
+.B \-w or \-\-window\-border
+.br
+Force opening with borders (default)
+.br
+
+.TP
+.B \-W or \-\-window\-borderless
+.br
+Force opening without borders
+.br
+
+.TP
+.B \-p or \-\-window\-geometry <sx> <sy> <w> <h>
+.br
+Open with lower left corner at <sx>, <sy> and width and height as <w>, <h>
+.br
+
+.TP
+.B \-con or \-\-start\-console
+.br
+Start with the console window open (ignored if \-b is set)
+.br
+
+.IP
+
+.SS "Game Engine Specific Options:"
+
+.TP
+.B \-g Game Engine specific options
+.br
+\-g fixedtime Run on 50 hertz without dropping frames
+.br
+\-g vertexarrays Use Vertex Arrays for rendering (usually faster)
+.br
+\-g nomipmap No Texture Mipmapping
+.br
+\-g linearmipmap Linear Texture Mipmapping instead of Nearest (default)
+.br
+
+.IP
+
+.SS "Misc Options:"
+
+.TP
+.B \-d or \-\-debug
+.br
+Turn debugging on
+.br
+
+.IP
+* Prints every operator call and their arguments
+.br
+* Disables mouse grab (to interact with a debugger in some cases)
+.br
+* Keeps python sys.stdin rather than setting it to None
+.br
+
+.TP
+.B \-\-debug\-fpe
+.br
+Enable floating point exceptions
+.br
+
+.IP
+
+.TP
+.B \-\-factory\-startup
+.br
+Skip reading the "startup.blend" in the users home directory
+.br
+
+.IP
+
+.TP
+.B \-\-env\-system\-datafiles
+.br
+Set the BLENDER_SYSTEM_DATAFILES environment variable
+.br
+
+.TP
+.B \-\-env\-system\-scripts
+.br
+Set the BLENDER_SYSTEM_SCRIPTS environment variable
+.br
+
+.TP
+.B \-\-env\-system\-python
+.br
+Set the BLENDER_SYSTEM_PYTHON environment variable
+.br
+
+.IP
+
+.TP
+.B \-nojoystick
+.br
+Disable joystick support
+.br
+
+.TP
+.B \-noglsl
+.br
+Disable GLSL shading
+.br
+
+.TP
+.B \-noaudio
+.br
+Force sound system to None
+.br
+
+.TP
+.B \-setaudio
+.br
+Force sound system to a specific device
+.br
+NULL SDL OPENAL JACK
+.br
+
+.IP
+
+.TP
+.B \-h or \-\-help
+.br
+Print this help text and exit
+.br
+
+.IP
+
+.TP
+.B \-y or \-\-enable\-autoexec
+.br
+Enable automatic python script execution, (default)
+.br
+
+.TP
+.B \-Y or \-\-disable\-autoexec
+.br
+Disable automatic python script execution (pydrivers & startup scripts)
+.br
+
+.IP
+
+.TP
+.B \-P or \-\-python <filename>
+.br
+Run the given Python script (filename or Blender Text)
+.br
+
+.TP
+.B \-\-python\-console
+.br
+Run blender with an interactive console
+.br
+
+.TP
+.B \-\-addons
+.br
+Comma separated list of addons (no spaces)
+.br
+
+.TP
+.B \-v or \-\-version
+.br
+Print Blender version and exit
+.br
+
+.TP
+.B \-\-
+.br
+Ends option processing, following arguments passed unchanged. Access via python's sys.argv
+.br
+
+.SS "Other Options:"
+
+.TP
+.B /?
+.br
+Print this help text and exit (windows only)
+.br
+
+.TP
+.B \-\-debug\-python
+.br
+Enable debug messages for python
+.br
+
+.TP
+.B \-\-debug\-events
+.br
+Enable debug messages for the event system
+.br
+
+.TP
+.B \-\-debug\-wm
+.br
+Enable debug messages for the window manager
+.br
+
+.TP
+.B \-\-debug\-all
+.br
+Enable all debug messages (excludes libmv)
+.br
+
+.TP
+.B \-\-debug\-value <value>
+.br
+Set debug value of <value> on startup
+.br
+
+.IP
+
+.TP
+.B \-\-debug\-jobs
+.br
+Enable time profiling for background jobs.
+.br
+
+.TP
+.B \-\-verbose <verbose>
+.br
+Set logging verbosity level.
+.br
+
+.TP
+.B \-R
+.br
+Register .blend extension, then exit (Windows only)
+.br
+
+.TP
+.B \-r
+.br
+Silently register .blend extension, then exit (Windows only)
+.br
+
+.SS "Argument Parsing:"
+
+    arguments must be separated by white space. eg
+        "blender \-ba test.blend"
+    ...will ignore the 'a'
+        "blender \-b test.blend \-f8"
+    ...will ignore 8 because there is no space between the \-f and the frame value
+.br
+.SS "Argument Order:"
+
+Arguments are executed in the order they are given. eg
+        "blender \-\-background test.blend \-\-render\-frame 1 \-\-render\-output /tmp"
+    ...will not render to /tmp because '\-\-render\-frame 1' renders before the output path is set
+        "blender \-\-background \-\-render\-output /tmp test.blend \-\-render\-frame 1"
+    ...will not render to /tmp because loading the blend file overwrites the render output that was set
+        "blender \-\-background test.blend \-\-render\-output /tmp \-\-render\-frame 1" works as expected.
+.br
+.br
+.SH "ENVIRONMENT VARIABLES"
+  \fIBLENDER_USER_CONFIG\fR Directory for user configuration files.
+  \fIBLENDER_USER_SCRIPTS\fR Directory for user scripts.
+  \fIBLENDER_SYSTEM_SCRIPTS\fR Directory for system wide scripts.
+  \fIDirectory\fR for user data files (icons, translations, ..).
+  \fIBLENDER_SYSTEM_DATAFILES\fR Directory for system wide data files.
+  \fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries.
+  \fITMP\fR or \fITMPDIR\fR Store temporary files here.
+  \fIPYTHONHOME\fR Path to the python directory, eg. /usr/lib/python.
+.br
+.br
+
+.br
+.SH SEE ALSO
+.B yafaray(1)
+
+.br
+.SH AUTHORS
+This manpage was written for a Debian GNU/Linux system by Daniel Mester
+<mester@uni-bremen.de> and updated by Cyril Brulebois
+<cyril.brulebois@enst-bretagne.fr> and Dan Eicher <dan@trollwerks.org>.

doc/manpage/blender.1.py

@@ -18,19 +18,10 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-'''
-This script generates the blender.1 man page, embedding the help text
-from the Blender executable itself. Invoke it as follows:
-
-    blender.1.py <path-to-blender> <output-filename>
-
-where <path-to-blender> is the path to the Blender executable,
-and <output-filename> is where to write the generated man page.
-'''
-
 # <pep8 compliant>
 
 import subprocess
+import os
 import sys
 
 import time
@@ -39,26 +30,40 @@ import datetime
 
 def man_format(data):
     data = data.replace("-", "\\-")
-    data = data.replace("\t", "  ")
+    data = data.replace("\t", "    ")
+    # data = data.replace("$", "\\fI")
+
+    data_ls = []
+    for w in data.split():
+        if w.startswith("$"):
+            w = "\\fI" + w[1:] + "\\fR"
+
+        data_ls.append(w)
+
+    data = data[:len(data) - len(data.lstrip())] + " ".join(data_ls)
+
     return data
 
-if len(sys.argv) != 3:
-    import getopt
-    raise getopt.GetoptError("Usage: %s <path-to-blender> <output-filename>" % sys.argv[0])
-
-blender_bin = sys.argv[1]
-outfilename = sys.argv[2]
+# allow passing blender as argument
+if sys.argv[-1].endswith(os.sep + "blender"):
+    blender_bin = sys.argv[-1]
+else:
+    blender_bin = os.path.join(os.path.dirname(__file__), "../../blender.bin")
 
 cmd = [blender_bin, "--help"]
 print("  executing:", " ".join(cmd))
-blender_help = subprocess.check_output(cmd).decode(encoding="utf-8")
-blender_version = subprocess.check_output([blender_bin, "--version"]).decode(encoding="utf-8").strip()
-blender_version = blender_version.split("build")[0].rstrip()
-blender_version = blender_version.partition(" ")[2]  # remove 'Blender' prefix.
+blender_help = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0].decode(encoding="utf-8")
+
+blender_version = subprocess.Popen([blender_bin, "--version"], stdout=subprocess.PIPE).communicate()[0].decode(encoding="utf-8").strip()
+blender_version = blender_version.split("Build")[0]
+
 date_string = datetime.date.fromtimestamp(time.time()).strftime("%B %d, %Y")
 
-outfile = open(outfilename, "w")
-fw = outfile.write
+filepath = os.path.splitext(__file__)[0]
+
+file = open(filepath, "w")
+
+fw = file.write
 
 fw('.TH "BLENDER" "1" "%s" "Blender %s"\n' % (date_string, blender_version.replace(".", "\\&.")))
 
@@ -75,9 +80,9 @@ fw('''
 .SH DESCRIPTION
 .PP
 .B blender
-is a 3D modelling and rendering package. Originating as the in-house software of a high quality animation studio, Blender has proven to be an extremely fast and versatile design instrument. The software has a personal touch, offering a unique approach to the world of Three Dimensions.
+is a 3D modelling and rendering package. It is the in-house software of a high quality animation studio, Blender has proven to be an extremely fast and versatile design instrument. The software has a personal touch, offering a unique approach to the world of Three Dimensions.
 
-Use Blender to create TV commercials, to make technical visualizations, business graphics, to create content for games, or design user interfaces. You can easy build and manage complex environments. The renderer is versatile and extremely fast. All basic animation principles (curves & keys) are well implemented.
+Use Blender to create TV commercials, to make technical visualizations, business graphics, to do some morphing, or design user interfaces. You can easy build and manage complex environments. The renderer is versatile and extremely fast. All basic animation principles (curves & keys) are well implemented.
 
 http://www.blender.org''')
 
@@ -125,7 +130,7 @@ while lines:
 fw('''
 .br
 .SH SEE ALSO
-.B luxrender(1)
+.B yafaray(1)
 
 .br
 .SH AUTHORS
@@ -134,5 +139,4 @@ This manpage was written for a Debian GNU/Linux system by Daniel Mester
 <cyril.brulebois@enst-bretagne.fr> and Dan Eicher <dan@trollwerks.org>.
 ''')
 
-outfile.close()
-print("written:", outfilename)
+print("written:", filepath)

doc/python_api/examples/bmesh.ops.1.py

@@ -1,108 +0,0 @@
-# This script uses bmesh operators to make 2 links of a chain.
-
-import bpy
-import bmesh
-import math
-import mathutils
-
-# Make a new BMesh
-bm = bmesh.new()
-
-# Add a circle XXX, should return all geometry created, not just verts.
-bmesh.ops.create_circle(
-        bm,
-        cap_ends=False,
-        diameter=0.2,
-        segments=8)
-
-
-# Spin and deal with geometry on side 'a'
-edges_start_a = bm.edges[:]
-geom_start_a = bm.verts[:] + edges_start_a
-ret = bmesh.ops.spin(
-        bm,
-        geom=geom_start_a,
-        angle=math.radians(180.0),
-        steps=8,
-        axis=(1.0, 0.0, 0.0),
-        cent=(0.0, 1.0, 0.0))
-edges_end_a = [ele for ele in ret["geom_last"]
-               if isinstance(ele, bmesh.types.BMEdge)]
-del ret
-
-
-# Extrude and create geometry on side 'b'
-ret = bmesh.ops.extrude_edge_only(
-        bm,
-        edges=edges_start_a)
-geom_extrude_mid = ret["geom"]
-del ret
-
-
-# Collect the edges to spin XXX, 'extrude_edge_only' could return this.
-verts_extrude_b = [ele for ele in geom_extrude_mid
-                   if isinstance(ele, bmesh.types.BMVert)]
-edges_extrude_b = [ele for ele in geom_extrude_mid
-                   if isinstance(ele, bmesh.types.BMEdge) and ele.is_boundary]
-bmesh.ops.translate(
-        bm,
-        verts=verts_extrude_b,
-        vec=(0.0, 0.0, 1.0))
-
-
-# Create the circle on side 'b'
-ret = bmesh.ops.spin(
-        bm,
-        geom=verts_extrude_b + edges_extrude_b,
-        angle=-math.radians(180.0),
-        steps=8,
-        axis=(1.0, 0.0, 0.0),
-        cent=(0.0, 1.0, 1.0))
-edges_end_b = [ele for ele in ret["geom_last"]
-               if isinstance(ele, bmesh.types.BMEdge)]
-del ret
-
-
-# Bridge the resulting edge loops of both spins 'a & b'
-bmesh.ops.bridge_loops(
-        bm,
-        edges=edges_end_a + edges_end_b)
-
-
-# Now we have made a links of the chain, make a copy and rotate it
-# (so this looks something like a chain)
-
-ret = bmesh.ops.duplicate(
-        bm,
-        geom=bm.verts[:] + bm.edges[:] + bm.faces[:])
-geom_dupe = ret["geom"]
-verts_dupe = [ele for ele in geom_dupe if isinstance(ele, bmesh.types.BMVert)]
-del ret
-
-# position the new link
-bmesh.ops.translate(
-        bm,
-        verts=verts_dupe,
-        vec=(0.0, 0.0, 2.0))
-bmesh.ops.rotate(
-        bm,
-        verts=verts_dupe,
-        cent=(0.0, 1.0, 0.0),
-        matrix=mathutils.Matrix.Rotation(math.radians(90.0), 3, 'Z'))
-
-# Done with creating the mesh, simply link it into the scene so we can see it
-
-# Finish up, write the bmesh into a new mesh
-me = bpy.data.meshes.new("Mesh")
-bm.to_mesh(me)
-bm.free()
-
-
-# Add the mesh to the scene
-scene = bpy.context.scene
-obj = bpy.data.objects.new("Object", me)
-scene.objects.link(obj)
-
-# Select and make active
-scene.objects.active = obj
-obj.select = True

doc/python_api/examples/bpy.app.translations.py

@@ -1,33 +0,0 @@
-"""
-Intro
------
-
-.. warning::
-   Most of this object should only be useful if you actually manipulate i18n stuff from Python.
-   If you are a regular addon, you should only bother about :const:`contexts` member,
-   and the :func:`register`/:func:`unregister` functions! The :func:`pgettext` family of functions
-   should only be used in rare, specific cases (like e.g. complex "composited" UI strings...).
-
-| To add translations to your python script, you must define a dictionary formatted like that:
-|    ``{locale: {msg_key: msg_translation, ...}, ...}``
-| where:
-
-* locale is either a lang iso code (e.g. ``fr``), a lang+country code (e.g. ``pt_BR``),
-  a lang+variant code (e.g. ``sr@latin``), or a full code (e.g. ``uz_UZ@cyrilic``).
-* msg_key is a tuple (context, org message) - use, as much as possible, the predefined :const:`contexts`.
-* msg_translation is the translated message in given language!
-
-Then, call ``bpy.app.translations.register(__name__, your_dict)`` in your ``register()`` function, and \n"
-``bpy.app.translations.unregister(__name__)`` in your ``unregister()`` one.
-
-The ``Manage UI translations`` addon has several functions to help you collect strings to translate, and
-generate the needed python code (the translation dictionary), as well as optional intermediary po files
-if you want some... See
-`How to Translate Blender <http://wiki.blender.org/index.php/Dev:Doc/Process/Translate_Blender>`_ and
-`Using i18n in Blender Code <http://wiki.blender.org/index.php/Dev:Source/Interface/Internationalization>`_
-for more info.
-
-Module References
------------------
-
-"""

doc/python_api/examples/bpy.props.5.py

@@ -1,89 +0,0 @@
-"""
-Get/Set Example
-+++++++++++++++
-
-Get/Set functions can be used for boolean, int, float, string and enum properties.
-If these callbacks are defined the property will not be stored in the ID properties
-automatically, instead the get/set functions will be called when the property is
-read or written from the API.
-"""
-
-import bpy
-
-
-# Simple property reading/writing from ID properties.
-# This is what the RNA would do internally.
-def get_float(self):
-    return self["testprop"]
-
-
-def set_float(self, value):
-    self["testprop"] = value
-
-bpy.types.Scene.test_float = bpy.props.FloatProperty(get=get_float, set=set_float)
-
-
-# Read-only string property, returns the current date
-def get_date(self):
-    import datetime
-    return str(datetime.datetime.now())
-
-bpy.types.Scene.test_date = bpy.props.StringProperty(get=get_date)
-
-
-# Boolean array. Set function stores a single boolean value, returned as the second component.
-# Array getters must return a list or tuple
-# Array size must match the property vector size exactly
-def get_array(self):
-    return (True, self["somebool"])
-
-
-def set_array(self, values):
-    self["somebool"] = values[0] and values[1]
-
-bpy.types.Scene.test_array = bpy.props.BoolVectorProperty(size=2, get=get_array, set=set_array)
-
-
-# Enum property.
-# Note: the getter/setter callback must use integer identifiers!
-test_items = [
-    ("RED", "Red", "", 1),
-    ("GREEN", "Red", "", 2),
-    ("BLUE", "Red", "", 3),
-    ("YELLOW", "Red", "", 4),
-    ]
-
-
-def get_enum(self):
-    import random
-    return random.randint(1, 4)
-
-
-def set_enum(self, value):
-    print("setting value", value)
-
-bpy.types.Scene.test_enum = bpy.props.EnumProperty(items=test_items, get=get_enum, set=set_enum)
-
-
-# Testing
-
-scene = bpy.context.scene
-
-scene.test_float = 12.34
-print(scene.test_float)
-
-scene.test_array = (True, False)
-print([x for x in scene.test_array])
-
-# scene.test_date = "blah"   # this would fail, property is read-only
-print(scene.test_date)
-
-scene.test_enum = 'BLUE'
-print(scene.test_enum)
-
-
-# >>> 12.34000015258789
-# >>> [True, False]
-# >>> 2013-01-05 16:33:52.135340
-# >>> setting value 3
-# >>> GREEN

doc/python_api/examples/bpy.types.AddonPreferences.1.py

@@ -1,72 +0,0 @@
-bl_info = {
-    "name": "Example Addon Preferences",
-    "author": "Your Name Here",
-    "version": (1, 0),
-    "blender": (2, 65, 0),
-    "location": "SpaceBar Search -> Addon Preferences Example",
-    "description": "Example Addon",
-    "warning": "",
-    "wiki_url": "",
-    "tracker_url": "",
-    "category": "Object"}
-
-
-import bpy
-from bpy.types import Operator, AddonPreferences
-from bpy.props import StringProperty, IntProperty, BoolProperty
-
-
-class ExampleAddonPreferences(AddonPreferences):
-    # this must match the addon name, use '__package__'
-    # when defining this in a submodule of a python package.
-    bl_idname = __name__
-
-    filepath = StringProperty(
-            name="Example File Path",
-            subtype='FILE_PATH',
-            )
-    number = IntProperty(
-            name="Example Number",
-            default=4,
-            )
-    boolean = BoolProperty(
-            name="Example Boolean",
-            default=False,
-            )
-
-    def draw(self, context):
-        layout = self.layout
-        layout.label(text="This is a preferences view for our addon")
-        layout.prop(self, "filepath")
-        layout.prop(self, "number")
-        layout.prop(self, "boolean")
-
-
-class OBJECT_OT_addon_prefs_example(Operator):
-    """Display example preferences"""
-    bl_idname = "object.addon_prefs_example"
-    bl_label = "Addon Preferences Example"
-    bl_options = {'REGISTER', 'UNDO'}
-
-    def execute(self, context):
-        user_preferences = context.user_preferences
-        addon_prefs = user_preferences.addons[__name__].preferences
-
-        info = ("Path: %s, Number: %d, Boolean %r" %
-                (addon_prefs.filepath, addon_prefs.number, addon_prefs.boolean))
-
-        self.report({'INFO'}, info)
-        print(info)
-
-        return {'FINISHED'}
-
-
-# Registration
-def register():
-    bpy.utils.register_class(OBJECT_OT_addon_prefs_example)
-    bpy.utils.register_class(ExampleAddonPreferences)
-
-
-def unregister():
-    bpy.utils.unregister_class(OBJECT_OT_addon_prefs_example)
-    bpy.utils.unregister_class(ExampleAddonPreferences)

doc/python_api/examples/bpy.types.NodeTree.py

@@ -1,23 +0,0 @@
-"""
-Poll Function
-+++++++++++++++
-The :class:`NodeTree.poll` function determines if a node tree is visible
-in the given context (similar to how :class:`Panel.poll`
-and :class:`Menu.poll` define visibility). If it returns False,
-the node tree type will not be selectable in the node editor.
-
-A typical condition for shader nodes would be to check the active render engine
-of the scene and only show nodes of the renderer they are designed for.
-"""
-import bpy
-
-
-class CyclesNodeTree(bpy.types.NodeTree):
-    """ This operator is only visible when Cycles is the selected render engine"""
-    bl_label = "Cycles Node Tree"
-
-    @classmethod
-    def poll(cls, context):
-        return context.scene.render.engine == 'CYCLES'
-
-bpy.utils.register_class(CyclesNodeTree)

doc/python_api/examples/bpy.types.Operator.4.py

@@ -26,8 +26,8 @@ class CustomDrawOperator(bpy.types.Operator):
         return {'FINISHED'}
 
     def invoke(self, context, event):
-        wm = context.window_manager
-        return wm.invoke_props_dialog(self)
+        context.window_manager.fileselect_add(self)
+        return {'RUNNING_MODAL'}
 
     def draw(self, context):
         layout = self.layout

doc/python_api/examples/bpy.types.Operator.5.py

@@ -39,18 +39,16 @@ class ModalOperator(bpy.types.Operator):
             self.execute(context)
         elif event.type == 'LEFTMOUSE':  # Confirm
             return {'FINISHED'}
-        elif event.type in {'RIGHTMOUSE', 'ESC'}:  # Cancel
-            context.object.location.x = self.init_loc_x
+        elif event.type in ('RIGHTMOUSE', 'ESC'):  # Cancel
             return {'CANCELLED'}
 
         return {'RUNNING_MODAL'}
 
     def invoke(self, context, event):
-        self.init_loc_x = context.object.location.x
         self.value = event.mouse_x
         self.execute(context)
 
-        context.window_manager.modal_handler_add(self)
+        print(context.window_manager.modal_handler_add(self))
         return {'RUNNING_MODAL'}
 
 

doc/python_api/examples/bpy.types.UIList.1.py

@@ -1,97 +0,0 @@
-"""
-Basic UIList Example
-++++++++++++++++++++
-
-This script is the UIList subclass used to show material slots, with a bunch of additional commentaries.
-
-Notice the name of the class, this naming convention is similar as the one for panels or menus.
-
-.. note::
-
-   UIList subclasses must be registered for blender to use them.
-"""
-import bpy
-
-
-class MATERIAL_UL_matslots_example(bpy.types.UIList):
-    # The draw_item function is called for each item of the collection that is visible in the list.
-    #   data is the RNA object containing the collection,
-    #   item is the current drawn item of the collection,
-    #   icon is the "computed" icon for the item (as an integer, because some objects like materials or textures
-    #   have custom icons ID, which are not available as enum items).
-    #   active_data is the RNA object containing the active property for the collection (i.e. integer pointing to the
-    #   active item of the collection).
-    #   active_propname is the name of the active property (use 'getattr(active_data, active_propname)').
-    #   index is index of the current item in the collection.
-    #   flt_flag is the result of the filtering process for this item.
-    #   Note: as index and flt_flag are optional arguments, you do not have to use/declare them here if you don't
-    #         need them.
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        ob = data
-        slot = item
-        ma = slot.material
-        # draw_item must handle the three layout types... Usually 'DEFAULT' and 'COMPACT' can share the same code.
-        if self.layout_type in {'DEFAULT', 'COMPACT'}:
-            # You should always start your row layout by a label (icon + text), or a non-embossed text field,
-            # this will also make the row easily selectable in the list! The later also enables ctrl-click rename.
-            # We use icon_value of label, as our given icon is an integer value, not an enum ID.
-            # Note "data" names should never be translated!
-            if ma:
-                layout.prop(ma, "name", text="", emboss=False, icon_value=icon)
-            else:
-                layout.label(text="", translate=False, icon_value=icon)
-            # And now we can add other UI stuff...
-            # Here, we add nodes info if this material uses (old!) shading nodes.
-            if ma and not context.scene.render.use_shading_nodes:
-                manode = ma.active_node_material
-                if manode:
-                    # The static method UILayout.icon returns the integer value of the icon ID "computed" for the given
-                    # RNA object.
-                    layout.label(text="Node %s" % manode.name, translate=False, icon_value=layout.icon(manode))
-                elif ma.use_nodes:
-                    layout.label(text="Node <none>", translate=False)
-                else:
-                    layout.label(text="")
-        # 'GRID' layout type should be as compact as possible (typically a single icon!).
-        elif self.layout_type in {'GRID'}:
-            layout.alignment = 'CENTER'
-            layout.label(text="", icon_value=icon)
-
-
-# And now we can use this list everywhere in Blender. Here is a small example panel.
-class UIListPanelExample(bpy.types.Panel):
-    """Creates a Panel in the Object properties window"""
-    bl_label = "UIList Panel"
-    bl_idname = "OBJECT_PT_ui_list_example"
-    bl_space_type = 'PROPERTIES'
-    bl_region_type = 'WINDOW'
-    bl_context = "object"
-
-    def draw(self, context):
-        layout = self.layout
-
-        obj = context.object
-
-        # template_list now takes two new args.
-        # The first one is the identifier of the registered UIList to use (if you want only the default list,
-        # with no custom draw code, use "UI_UL_list").
-        layout.template_list("MATERIAL_UL_matslots_example", "", obj, "material_slots", obj, "active_material_index")
-
-        # The second one can usually be left as an empty string.
-        # It's an additional ID used to distinguish lists in case you use the same list several times in a given area.
-        layout.template_list("MATERIAL_UL_matslots_example", "compact", obj, "material_slots",
-                             obj, "active_material_index", type='COMPACT')
-
-
-def register():
-    bpy.utils.register_class(MATERIAL_UL_matslots_example)
-    bpy.utils.register_class(UIListPanelExample)
-
-
-def unregister():
-    bpy.utils.unregister_class(MATERIAL_UL_matslots_example)
-    bpy.utils.unregister_class(UIListPanelExample)
-
-
-if __name__ == "__main__":
-    register()

doc/python_api/examples/bpy.types.UIList.2.py

@@ -1,160 +0,0 @@
-"""
-Advanced UIList Example - Filtering and Reordering
-++++++++++++++++++++++++++++++++++++++++++++++++++
-This script is an extended version of the UIList subclass used to show vertex groups. It is not used 'as is',
-because iterating over all vertices in a 'draw' function is a very bad idea for UI performances! However, it's a good
-example of how to create/use filtering/reordering callbacks.
-"""
-import bpy
-
-
-class MESH_UL_vgroups_slow(bpy.types.UIList):
-    # Constants (flags)
-    # Be careful not to shadow FILTER_ITEM!
-    VGROUP_EMPTY = 1 << 0
-
-    # Custom properties, saved with .blend file.
-    use_filter_empty = bpy.props.BoolProperty(name="Filter Empty", default=False, options=set(),
-                                              description="Whether to filter empty vertex groups")
-    use_filter_empty_reverse = bpy.props.BoolProperty(name="Reverse Empty", default=False, options=set(),
-                                                      description="Reverse empty filtering")
-    use_filter_name_reverse = bpy.props.BoolProperty(name="Reverse Name", default=False, options=set(),
-                                                     description="Reverse name filtering")
-
-    # This allows us to have mutually exclusive options, which are also all disable-able!
-    def _gen_order_update(name1, name2):
-        def _u(self, ctxt):
-            if (getattr(self, name1)):
-                setattr(self, name2, False)
-        return _u
-    use_order_name = bpy.props.BoolProperty(name="Name", default=False, options=set(),
-                                            description="Sort groups by their name (case-insensitive)",
-                                            update=_gen_order_update("use_order_name", "use_order_importance"))
-    use_order_importance = bpy.props.BoolProperty(name="Importance", default=False, options=set(),
-                                                  description="Sort groups by their average weight in the mesh",
-                                                  update=_gen_order_update("use_order_importance", "use_order_name"))
-
-    # Usual draw item function.
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index, flt_flag):
-        # Just in case, we do not use it here!
-        self.use_filter_invert = False
-
-        # assert(isinstance(item, bpy.types.VertexGroup)
-        vgroup = item
-        if self.layout_type in {'DEFAULT', 'COMPACT'}:
-            # Here we use one feature of new filtering feature: it can pass data to draw_item, through flt_flag
-            # parameter, which contains exactly what filter_items set in its filter list for this item!
-            # In this case, we show empty groups grayed out.
-            if flt_flag & self.VGROUP_EMPTY:
-                col = layout.column()
-                col.enabled = False
-                col.alignment = 'LEFT'
-                col.prop(vgroup, "name", text="", emboss=False, icon_value=icon)
-            else:
-                layout.prop(vgroup, "name", text="", emboss=False, icon_value=icon)
-            icon = 'LOCKED' if vgroup.lock_weight else 'UNLOCKED'
-            layout.prop(vgroup, "lock_weight", text="", icon=icon, emboss=False)
-        elif self.layout_type in {'GRID'}:
-            layout.alignment = 'CENTER'
-            if flt_flag & self.VGROUP_EMPTY:
-                layout.enabled = False
-            layout.label(text="", icon_value=icon)
-
-    def draw_filter(self, context, layout):
-        # Nothing much to say here, it's usual UI code...
-        row = layout.row()
-
-        subrow = row.row(align=True)
-        subrow.prop(self, "filter_name", text="")
-        icon = 'ZOOM_OUT' if self.use_filter_name_reverse else 'ZOOM_IN'
-        subrow.prop(self, "use_filter_name_reverse", text="", icon=icon)
-
-        subrow = row.row(align=True)
-        subrow.prop(self, "use_filter_empty", toggle=True)
-        icon = 'ZOOM_OUT' if self.use_filter_empty_reverse else 'ZOOM_IN'
-        subrow.prop(self, "use_filter_empty_reverse", text="", icon=icon)
-
-        row = layout.row(align=True)
-        row.label("Order by:")
-        row.prop(self, "use_order_name", toggle=True)
-        row.prop(self, "use_order_importance", toggle=True)
-        icon = 'TRIA_UP' if self.use_filter_orderby_invert else 'TRIA_DOWN'
-        row.prop(self, "use_filter_orderby_invert", text="", icon=icon)
-
-    def filter_items_empty_vgroups(self, context, vgroups):
-        # This helper function checks vgroups to find out whether they are empty, and what's their average weights.
-        # TODO: This should be RNA helper actually (a vgroup prop like "raw_data: ((vidx, vweight), etc.)").
-        #       Too slow for python!
-        obj_data = context.active_object.data
-        ret = {vg.index: [True, 0.0] for vg in vgroups}
-        if hasattr(obj_data, "vertices"):  # Mesh data
-            if obj_data.is_editmode:
-                import bmesh
-                bm = bmesh.from_edit_mesh(obj_data)
-                # only ever one deform weight layer
-                dvert_lay = bm.verts.layers.deform.active
-                fact = 1 / len(bm.verts)
-                if dvert_lay:
-                    for v in bm.verts:
-                        for vg_idx, vg_weight in v[dvert_lay].items():
-                            ret[vg_idx][0] = False
-                            ret[vg_idx][1] += vg_weight * fact
-            else:
-                fact = 1 / len(obj_data.vertices)
-                for v in obj_data.vertices:
-                    for vg in v.groups:
-                        ret[vg.group][0] = False
-                        ret[vg.group][1] += vg.weight * fact
-        elif hasattr(obj_data, "points"):  # Lattice data
-            # XXX no access to lattice editdata?
-            fact = 1 / len(obj_data.points)
-            for v in obj_data.points:
-                for vg in v.groups:
-                    ret[vg.group][0] = False
-                    ret[vg.group][1] += vg.weight * fact
-        return ret
-
-    def filter_items(self, context, data, propname):
-        # This function gets the collection property (as the usual tuple (data, propname)), and must return two lists:
-        # * The first one is for filtering, it must contain 32bit integers were self.bitflag_filter_item marks the
-        #   matching item as filtered (i.e. to be shown), and 31 other bits are free for custom needs. Here we use the
-        #   first one to mark VGROUP_EMPTY.
-        # * The second one is for reordering, it must return a list containing the new indices of the items (which
-        #   gives us a mapping org_idx -> new_idx).
-        # Please note that the default UI_UL_list defines helper functions for common tasks (see its doc for more info).
-        # If you do not make filtering and/or ordering, return empty list(s) (this will be more efficient than
-        # returning full lists doing nothing!).
-        vgroups = getattr(data, propname)
-        helper_funcs = bpy.types.UI_UL_list
-
-        # Default return values.
-        flt_flags = []
-        flt_neworder = []
-
-        # Pre-compute of vgroups data, CPU-intensive. :/
-        vgroups_empty = self.filter_items_empty_vgroups(context, vgroups)
-
-        # Filtering by name
-        if self.filter_name:
-            flt_flags = helper_funcs.filter_items_by_name(self.filter_name, self.bitflag_filter_item, vgroups, "name",
-                                                          reverse=self.use_filter_name_reverse)
-        if not flt_flags:
-            flt_flags = [self.bitflag_filter_item] * len(vgroups)
-
-        # Filter by emptiness.
-        for idx, vg in enumerate(vgroups):
-            if vgroups_empty[vg.index][0]:
-                flt_flags[idx] |= self.VGROUP_EMPTY
-                if self.use_filter_empty and self.use_filter_empty_reverse:
-                    flt_flags[idx] &= ~self.bitflag_filter_item
-            elif self.use_filter_empty and not self.use_filter_empty_reverse:
-                flt_flags[idx] &= ~self.bitflag_filter_item
-
-        # Reorder by name or average weight.
-        if self.use_order_name:
-            flt_neworder = helper_funcs.sort_items_by_name(vgroups, "name")
-        elif self.use_order_importance:
-            _sort = [(idx, vgroups_empty[vg.index][1]) for idx, vg in enumerate(vgroups)]
-            flt_neworder = helper_funcs.sort_items_helper(_sort, lambda e: e[1], True)
-
-        return flt_flags, flt_neworder

doc/python_api/examples/bpy.types.WindowManager.popup_menu.py

@@ -1,13 +0,0 @@
-"""
-Popup menus can be useful for creating menus without having to register menu classes.
-
-Note that they will not block the scripts execution, so the caller can't wait for user input.
-"""
-
-import bpy
-
-
-def draw(self, context):
-    self.layout.label("Hello World")
-
-bpy.context.window_manager.popup_menu(draw, title="Greeting", icon='INFO')

doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py

@@ -1,10 +0,0 @@
-"""
-Only works for 'basic type' properties (bool, int and float)!
-Multi-dimensional arrays (like array of vectors) will be flattened into seq.
-"""
-
-collection.foreach_get(attr, some_seq)
-
-# Python equivalent
-for i in range(len(seq)):
-    some_seq[i] = getattr(collection[i], attr)

doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_set.py

@@ -1,10 +0,0 @@
-"""
-Only works for 'basic type' properties (bool, int and float)!
-seq must be uni-dimensional, multi-dimensional arrays (like array of vectors) will be re-created from it.
-"""
-
-collection.foreach_set(attr, some_seq)
-
-# Python equivalent
-for i in range(len(some_seq)):
-    setattr(collection[i], attr, some_seq[i])

doc/python_api/examples/mathutils.Euler.py

@@ -5,7 +5,7 @@ import math
 eul = mathutils.Euler((0.0, math.radians(45.0), 0.0), 'XYZ')
 
 # rotate the euler
-eul.rotate_axis('Z', math.radians(10.0))
+eul.rotate_axis(math.radians(10.0), 'Z')
 
 # you can access its components by attribute or index
 print("Euler X", eul.x)