TileBranch

* clean up commit

.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,35 +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
-/BUILD_NOTES.txt
-
-# 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,12 +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

GNUmakefile

@@ -19,9 +19,9 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU`
+# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
 # eg:
-#   ../build_linux_i386
+#   ../build/Linux_i386
 # This is for users who like to configure & build blender with a single command.
 
 
@@ -40,12 +40,7 @@ ifndef BUILD_CMAKE_ARGS
 endif
 
 ifndef BUILD_DIR
-	BUILD_DIR:=$(shell dirname "$(BLENDER_DIR)")/build_$(OS_NCASE)
-endif
-
-# Allow to use alternative binary (pypy3, etc)
-ifndef PYTHON
-	PYTHON:=python3
+	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
 endif
 
 
@@ -57,44 +52,34 @@ 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)_headless
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake"
+	BUILD_DIR:=$(BUILD_DIR)_bpy
+	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
 
 
 # -----------------------------------------------------------------------------
 # Get the number of cores for threaded build
-ifndef NPROCS
-	NPROCS:=1
-	ifeq ($(OS), Linux)
-		NPROCS:=$(shell nproc)
-	endif
-	ifeq ($(OS), Darwin)
-		NPROCS:=$(shell sysctl -n hw.ncpu)
-	endif
-	ifeq ($(OS), FreeBSD)
-		NPROCS:=$(shell sysctl -n hw.ncpu)
-	endif
-	ifeq ($(OS), NetBSD)
-		NPROCS:=$(shell sysctl -n hw.ncpu)
-	endif
+NPROCS:=1
+ifeq ($(OS), Linux)
+	NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
+endif
+ifeq ($(OS), Darwin)
+	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)
+endif
+ifeq ($(OS), FreeBSD)
+	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
+endif
+ifeq ($(OS), NetBSD)
+	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
 endif
 
 
@@ -102,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)
 
 
@@ -120,49 +105,42 @@ endif
 
 # -----------------------------------------------------------------------------
 # Build Blender
-all: FORCE
+all:
 	@echo
-	@echo Configuring Blender in \"$(BUILD_DIR)\" ...
+	@echo Configuring Blender ...
 
-#	# if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-#	# 	$(CMAKE_CONFIG); \
-#	# fi
-	
-#	# do this always incase of failed initial build, could be smarter here...
-	@$(CMAKE_CONFIG)
+	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
+		$(CMAKE_CONFIG); \
+	fi
 
 	@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 successfully built, run from: "$(BUILD_DIR)/bin/blender"
+	@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
 	@echo
 
 debug: all
-full: all
 lite: all
-cycles: all
 headless: all
 bpy: all
 
 
 # -----------------------------------------------------------------------------
 # Configuration (save some cd'ing around)
-config: FORCE
-	$(CMAKE_CONFIG_TOOL) "$(BUILD_DIR)"
+config:
+	$(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
 
 
 # -----------------------------------------------------------------------------
 # Help for build targets
-help: FORCE
+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"
@@ -178,225 +156,91 @@ help: FORCE
 	@echo ""
 	@echo "Package Targets"
 	@echo "  * package_debian  - build a debian package"
-	@echo "  * package_pacman  - build an arch linux pacman package"
+	@echo "  * package_pacman  - build an arch linux pacmanpackage"
 	@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 "Testing Targets (not assosiated 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 ""
-	@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 "Static Source Code Checking (not assosiated with building blender)"
+	@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 ""
-	@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 ""
-	@echo "Environment Variables"
-	@echo "  * BUILD_CMAKE_ARGS    - arguments passed to CMake."
-	@echo "  * BUILD_DIR           - override default build path."
-	@echo "  * PYTHON              - use this for the Python command (used for checking tools)."
-	@echo "  * NPROCS              - number of processes to use building (auto-detect when omitted)."
-	@echo ""
-	@echo "Documentation Targets (not associated with building blender)"
+	@echo "Documentation Targets (not assosiated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
 	@echo "  * doc_doxy - generate doxygen C/C++ docs"
 	@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"
-	@echo ""
 
 # -----------------------------------------------------------------------------
 # Packages
 #
-package_debian: FORCE
+package_debian:
 	cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
 
-package_pacman: FORCE
-	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg
+package_pacman:
+	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
-package_archive: FORCE
-	make -C "$(BUILD_DIR)" -s package_archive
+package_archive:
+	make -C $(BUILD_DIR) -s package_archive
 	@echo archive in "$(BUILD_DIR)/release"
 
 
 # -----------------------------------------------------------------------------
 # Tests
 #
-test: FORCE
+test:
 	cd $(BUILD_DIR) ; ctest . --output-on-failure
 
 # run pep8 check check on scripts we distribute.
-test_pep8: FORCE
-	$(PYTHON) tests/python/pep8.py > test_pep8.log 2>&1
+test_pep8:
+	python3 source/tests/pep8.py > test_pep8.log 2>&1
 	@echo "written: test_pep8.log"
 
 # run some checks on our cmakefiles.
-test_cmake: FORCE
-	$(PYTHON) build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+test_cmake:
+	python3 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: FORCE
-	$(PYTHON) tests/check_deprecated.py
+test_deprecated:
+	python3 source/tests/check_deprecated.py
 
-test_style_c: FORCE
-	# run our own checks on C/C++ style
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(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: FORCE
-	# run our own checks on C/C++ style
-	USE_QTC_TASK=1 \
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(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: FORCE
-	# run our own checks on C/C++ style
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(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: FORCE
-	# run our own checks on C/C++ style
-	USE_QTC_TASK=1 \
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(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"
 
 # -----------------------------------------------------------------------------
 # Project Files
 #
 
-project_qtcreator: FORCE
-	$(PYTHON) build_files/cmake/cmake_qtcreator_project.py "$(BUILD_DIR)"
+project_qtcreator:
+	python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
 
-project_netbeans: FORCE
-	$(PYTHON) build_files/cmake/cmake_netbeans_project.py "$(BUILD_DIR)"
+project_netbeans:
+	python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
 
-project_eclipse: FORCE
-	cmake -G"Eclipse CDT4 - Unix Makefiles" -H"$(BLENDER_DIR)" -B"$(BUILD_DIR)"
+project_eclipse:
+	cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
 
 
 # -----------------------------------------------------------------------------
 # Static Checking
 #
 
-check_cppcheck: FORCE
+check_cppcheck:
 	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
-	    "$(BLENDER_DIR)/check_cppcheck.txt"
-	@echo "written: check_cppcheck.txt"
+	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
 
-check_clang_array: FORCE
+check_splint:
 	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py"
+	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
 
-check_splint: FORCE
+check_sparse:
 	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py"
-
-check_sparse: FORCE
-	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py"
-
-check_smatch: FORCE
-	$(CMAKE_CONFIG)
-	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py"
-
-check_spelling_py: FORCE
-	cd "$(BUILD_DIR)" ; \
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    "$(BLENDER_DIR)/release/scripts"
-
-check_spelling_c: FORCE
-	cd "$(BUILD_DIR)" ; \
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(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: FORCE
-	cd "$(BUILD_DIR)" ; USE_QTC_TASK=1 \
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(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: FORCE
-	cd "$(BUILD_DIR)" ;\
-	PYTHONIOENCODING=utf_8 $(PYTHON) \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" \
-	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders"
-
-check_descriptions: FORCE
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python \
-	    "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"
-
-# -----------------------------------------------------------------------------
-# Utilities
-#
-
-tgz: FORCE
-	./build_files/utils/build_tgz.sh
-
-icons: FORCE
-	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-
-update: FORCE
-	if [ -d "../lib" ]; then \
-		svn update ../lib/* ; \
-	fi
-	git pull --rebase
-	git submodule foreach git pull --rebase origin master
+	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
 
 
 # -----------------------------------------------------------------------------
@@ -404,36 +248,24 @@ update: FORCE
 #
 
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
-doc_py: FORCE
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
+doc_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'"
 
-doc_doxy: FORCE
-	cd doc/doxygen; doxygen Doxyfile
+doc_doxy:
+	cd doc/doxygen; doxygen 
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
-doc_dna: FORCE
-	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
+doc_dna:
+	$(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: FORCE
-	$(PYTHON) doc/manpage/blender.1.py "$(BUILD_DIR)/bin/blender"
-
-help_features: FORCE
-	@$(PYTHON) -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
+doc_man:
+	python3 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
 
 
-clean: FORCE
-	$(MAKE) -C "$(BUILD_DIR)" clean
+clean:
+	$(MAKE) -C $(BUILD_DIR) clean
 
 .PHONY: all
-
-FORCE:

SConstruct

@@ -0,0 +1,816 @@
+#!/usr/bin/env python
+#
+# ***** 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Nathan Letwory.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+# Main entry-point for the SCons building system
+# Set up some custom actions and target/argument handling
+# Then read all SConscripts and build
+#
+# TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
+# TODO: directory copy functions are far too complicated, see:
+#       http://wiki.blender.org/index.php/User:Ideasman42/SConsNotSimpleInstallingFiles
+
+import platform as pltfrm
+
+# Need a better way to do this. Automagical maybe is not the best thing, maybe it is.
+if pltfrm.architecture()[0] == '64bit':
+    bitness = 64
+else:
+    bitness = 32
+
+import sys
+import os
+import os.path
+import string
+import shutil
+import glob
+import re
+from tempfile import mkdtemp
+
+# store path to tools
+toolpath=os.path.join(".", "build_files", "scons", "tools")
+
+# needed for importing tools
+sys.path.append(toolpath)
+
+import Blender
+import btools
+import bcolors
+
+EnsureSConsVersion(1,0,0)
+
+# Before we do anything, let's check if we have a sane os.environ
+if not btools.check_environ():
+    Exit()
+
+BlenderEnvironment = Blender.BlenderEnvironment
+B = Blender
+
+VERSION = btools.VERSION # This is used in creating the local config directories
+VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
+
+### globals ###
+platform = sys.platform
+quickie = None
+quickdebug = None
+
+##### BEGIN SETUP #####
+
+B.possible_types = ['core', 'player', 'player2', 'intern', 'extern']
+
+B.binarykind = ['blender' , 'blenderplayer']
+##################################
+# target and argument validation #
+##################################
+# XX cheating for BF_FANCY, we check for BF_FANCY before args are validated
+use_color = ARGUMENTS.get('BF_FANCY', '1')
+if platform=='win32':
+    use_color = None
+
+if not use_color=='1':
+    B.bc.disable()
+    
+ #on defaut white Os X terminal, some colors are totally unlegible
+if platform=='darwin':
+    B.bc.OKGREEN = '\033[34m'
+    B.bc.WARNING = '\033[36m'
+
+# arguments
+print B.bc.HEADER+'Command-line arguments'+B.bc.ENDC
+B.arguments = btools.validate_arguments(ARGUMENTS, B.bc)
+btools.print_arguments(B.arguments, B.bc)
+
+# targets
+print B.bc.HEADER+'Command-line targets'+B.bc.ENDC
+B.targets = btools.validate_targets(COMMAND_LINE_TARGETS, B.bc)
+btools.print_targets(B.targets, B.bc)
+
+##########################
+# setting up environment #
+##########################
+
+# handling cmd line arguments & config file
+
+# bitness stuff
+tempbitness = int(B.arguments.get('BF_BITNESS', bitness)) # default to bitness found as per starting python
+if tempbitness in (32, 64): # only set if 32 or 64 has been given
+    bitness = int(tempbitness)
+
+if bitness:
+    B.bitness = bitness
+else: 
+    B.bitness = tempbitness
+    
+
+# first check cmdline for toolset and we create env to work on
+quickie = B.arguments.get('BF_QUICK', None)
+quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
+
+if quickdebug:
+    B.quickdebug=string.split(quickdebug, ',')
+else:
+    B.quickdebug=[]
+
+if quickie:
+    B.quickie=string.split(quickie,',')
+else:
+    B.quickie=[]
+    
+toolset = B.arguments.get('BF_TOOLSET', None)
+if toolset:
+    print "Using " + toolset
+    if toolset=='mstoolkit':
+        env = BlenderEnvironment(ENV = os.environ)
+        env.Tool('mstoolkit', [toolpath])
+    else:
+        env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+        if env:
+            btools.SetupSpawn(env)
+else:
+    if bitness==64 and platform=='win32':
+        env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+    else:
+        env = BlenderEnvironment(ENV = os.environ)
+
+if not env:
+    print "Could not create a build environment"
+    Exit()
+
+cc = B.arguments.get('CC', None)
+cxx = B.arguments.get('CXX', None)
+if cc:
+    env['CC'] = cc
+if cxx:
+    env['CXX'] = cxx
+
+if sys.platform=='win32':
+    if env['CC'] in ['cl', 'cl.exe']:
+        platform = 'win64-vc' if bitness == 64 else 'win32-vc'
+    elif env['CC'] in ['gcc']:
+        platform = 'win32-mingw'
+
+env.SConscriptChdir(0)
+
+# Remove major kernel version from linux platform.
+# After Linus switched kernel to new version model this major version
+# shouldn't take much sense for building rules.
+
+if re.match('linux[0-9]+', platform):
+    platform = 'linux'
+
+crossbuild = B.arguments.get('BF_CROSS', None)
+if crossbuild and platform not in ('win32-vc', 'win64-vc'):
+    platform = 'linuxcross'
+
+env['OURPLATFORM'] = platform
+
+configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
+
+if os.path.exists(configfile):
+    print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
+else:
+    print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
+
+if crossbuild and env['PLATFORM'] != 'win32':
+    print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
+    env.Tool('crossmingw', [toolpath])
+    # todo: determine proper libs/includes etc.
+    # Needed for gui programs, console programs should do without it
+
+    # Now we don't need this option to have console window
+    # env.Append(LINKFLAGS=['-mwindows'])
+
+userconfig = B.arguments.get('BF_CONFIG', 'user-config.py')
+# first read platform config. B.arguments will override
+optfiles = [configfile]
+if os.path.exists(userconfig):
+    print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
+    optfiles += [userconfig]
+else:
+    print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
+
+opts = btools.read_opts(env, optfiles, B.arguments)
+opts.Update(env)
+
+if sys.platform=='win32':
+    if bitness==64:
+        env.Append(CPPFLAGS=['-DWIN64']) # -DWIN32 needed too, as it's used all over to target Windows generally
+
+if not env['BF_FANCY']:
+    B.bc.disable()
+
+
+# remove install dir so old and new files are not mixed.
+# NOTE: only do the scripts directory for now, otherwise is too disruptive for developers
+# TODO: perhaps we need an option (off by default) to not do this altogether...
+if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']:
+    scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
+    if os.path.isdir(scriptsDir):
+        print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
+        shutil.rmtree(scriptsDir)
+
+
+SetOption('num_jobs', int(env['BF_NUMJOBS']))
+print B.bc.OKGREEN + "Build with parallel jobs%s: %s" % (B.bc.ENDC, GetOption('num_jobs'))
+print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG'])
+
+if 'blenderlite' in B.targets:
+    target_env_defs = {}
+    target_env_defs['WITH_BF_GAMEENGINE'] = False
+    target_env_defs['WITH_BF_OPENAL'] = False
+    target_env_defs['WITH_BF_OPENEXR'] = False
+    target_env_defs['WITH_BF_OPENMP'] = False
+    target_env_defs['WITH_BF_ICONV'] = False
+    target_env_defs['WITH_BF_INTERNATIONAL'] = False
+    target_env_defs['WITH_BF_OPENJPEG'] = False
+    target_env_defs['WITH_BF_FFMPEG'] = False
+    target_env_defs['WITH_BF_QUICKTIME'] = False
+    target_env_defs['WITH_BF_REDCODE'] = False
+    target_env_defs['WITH_BF_DDS'] = False
+    target_env_defs['WITH_BF_CINEON'] = False
+    target_env_defs['WITH_BF_HDR'] = False
+    target_env_defs['WITH_BF_ZLIB'] = False
+    target_env_defs['WITH_BF_SDL'] = False
+    target_env_defs['WITH_BF_JPEG'] = False
+    target_env_defs['WITH_BF_PNG'] = False
+    target_env_defs['WITH_BF_BULLET'] = False
+    target_env_defs['WITH_BF_BINRELOC'] = False
+    target_env_defs['BF_BUILDINFO'] = False
+    target_env_defs['WITH_BF_FLUID'] = False
+    target_env_defs['WITH_BF_OCEANSIM'] = False
+    target_env_defs['WITH_BF_DECIMATE'] = False
+    target_env_defs['WITH_BF_BOOLEAN'] = False
+    target_env_defs['WITH_BF_REMESH'] = False
+    target_env_defs['WITH_BF_PYTHON'] = False
+    target_env_defs['WITH_BF_3DMOUSE'] = False
+    
+    # Merge blenderlite, let command line to override
+    for k,v in target_env_defs.iteritems():
+        if k not in B.arguments:
+            env[k] = v
+
+# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
+if env['OURPLATFORM']=='darwin':
+    print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --"
+    print "Available " + env['MACOSX_SDK_CHECK']
+    if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
+        print  B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk"
+    else:
+        print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
+
+    # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
+    # necessary header file lives here when installed:
+    # /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
+    if env['WITH_BF_3DMOUSE'] == 1:
+        if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
+            print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
+            env['WITH_BF_3DMOUSE'] = 0
+        else:
+            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+
+    # for now, Mac builders must download and install the JackOSX framework 
+    # necessary header file lives here when installed:
+    # /Library/Frameworks/Jackmp.framework/Versions/A/Headers/jack.h
+    if env['WITH_BF_JACK'] == 1:
+        if not os.path.exists('/Library/Frameworks/Jackmp.framework'):
+            print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
+            env['WITH_BF_JACK'] = 0
+        else:
+            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+
+if env['WITH_BF_OPENMP'] == 1:
+        if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+                env['CCFLAGS'].append('/openmp')
+        else:
+            if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
+                env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+                env['CCFLAGS'].append('-openmp')
+            else:
+                env.Append(CCFLAGS=['-fopenmp']) 
+
+if env['WITH_GHOST_COCOA'] == True:
+    env.Append(CPPFLAGS=['-DGHOST_COCOA']) 
+    
+if env['USE_QTKIT'] == True:
+    env.Append(CPPFLAGS=['-DUSE_QTKIT'])
+
+#check for additional debug libnames
+
+if env.has_key('BF_DEBUG_LIBS'):
+    B.quickdebug += env['BF_DEBUG_LIBS']
+
+printdebug = B.arguments.get('BF_LISTDEBUG', 0)
+
+if len(B.quickdebug) > 0 and printdebug != 0:
+    print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
+    for l in B.quickdebug:
+        print "\t" + l
+
+# remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS
+if env['WITH_BF_STATICCXX']:
+    if 'stdc++' in env['LLIBS']:
+        env['LLIBS'].remove('stdc++')
+    else:
+        print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform'
+
+# check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline
+if 'blenderplayer' in B.targets:
+    env['WITH_BF_PLAYER'] = True
+
+if 'blendernogame' in B.targets:
+    env['WITH_BF_GAMEENGINE'] = False
+
+# build without elbeem (fluidsim)?
+if env['WITH_BF_FLUID'] == 1:
+    env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
+
+# build with ocean sim?
+if env['WITH_BF_OCEANSIM'] == 1:
+    env['WITH_BF_FFTW3']  = 1  # ocean needs fftw3 so enable it 
+    env['CPPFLAGS'].append('-DWITH_MOD_OCEANSIM')
+
+
+if btools.ENDIAN == "big":
+    env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
+else:
+    env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
+
+# TODO, make optional
+env['CPPFLAGS'].append('-DWITH_AUDASPACE')
+
+# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
+B.root_build_dir = env['BF_BUILDDIR']
+B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
+if not B.root_build_dir[-1]==os.sep:
+    B.root_build_dir += os.sep
+if not B.doc_build_dir[-1]==os.sep:
+    B.doc_build_dir += os.sep
+    
+# We do a shortcut for clean when no quicklist is given: just delete
+# builddir without reading in SConscripts
+do_clean = None
+if 'clean' in B.targets:
+    do_clean = True
+
+if not quickie and do_clean:
+    if os.path.exists(B.doc_build_dir):
+        print B.bc.HEADER+'Cleaning doc dir...'+B.bc.ENDC
+        dirs = os.listdir(B.doc_build_dir)
+        for entry in dirs:
+            if os.path.isdir(B.doc_build_dir + entry) == 1:
+                print "clean dir %s"%(B.doc_build_dir+entry)
+                shutil.rmtree(B.doc_build_dir+entry)
+            else: # remove file
+                print "remove file %s"%(B.doc_build_dir+entry)
+                os.remove(B.root_build_dir+entry)
+    if os.path.exists(B.root_build_dir):
+        print B.bc.HEADER+'Cleaning build dir...'+B.bc.ENDC
+        dirs = os.listdir(B.root_build_dir)
+        for entry in dirs:
+            if os.path.isdir(B.root_build_dir + entry) == 1:
+                print "clean dir %s"%(B.root_build_dir+entry)
+                shutil.rmtree(B.root_build_dir+entry)
+            else: # remove file
+                print "remove file %s"%(B.root_build_dir+entry)
+                os.remove(B.root_build_dir+entry)
+        for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
+                'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']:
+            if os.path.exists(confile):
+                print "clean file %s"%confile
+                if os.path.isdir(confile):
+                    for root, dirs, files in os.walk(confile):
+                        for name in files:
+                            os.remove(os.path.join(root, name))
+                else:
+                    os.remove(confile)
+        print B.bc.OKGREEN+'...done'+B.bc.ENDC
+    else:
+        print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
+    Exit()
+
+
+# ensure python header is found since detection can fail, this could happen
+# with _any_ library but since we used a fixed python version this tends to
+# be most problematic.
+if env['WITH_BF_PYTHON']:
+	py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h")
+
+	if not os.path.exists(py_h):
+		print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n"
+			  "  Set 'BF_PYTHON_INC' to point "
+			  "to a valid python include path.\n  Containing "
+			  "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
+
+		Exit()
+	del py_h
+
+
+if not os.path.isdir ( B.root_build_dir):
+    os.makedirs ( B.root_build_dir )
+    os.makedirs ( B.root_build_dir + 'source' )
+    os.makedirs ( B.root_build_dir + 'intern' )
+    os.makedirs ( B.root_build_dir + 'extern' )
+    os.makedirs ( B.root_build_dir + 'lib' )
+    os.makedirs ( B.root_build_dir + 'bin' )
+# # Docs not working with epy anymore
+# if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
+#     os.makedirs ( B.doc_build_dir )
+
+Help(opts.GenerateHelpText(env))
+
+# default is new quieter output, but if you need to see the 
+# commands, do 'scons BF_QUIET=0'
+bf_quietoutput = B.arguments.get('BF_QUIET', '1')
+if env['BF_QUIET']:
+    B.set_quiet_output(env)
+else:
+    if toolset=='msvc':
+        B.msvc_hack(env)
+
+print B.bc.HEADER+'Building in: ' + B.bc.ENDC + os.path.abspath(B.root_build_dir)
+env.SConsignFile(B.root_build_dir+'scons-signatures')
+B.init_lib_dict()
+
+##### END SETUP ##########
+
+Export('env')
+
+BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
+SConscript(B.root_build_dir+'/source/SConscript')
+BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0)
+SConscript(B.root_build_dir+'/intern/SConscript')
+BuildDir(B.root_build_dir+'/extern', 'extern', duplicate=0)
+SConscript(B.root_build_dir+'/extern/SConscript')
+
+# now that we have read all SConscripts, we know what
+# libraries will be built. Create list of
+# libraries to give as objects to linking phase
+mainlist = []
+for tp in B.possible_types:
+    if (not tp == 'player') and (not tp == 'player2'):
+        mainlist += B.create_blender_liblist(env, tp)
+
+if B.arguments.get('BF_PRIORITYLIST', '0')=='1':
+    B.propose_priorities()
+
+dobj = B.buildinfo(env, "dynamic") + B.resources
+creob = B.creator(env)
+thestatlibs, thelibincs = B.setup_staticlibs(env)
+thesyslibs = B.setup_syslibs(env)
+
+if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
+    env.BlenderProg(B.root_build_dir, "blender", creob + mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+if env['WITH_BF_PLAYER']:
+    playerlist = B.create_blender_liblist(env, 'player')
+    playerlist += B.create_blender_liblist(env, 'player2')
+    playerlist += B.create_blender_liblist(env, 'intern')
+    playerlist += B.create_blender_liblist(env, 'extern')
+    env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+
+##### Now define some targets
+
+
+#------------ INSTALL
+
+#-- binaries
+blenderinstall = []
+if  env['OURPLATFORM']=='darwin':
+    for prg in B.program_list:
+        bundle = '%s.app' % prg[0]
+        bundledir = os.path.dirname(bundle)
+        for dp, dn, df in os.walk(bundle):
+            if '.svn' in dn:
+                dn.remove('.svn')
+            if '_svn' in dn:
+                dn.remove('_svn')
+            dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
+            source=[dp+os.sep+f for f in df]
+            blenderinstall.append(env.Install(dir=dir,source=source))
+else:
+    blenderinstall = env.Install(dir=env['BF_INSTALLDIR'], source=B.program_list)
+
+#-- local path = config files in install dir: installdir\VERSION
+#- dont do config and scripts for darwin, it is already in the bundle
+dotblendlist = []
+datafileslist = []
+datafilestargetlist = []
+dottargetlist = []
+scriptinstall = []
+
+if env['OURPLATFORM']!='darwin':
+    dotblenderinstall = []
+    for targetdir,srcfile in zip(dottargetlist, dotblendlist):
+        td, tf = os.path.split(targetdir)
+        dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+    for targetdir,srcfile in zip(datafilestargetlist, datafileslist):
+        td, tf = os.path.split(targetdir)
+        dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+    
+    if env['WITH_BF_PYTHON']:
+        #-- local/VERSION/scripts
+        scriptpaths=['release/scripts']
+        for scriptpath in scriptpaths:
+            for dp, dn, df in os.walk(scriptpath):
+                if '.svn' in dn:
+                    dn.remove('.svn')
+                if '_svn' in dn:
+                    dn.remove('_svn')
+                if '__pycache__' in dn:  # py3.2 cache dir
+                    dn.remove('__pycache__')
+
+                # only for testing builds
+                if VERSION_RELEASE_CYCLE == "release" and "addons_contrib" in dn:
+                    dn.remove('addons_contrib')
+
+                dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+                dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
+
+                source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
+                # To ensure empty dirs are created too
+                if len(source)==0:
+                    env.Execute(Mkdir(dir))
+                scriptinstall.append(env.Install(dir=dir,source=source))
+        if env['WITH_BF_CYCLES']:
+            # cycles python code
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles')
+            source=os.listdir('intern/cycles/blender/addon')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source=['intern/cycles/blender/addon/'+s for s in source]
+            scriptinstall.append(env.Install(dir=dir,source=source))
+
+            # cycles kernel code
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel')
+            source=os.listdir('intern/cycles/kernel')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source.remove('kernel.cpp')
+            source.remove('CMakeLists.txt')
+            source.remove('svm')
+            source.remove('osl')
+            source=['intern/cycles/kernel/'+s for s in source]
+            source.append('intern/cycles/util/util_color.h')
+            source.append('intern/cycles/util/util_math.h')
+            source.append('intern/cycles/util/util_transform.h')
+            source.append('intern/cycles/util/util_types.h')
+            scriptinstall.append(env.Install(dir=dir,source=source))
+            # svm
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'svm')
+            source=os.listdir('intern/cycles/kernel/svm')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source=['intern/cycles/kernel/svm/'+s for s in source]
+            scriptinstall.append(env.Install(dir=dir,source=source))
+
+            # licenses
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license')
+            source=os.listdir('intern/cycles/doc/license')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source.remove('CMakeLists.txt')
+            source=['intern/cycles/doc/license/'+s for s in source]
+            scriptinstall.append(env.Install(dir=dir,source=source))
+
+            # cuda binaries
+            if env['WITH_BF_CYCLES_CUDA_BINARIES']:
+                dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'lib')
+                for arch in env['BF_CYCLES_CUDA_BINARIES_ARCH']:
+                    kernel_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel')
+                    cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
+                    scriptinstall.append(env.Install(dir=dir,source=cubin_file))
+    
+    if env['WITH_BF_INTERNATIONAL']:
+        internationalpaths=['release' + os.sep + 'datafiles']
+        
+        def check_path(path, member):
+            return (member in path.split(os.sep))
+        
+        for intpath in internationalpaths:
+            for dp, dn, df in os.walk(intpath):
+                if '.svn' in dn:
+                    dn.remove('.svn')
+                if '_svn' in dn:
+                    dn.remove('_svn')
+
+                # we only care about release/datafiles/fonts, release/datafiles/locales
+                if check_path(dp, "fonts") or check_path(dp, "locale"):
+                    pass
+                else:
+                    continue
+                
+                dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+                dir += os.sep + os.path.basename(intpath) + dp[len(intpath):]
+
+                source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
+                # To ensure empty dirs are created too
+                if len(source)==0:
+                    env.Execute(Mkdir(dir))
+                scriptinstall.append(env.Install(dir=dir,source=source))
+
+#-- icons
+if env['OURPLATFORM']=='linux':
+    iconlist = []
+    icontargetlist = []
+
+    for tp, tn, tf in os.walk('release/freedesktop/icons'):
+        if '.svn' in tn:
+            tn.remove('.svn')
+        if '_svn' in tn:
+            tn.remove('_svn')
+        for f in tf:
+            iconlist.append(os.path.join(tp, f))
+            icontargetlist.append( os.path.join(*([env['BF_INSTALLDIR']] + tp.split(os.sep)[2:] + [f])) )
+
+    iconinstall = []
+    for targetdir,srcfile in zip(icontargetlist, iconlist):
+        td, tf = os.path.split(targetdir)
+        iconinstall.append(env.Install(dir=td, source=srcfile))
+
+# dlls for linuxcross
+# TODO - add more libs, for now this lets blenderlite run
+if env['OURPLATFORM']=='linuxcross':
+    dir=env['BF_INSTALLDIR']
+    source = []
+
+    if env['WITH_BF_OPENMP']:
+        source += ['../lib/windows/pthreads/lib/pthreadGC2.dll']
+
+    scriptinstall.append(env.Install(dir=dir, source=source))
+
+#-- plugins
+pluglist = []
+plugtargetlist = []
+for tp, tn, tf in os.walk('release/plugins'):
+    if '.svn' in tn:
+        tn.remove('.svn')
+    if '_svn' in tn:
+        tn.remove('_svn')
+    df = tp[8:] # remove 'release/'
+    for f in tf:
+        pluglist.append(os.path.join(tp, f))
+        plugtargetlist.append( os.path.join(env['BF_INSTALLDIR'], VERSION, df, f) )
+
+
+# header files for plugins
+pluglist.append('source/blender/blenpluginapi/documentation.h')
+plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'documentation.h'))
+pluglist.append('source/blender/blenpluginapi/externdef.h')
+plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'externdef.h'))
+pluglist.append('source/blender/blenpluginapi/floatpatch.h')
+plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'floatpatch.h'))
+pluglist.append('source/blender/blenpluginapi/iff.h')
+plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'iff.h'))
+pluglist.append('source/blender/blenpluginapi/plugin.h')
+plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.h'))
+pluglist.append('source/blender/blenpluginapi/util.h')
+plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'util.h'))
+pluglist.append('source/blender/blenpluginapi/plugin.DEF')
+plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
+
+plugininstall = []
+# plugins in blender 2.5 don't work at the moment.
+#for targetdir,srcfile in zip(plugtargetlist, pluglist):
+#    td, tf = os.path.split(targetdir)
+#    plugininstall.append(env.Install(dir=td, source=srcfile))
+
+textlist = []
+texttargetlist = []
+for tp, tn, tf in os.walk('release/text'):
+    if '.svn' in tn:
+        tn.remove('.svn')
+    if '_svn' in tn:
+        tn.remove('_svn')
+    for f in tf:
+        textlist.append(tp+os.sep+f)
+
+textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
+
+if  env['OURPLATFORM']=='darwin':
+        allinstall = [blenderinstall, plugininstall, textinstall]
+elif env['OURPLATFORM']=='linux':
+        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
+else:
+        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
+    dllsources = []
+
+    if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
+        # For MinGW and linuxcross static linking will be used
+        dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
+
+    dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
+    # Used when linking to libtiff was dynamic
+    # keep it here until compilation on all platform would be ok
+    # dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
+
+    if env['OURPLATFORM'] != 'linuxcross':
+        # pthreads library is already added
+        dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
+
+    if env['WITH_BF_SDL']:
+        if env['OURPLATFORM'] == 'win64-vc':
+            pass # we link statically already to SDL on win64
+        else:
+            dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
+
+    if env['WITH_BF_PYTHON']:
+        if env['BF_DEBUG']:
+            dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
+        else:
+            dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
+
+    if env['WITH_BF_ICONV']:
+        if env['OURPLATFORM'] == 'win64-vc':
+            pass # we link statically to iconv on win64
+        elif not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
+            #gettext for MinGW and cross-compilation is compiled staticly
+            dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
+
+    if env['WITH_BF_OPENAL']:
+        dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
+
+    if env['WITH_BF_SNDFILE']:
+        dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
+
+    if env['WITH_BF_FFMPEG']:
+        dllsources += env['BF_FFMPEG_DLL'].split()
+
+    # Since the thumb handler is loaded by Explorer, architecture is
+    # strict: the x86 build fails on x64 Windows. We need to ship
+    # both builds in x86 packages.
+    if bitness == 32:
+        dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')	
+    dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
+
+    if env['WITH_BF_OIIO']:
+        dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
+
+    dllsources.append('#source/icons/blender.exe.manifest')
+
+    windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
+    allinstall += windlls
+
+installtarget = env.Alias('install', allinstall)
+bininstalltarget = env.Alias('install-bin', blenderinstall)
+
+nsisaction = env.Action(btools.NSIS_Installer, btools.NSIS_print)
+nsiscmd = env.Command('nsisinstaller', None, nsisaction)
+nsisalias = env.Alias('nsis', nsiscmd)
+
+if 'blender' in B.targets:
+    blenderexe= env.Alias('blender', B.program_list)
+    Depends(blenderexe,installtarget)
+
+if env['WITH_BF_PLAYER']:
+    blenderplayer = env.Alias('blenderplayer', B.program_list)
+    Depends(blenderplayer,installtarget)
+
+if not env['WITH_BF_GAMEENGINE']:
+    blendernogame = env.Alias('blendernogame', B.program_list)
+    Depends(blendernogame,installtarget)
+
+if 'blenderlite' in B.targets:
+    blenderlite = env.Alias('blenderlite', B.program_list)
+    Depends(blenderlite,installtarget)
+
+Depends(nsiscmd, allinstall)
+
+buildslave_action = env.Action(btools.buildslave, btools.buildslave_print)
+buildslave_cmd = env.Command('buildslave_exec', None, buildslave_action)
+buildslave_alias = env.Alias('buildslave', buildslave_cmd)
+
+Depends(buildslave_cmd, allinstall)
+
+Default(B.program_list)
+
+if not env['WITHOUT_BF_INSTALL']:
+        Default(installtarget)
+

build_files/build_environment/install_deps_patches/llvm.patch

@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,7 +14,7 @@
- set(LLVM_VERSION_MINOR 4)
- 
- if (NOT PACKAGE_VERSION)
--  set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn")
-+  set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}")
- endif()
- 
- option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)

build_files/build_environment/install_deps_patches/osl.patch

@@ -1,12 +0,0 @@
---- a/src/shaders/CMakeLists.txt
-+++ b/src/shaders/CMakeLists.txt
-@@ -27,7 +27,7 @@ macro (osl_compile oslsrc objlist headers)
-         message (STATUS "cmd: ${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc ${oslsrc}")
-     endif ()
-     add_custom_command (OUTPUT ${osofile}
--        COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" ${oslsrc}
-+        COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" "-o" ${osofile} ${oslsrc}
-         MAIN_DEPENDENCY ${oslsrc}
-         DEPENDS ${${headers}} ${oslsrc} "${CMAKE_CURRENT_BINARY_DIR}/stdosl.h" "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc"
-         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-

build_files/buildbot/config/blender_linux.cmake

@@ -1,143 +0,0 @@
-# ######## Global feature set settings ########
-
-include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
-
-# Detect which libc we'll be linking against.
-# Some of the paths will depend on this
-
-if (EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
-	message(STATUS "Building in GLibc-2.19 environment")
-	set(GLIBC "2.19")
-	set(MULTILIB "/x86_64-linux-gnu")
-elseif (EXISTS "/lib/i386-linux-gnu//libc-2.19.so")
-	message(STATUS "Building in GLibc-2.19 environment")
-	set(GLIBC "2.19")
-	set(MULTILIB "/i386-linux-gnu")
-elseif (EXISTS "/lib/libc-2.11.3.so")
-	message(STATUS "Building in GLibc-2.11 environment")
-	set(GLIBC "2.11")
-	set(MULTILIB "")
-else()
-	message(FATAL_ERROR "Unknown build environment")
-endif()
-
-# Default to only build Blender, not the player
-set(WITH_BLENDER             ON  CACHE BOOL "" FORCE)
-set(WITH_PLAYER              OFF CACHE BOOL "" FORCE)
-
-# ######## Linux-specific build options ########
-# Options which are specific to Linux-only platforms
-set(WITH_DOC_MANPAGE         OFF CACHE BOOL "" FORCE)
-
-# ######## Official release-specific build options ########
-# Options which are specific to Linux release builds only
-set(WITH_JACK_DYNLOAD        ON  CACHE BOOL "" FORCE)
-set(WITH_SDL_DYNLOAD         ON  CACHE BOOL "" FORCE)
-set(WITH_SYSTEM_GLEW         OFF CACHE BOOL "" FORCE)
-
-set(WITH_OPENMP_STATIC       ON  CACHE BOOL "" FORCE)
-
-set(WITH_PYTHON_INSTALL_NUMPY    ON CACHE BOOL "" FORCE)
-set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE)
-
-# ######## Release environment specific settings ########
-# All the hardcoded libraru paths and such
-
-# LLVM libraries
-set(LLVM_VERSION             "3.4"  CACHE STRING "" FORCE)
-set(LLVM_ROOT_DIR            "/opt/lib/llvm-${LLVM_VERSION}"  CACHE STRING "" FORCE)
-set(LLVM_STATIC              ON  CACHE BOOL "" FORCE)
-
-# BOOST libraries
-set(BOOST_ROOT               "/opt/lib/boost" CACHE STRING "" FORCE)
-set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
-
-# FFmpeg libraries
-set(FFMPEG                   "/opt/lib/ffmpeg" CACHE STRING "" FORCE)
-set(FFMPEG_LIBRARIES
-	avdevice avformat avcodec avutil avfilter swscale swresample
-	/usr/lib${MULTILIB}/libxvidcore.a
-	/usr/lib${MULTILIB}/libx264.a
-	/usr/lib${MULTILIB}/libmp3lame.a
-	/usr/lib${MULTILIB}/libvpx.a
-	/usr/lib${MULTILIB}/libvorbis.a
-	/usr/lib${MULTILIB}/libogg.a
-	/usr/lib${MULTILIB}/libvorbisenc.a
-	/usr/lib${MULTILIB}/libtheora.a
-	/usr/lib${MULTILIB}/libschroedinger-1.0.a
-	/usr/lib${MULTILIB}/liborc-0.4.a
-	CACHE STRING "" FORCE
-)
-
-# SndFile libraries
-set(SNDFILE_LIBRARY          "/usr/lib/libsndfile.a;/usr/lib/libFLAC.a" CACHE STRING "" FORCE)
-
-# OpenAL libraries
-set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
-set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include" CACHE STRING "" FORCE)
-set(OPENAL_LIBRARY
-	${OPENAL_ROOT_DIR}/lib/libopenal.a
-	${OPENAL_ROOT_DIR}/lib/libcommon.a
-	CACHE STRING "" FORCE
-)
-
-# OpenCollada libraries
-set(OPENCOLLADA_UTF_LIBRARY   ""                              CACHE STRING "" FORCE)
-set(PCRE_INCLUDE_DIR          "/usr/include"                  CACHE STRING "" FORCE)
-set(PCRE_LIBRARY              "/usr/lib${MULTILIB}/libpcre.a" CACHE STRING "" FORCE)
-set(XML2_INCLUDE_DIR          "/usr/include"                  CACHE STRING "" FORCE)
-set(XML2_LIBRARY              "/usr/lib${MULTILIB}/libxml2.a" CACHE STRING "" FORCE)
-
-# OpenColorIO libraries
-set(OPENCOLORIO_ROOT_DIR      "/opt/lib/ocio" CACHE STRING "" FORCE)
-set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO.a" CACHE STRING "" FORCE)
-set(OPENCOLORIO_TINYXML_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libtinyxml.a"         CACHE STRING "" FORCE)
-set(OPENCOLORIO_YAML-CPP_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.a"       CACHE STRING "" FORCE)
-
-# OpenImageIO
-if(GLIBC EQUAL "2.19")
-	set(OPENIMAGEIO_LIBRARY
-		/opt/lib/oiio/lib/libOpenImageIO.a
-		/opt/lib/oiio/lib/libOpenImageIO_Util.a
-		/usr/lib${MULTILIB}/libwebp.a
-		/usr/lib${MULTILIB}/liblzma.a
-		/usr/lib${MULTILIB}/libjbig.a
-		CACHE STRING "" FORCE
-	)
-endif()
-
-# OpenSubdiv libraries
-set(OPENSUBDIV_ROOT_DIR "/opt/lib/opensubdiv" CACHE STRING "" FORCE)
-set(OPENSUBDIV_OSDCPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdCPU.a" CACHE STRING "" FORCE)
-set(OPENSUBDIV_OSDGPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdGPU.a" CACHE STRING "" FORCE)
-
-# OpenEXR libraries
-set(OPENEXR_ROOT_DIR          "/opt/lib/openexr"                    CACHE STRING "" FORCE)
-set(OPENEXR_HALF_LIBRARY      "/opt/lib/openexr/lib/libHalf.a"      CACHE STRING "" FORCE)
-set(OPENEXR_IEX_LIBRARY       "/opt/lib/openexr/lib/libIex.a"       CACHE STRING "" FORCE)
-set(OPENEXR_ILMIMF_LIBRARY    "/opt/lib/openexr/lib/libIlmImf.a"    CACHE STRING "" FORCE)
-set(OPENEXR_ILMTHREAD_LIBRARY "/opt/lib/openexr/lib/libIlmThread.a" CACHE STRING "" FORCE)
-set(OPENEXR_IMATH_LIBRARY     "/opt/lib/openexr/lib/libImath.a"     CACHE STRING "" FORCE)
-
-# JeMalloc library
-set(JEMALLOC_LIBRARY    "/opt/lib/jemalloc/lib/libjemalloc.a" CACHE STRING "" FORCE)
-
-# Space navigation
-set(SPACENAV_ROOT_DIR       "/opt/lib/libspnav" CACHE STRING "" FORCE)
-
-# Force some system libraries to be static
-set(FFTW3_LIBRARY       "/usr/lib${MULTILIB}/libfftw3.a" CACHE STRING "" FORCE)
-set(JPEG_LIBRARY        "/usr/lib${MULTILIB}/libjpeg.a"  CACHE STRING "" FORCE)
-set(PNG_LIBRARY         "/usr/lib${MULTILIB}/libpng.a"   CACHE STRING "" FORCE)
-set(TIFF_LIBRARY        "/usr/lib${MULTILIB}/libtiff.a"  CACHE STRING "" FORCE)
-set(ZLIB_LIBRARY        "/usr/lib${MULTILIB}/libz.a"     CACHE STRING "" FORCE)
-
-# OpenVDB
-set(OPENVDB_LIBRARY
-	/opt/lib/openvdb/lib/libopenvdb.a
-	/opt/lib/blosc/lib/libblosc.a
-	CACHE BOOL "" FORCE
-)
-
-# Additional linking libraries
-set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++"  CACHE STRING "" FORCE)

build_files/buildbot/config/blender_linux_player.cmake

@@ -1,12 +0,0 @@
-# This is applied as an ovveride on top of blender_linux.config
-# Disables all the areas which are not needed for the player.
-set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
-set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
-set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)
-set(WITH_GHOST_XDND          OFF CACHE BOOL "" FORCE)
-set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
-set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
-
-set(WITH_BLENDER             OFF CACHE BOOL "" FORCE)
-set(WITH_PLAYER              ON  CACHE BOOL "" FORCE)

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

@@ -0,0 +1,121 @@
+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
+
+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-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,121 @@
+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
+
+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,58 +3,6 @@
 
 # <pep8 compliant>
 
-# List of the branches being built automatically overnight
-NIGHT_SCHEDULE_BRANCHES = [None]
-
-# 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 = {}
 
@@ -78,92 +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 control 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'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="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"},
-                "lib svn": {"repository": "", "branch": "trunk"}},
-            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,124 +61,84 @@ 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'):
-        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))
+    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
+# builders
 
-add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5)
-add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1)
-add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
-add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3)
-add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4)
-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, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=5)
+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, 'freebsd_i386_cmake', '', generic_builder)
+#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
+
+# 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
 #
@@ -311,27 +150,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,11 @@ import zipfile
 # extension stripping
 def strip_extension(filename):
     extensions = '.zip', '.tar', '.bz2', '.gz', '.tgz', '.tbz', '.exe'
-
-    for ext in extensions:
-        if filename.endswith(ext):
-            filename = filename[:-len(ext)]
-
-    return filename
+    filename_noext, ext = os.path.splitext(filename)
+    if ext in extensions:
+        return strip_extension(filename_noext)  # may have .tar.bz2
+    else:
+        return filename
 
 
 # extract platform from package name
@@ -49,11 +48,11 @@ def get_platform(filename):
     tokens = filename.split("-")
     platforms = ('osx', 'mac', 'bsd',
                  'win', 'linux', 'source',
-                 'irix', 'solaris', 'mingw')
+                 'solaris')
     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():
@@ -71,14 +70,14 @@ def get_branch(filename):
     branch = ""
 
     for token in tokens:
-        if token == "blender":
-            return branch
-
         if branch == "":
             branch = token
         else:
             branch = branch + "-" + token
 
+        if token == "blender":
+            return branch
+
     return ""
 
 # get filename
@@ -95,7 +94,7 @@ if not os.path.exists(filename):
 
 try:
     z = zipfile.ZipFile(filename, "r")
-except Exception as ex:
+except Exception, ex:
     sys.stderr.write('Failed to open zip file: %s\n' % str(ex))
     sys.exit(1)
 
@@ -116,24 +115,19 @@ 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:
-    filename = os.path.join(directory, packagename)
     zf = z.open(package)
-    f = file(filename, "wb")
+    f = file(os.path.join(directory, packagename), "wb")
 
     shutil.copyfileobj(zf, f)
-    os.chmod(filename, 0644)
 
     zf.close()
     z.close()
-except Exception as ex:
+
+    os.remove(filename)
+except Exception, ex:
     sys.stderr.write('Failed to unzip package: %s\n' % str(ex))
     sys.exit(1)
 
@@ -143,6 +137,6 @@ try:
         if get_platform(f) == platform and get_branch(f) == branch:
             if f != packagename:
                 os.remove(os.path.join(directory, f))
-except Exception as ex:
+except Exception, ex:
     sys.stderr.write('Failed to remove old packages: %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,172 +30,91 @@ if len(sys.argv) < 2:
 builder = sys.argv[1]
 
 # we run from build/ directory
-blender_dir = os.path.join('..', 'blender.git')
+blender_dir = '../blender'
 
-
-def parse_header_file(filename, define):
-    import re
-    regex = re.compile("^#\s*define\s+%s\s+(.*)" % define)
-    with open(filename, "r") as file:
-        for l in file:
-            match = regex.match(l)
-            if match:
-                return match.group(1)
-    return None
-
-if 'cmake' in builder:
+if builder.find('cmake') != -1:
     # cmake
 
-    # Some fine-tuning configuration
-    blender_dir = os.path.join('..', blender_dir)
-    build_dir = os.path.abspath(os.path.join('..', 'build', builder))
-    install_dir = os.path.abspath(os.path.join('..', 'install', builder))
-    targets = ['blender']
+    # set build options
+    cmake_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
 
-    chroot_name = None  # If not None command will be delegated to that chroot
-    cuda_chroot_name = None  # If not None cuda compilationcommand will be delegated to that chroot
-    build_cubins = True  # Whether to build Cycles CUDA kernels
-    remove_install_dir = False  # Remove installation folder before building
-    bits = 64
+    if builder.endswith('mac_x86_64_cmake'):
+        cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
+    elif builder.endswith('mac_i386_cmake'):
+        cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=i386')
+    elif builder.endswith('mac_ppc_cmake'):
+        cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc')
 
-    # Config file to be used (relative to blender's sources root)
-    cmake_config_file = "build_files/cmake/config/blender_full.cmake"
-    cmake_player_config_file = None
-    cmake_cuda_config_file = None
+    # configure and make
+    retcode = subprocess.call(['cmake', blender_dir] + cmake_options)
+    if retcode != 0:
+        sys.exit(retcode)
+    retcode = subprocess.call(['make', '-s', '-j4', 'install'])
+    sys.exit(retcode)
+else:
+    # scons
+    os.chdir(blender_dir)
+    scons_cmd = ['python', 'scons/scons.py']
+    scons_options = []
 
-    # Set build options.
-    cmake_options = []
-    cmake_extra_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
-    cuda_cmake_options = []
+    if builder.find('linux') != -1:
+        import shutil
 
-    if builder.startswith('mac'):
-        install_dir = None
-        # Set up OSX architecture
-        if builder.endswith('x86_64_10_6_cmake'):
-            cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
-        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
+        # 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)
 
-    elif builder.startswith('win'):
-        install_dir = None
-        if builder.startswith('win64'):
-            cmake_options.append(['-G', '"Visual Studio 12 2013 Win64"'])
-        elif builder.startswith('win32'):
-            bits = 32
-            cmake_options.append(['-G', '"Visual Studio 12 2013"'])
+        common_options = ['BF_INSTALLDIR=' + install_dir]
 
-    elif builder.startswith('linux'):
-        tokens = builder.split("_")
-        glibc = tokens[1]
-        if glibc == 'glibc219':
-            deb_name = "jessie"
-        elif glibc == 'glibc211':
-            deb_name = "squeeze"
-        remove_install_dir = True
-        cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
-        cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake"
-        if builder.endswith('x86_64_cmake'):
-            chroot_name = 'buildbot_' + deb_name + '_x86_64'
-            targets = ['player', 'blender']
-        elif builder.endswith('i686_cmake'):
-            bits = 32
-            chroot_name = 'buildbot_' + deb_name + '_i686'
-            cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
-            targets = ['player', 'blender', 'cuda']
-
-    cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))
-
-    # Prepare CMake options needed to configure cuda binaries compilation.
-    cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
-    if build_cubins or 'cuda' in targets:
-        if bits == 32:
-            cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=OFF")
-        else:
-            cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
-
-    # Only modify common cmake options if cuda doesn't require separate target.
-    if 'cuda' not in targets:
-        cmake_options += cuda_cmake_options
-
-    if install_dir:
-        cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
-
-    cmake_options += cmake_extra_options
-
-    # Prepare chroot command prefix if needed
-    if chroot_name:
-        chroot_prefix = ['schroot', '-c', chroot_name, '--']
-    else:
-        chroot_prefix = []
-    if cuda_chroot_name:
-        cuda_chroot_prefix = ['schroot', '-c', cuda_chroot_name, '--']
-    else:
-        cuda_chroot_prefix = chroot_prefix[:]
-
-    # Make sure no garbage remained from the previous run
-    # (only do it if builder requested this)
-    if remove_install_dir:
+        # Clean install directory so we'll be sure there's no
         if os.path.isdir(install_dir):
             shutil.rmtree(install_dir)
 
-    for target in targets:
-        print("Building target %s" % (target))
-        # Construct build directory name based on the target
-        target_build_dir = build_dir
-        target_chroot_prefix = chroot_prefix[:]
-        if target != 'blender':
-            target_build_dir += '_' + target
-        target_name = 'install'
-        # Make sure build directory exists and enter it
-        if not os.path.isdir(target_build_dir):
-            os.mkdir(target_build_dir)
-        os.chdir(target_build_dir)
-        # Tweaking CMake options to respect the target
-        target_cmake_options = cmake_options[:]
-        if target == 'player':
-            target_cmake_options.append("-C" + os.path.join(blender_dir, cmake_player_config_file))
-        elif target == 'cuda':
-            target_cmake_options += cuda_cmake_options
-            target_chroot_prefix = cuda_chroot_prefix[:]
-            target_name = 'cycles_kernel_cuda'
-        # If cuda binaries are compiled as a separate target, make sure
-        # other targets don't compile cuda binaries.
-        if 'cuda' in targets and target != 'cuda':
-            target_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
-        # Configure the build
-        print("CMake options:")
-        print(target_cmake_options)
-        if os.path.exists('CMakeCache.txt'):
-            print("Removing CMake cache")
-            os.remove('CMakeCache.txt')
-        retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options)
-        if retcode != 0:
-            print('Condifuration FAILED!')
-            sys.exit(retcode)
+        buildbot_dir = os.path.dirname(os.path.realpath(__file__))
+        config_dir = os.path.join(buildbot_dir, 'config')
 
-        if 'win32' in builder:
-            command = ['msbuild', 'INSTALL.vcxproj', '/Property:PlatformToolset=v120_xp', '/p:Configuration=Release']
-        elif 'win64' in builder:
-            command = ['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release']
-        else:
-            command = target_chroot_prefix + ['make', '-s', '-j2', target_name]
+        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']
 
-        print("Executing command:")
-        print(command)
-        retcode = subprocess.call(command)
+        for config in configs:
+            config_fpath = os.path.join(config_dir, config)
 
-        if retcode != 0:
-            sys.exit(retcode)
+            scons_options = []
 
-        if builder.startswith('linux') and target == 'cuda':
-            blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
-            blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION'))
-            blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
-            kernels = os.path.join(target_build_dir, 'intern', 'cycles', 'kernel')
-            install_kernels = os.path.join(install_dir, blender_version, 'scripts', 'addons', 'cycles', 'lib')
-            os.mkdir(install_kernels)
-            print("Copying cuda binaries from %s to %s" % (kernels, install_kernels))
-            os.system('cp %s/*.cubin %s' % (kernels, install_kernels))
+            if config.find('player') != -1:
+                scons_options.append('BF_BUILDDIR=%s_player' % (build_dir))
+            else:
+                scons_options.append('BF_BUILDDIR=%s' % (build_dir))
 
-else:
-    print("Unknown building system")
-    sys.exit(1)
+            scons_options += common_options
+
+            if config.find('player') == -1:
+                scons_options.append('blender')
+            else:
+                scons_options.append('blenderplayer')
+
+            scons_options.append('BF_CONFIG=' + config_fpath)
+
+            retcode = subprocess.call(scons_cmd + scons_options)
+            if retcode != 0:
+                print('Error building rules wuth config ' + config)
+                sys.exit(retcode)
+
+        sys.exit(0)
+    else:
+        if builder.find('win') != -1:
+            bitness = '32'
+
+            if builder.find('win64') != -1:
+                bitness = '64'
+
+            scons_options.append('BF_BITNESS=' + bitness)
+
+        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+        sys.exit(retcode)

build_files/buildbot/slave_pack.py

@@ -33,207 +33,98 @@ 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 = ''
 
-blender_dir = os.path.join('..', 'blender.git')
-build_dir = os.path.join('..', 'build', builder)
-install_dir = os.path.join('..', 'install', builder)
-buildbot_upload_zip = os.path.abspath(os.path.join(os.path.dirname(install_dir), "buildbot_upload.zip"))
+if len(sys.argv) >= 3:
+    branch = sys.argv[2]
 
-upload_filename = None  # Name of the archive to be uploaded
-                        # (this is the name of archive which will appear on the
-                        # download page)
-upload_filepath = None  # Filepath to be uploaded to the server
-                        # (this folder will be packed)
+# scons does own packaging
+if builder.find('scons') != -1:
+    os.chdir('../blender')
+    scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave']
 
+    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)
 
-def parse_header_file(filename, define):
-    import re
-    regex = re.compile("^#\s*define\s+%s\s+(.*)" % define)
-    with open(filename, "r") as file:
-        for l in file:
-            match = regex.match(l)
-            if match:
-                return match.group(1)
-    return None
+        scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False',
+            'BF_BUILDDIR=' + build_dir,
+            'BF_INSTALLDIR=' + install_dir,
+            'WITHOUT_BF_INSTALL=True']
 
+        config = None
 
-# Make sure install directory always exists
-if not os.path.exists(install_dir):
-    os.makedirs(install_dir)
+        if builder.endswith('linux_x86_64_scons'):
+            config = 'user-config-x86_64.py'
+        elif builder.endswith('linux_i386_scons'):
+            config = 'user-config-x86_64.py'
 
+        if config is not None:
+            config_fpath = os.path.join(config_dir, config)
+            scons_options.append('BF_CONFIG=' + config_fpath)
 
-def create_tar_bz2(src, dest, package_name):
-    # One extra to remove leading os.sep when cleaning root for package_root
-    ln = len(src) + 1
-    flist = list()
-
-    # Create list of tuples containing file and archive name
-    for root, dirs, files in os.walk(src):
-        package_root = os.path.join(package_name, root[ln:])
-        flist.extend([(os.path.join(root, file), os.path.join(package_root, file)) for file in files])
-
-    import tarfile
-    package = tarfile.open(dest, 'w:bz2')
-    for entry in flist:
-        package.add(entry[0], entry[1], recursive=False)
-    package.close()
-
-
-if builder.find('cmake') != -1:
-    # CMake
-    if 'win' in builder or 'mac' in builder:
-        os.chdir(build_dir)
-
-        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]
-
-        # TODO(sergey): Such magic usually happens in SCon's packaging but we don't have it
-        # in the CMake yet. For until then we do some magic here.
-        tokens = result_file.split('-')
-        blender_version = tokens[1].split('.')
-        blender_full_version = '.'.join(blender_version[0:2])
-        git_hash = tokens[2].split('.')[1]
-        platform = builder.split('_')[0]
-        if platform == 'mac':
-            # Special exception for OSX
-            platform = 'OSX-10.6-'
-            if builder.endswith('x86_64_10_6_cmake'):
-                platform += 'x86_64'
-            elif builder.endswith('i386_10_6_cmake'):
-                platform += 'i386'
-            elif builder.endswith('ppc_10_6_cmake'):
-                platform += 'ppc'
-        builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
-        if branch != '':
-            builderified_name = branch + "-" + builderified_name
-
-        os.rename(result_file, "{}.zip".format(builderified_name))
-        # create zip file
-        try:
-            if os.path.exists(buildbot_upload_zip):
-                os.remove(buildbot_upload_zip)
-            z = zipfile.ZipFile(buildbot_upload_zip, "w", compression=zipfile.ZIP_STORED)
-            z.write("{}.zip".format(builderified_name))
-            z.close()
-            sys.exit(retcode)
-        except Exception as ex:
-            sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
-            sys.exit(1)
-
-    elif builder.startswith('linux_'):
         blender = os.path.join(install_dir, 'blender')
         blenderplayer = os.path.join(install_dir, 'blenderplayer')
+        subprocess.call(['strip', '--strip-all', blender, blenderplayer])
 
-        buildinfo_h = os.path.join(build_dir, "source", "creator", "buildinfo.h")
-        blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
+        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+        sys.exit(retcode)
+    else:
+        if builder.find('win') != -1:
+            bitness = '32'
 
-        # Get version information
-        blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION'))
-        blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
-        blender_hash = parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
-        blender_glibc = builder.split('_')[1]
+            if builder.find('win64') != -1:
+                bitness = '64'
 
-        if builder.endswith('x86_64_cmake'):
-            chroot_name = 'buildbot_squeeze_x86_64'
-            bits = 64
-            blender_arch = 'x86_64'
-        elif builder.endswith('i686_cmake'):
-            chroot_name = 'buildbot_squeeze_i686'
-            bits = 32
-            blender_arch = 'i686'
+            scons_options.append('BF_BITNESS=' + bitness)
 
-        # Strip all unused symbols from the binaries
-        print("Stripping binaries...")
-        chroot_prefix = ['schroot', '-c', chroot_name, '--']
-        subprocess.call(chroot_prefix + ['strip', '--strip-all', blender, blenderplayer])
+        retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+        sys.exit(retcode)
 
-        print("Stripping python...")
-        py_target = os.path.join(install_dir, blender_version)
-        subprocess.call(chroot_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
+# clean release directory if it already exists
+release_dir = 'release'
 
-        # Copy all specific files which are too specific to be copied by
-        # the CMake rules themselves
-        print("Copying extra scripts and libs...")
+if os.path.exists(release_dir):
+    for f in os.listdir(release_dir):
+        if os.path.isfile(os.path.join(release_dir, f)):
+            os.remove(os.path.join(release_dir, f))
 
-        extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
-        mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
-        software_gl = os.path.join(blender_dir, 'release', 'bin', 'blender-softwaregl')
-        icons = os.path.join(blender_dir, 'release', 'freedesktop', 'icons')
-
-        os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
-        os.system('cp %s %s' % (software_gl, install_dir))
-        os.system('cp -r %s %s' % (icons, install_dir))
-        os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
-
-        # Construct archive name
-        package_name = 'blender-%s-%s-linux-%s-%s' % (blender_version,
-                                                      blender_hash,
-                                                      blender_glibc,
-                                                      blender_arch)
-        if branch != '':
-            package_name = branch + "-" + package_name
-
-        upload_filename = package_name + ".tar.bz2"
-
-        print("Creating .tar.bz2 archive")
-        upload_filepath = install_dir + '.tar.bz2'
-        create_tar_bz2(install_dir, upload_filepath, package_name)
-else:
-    print("Unknown building system")
+# create release package
+try:
+    subprocess.call(['make', 'package_archive'])
+except Exception, ex:
+    sys.stderr.write('Make package release failed' + str(ex) + '\n')
     sys.exit(1)
 
+# find release directory, must exist this time
+if not os.path.exists(release_dir):
+    sys.stderr.write("Failed to find release directory %r.\n" % release_dir)
+    sys.exit(1)
 
-if upload_filepath is None:
-    # clean release directory if it already exists
-    release_dir = 'release'
+# find release package
+file = None
+filepath = None
 
-    if os.path.exists(release_dir):
-        for f in os.listdir(release_dir):
-            if os.path.isfile(os.path.join(release_dir, f)):
-                os.remove(os.path.join(release_dir, f))
+for f in os.listdir(release_dir):
+    rf = os.path.join(release_dir, f)
+    if os.path.isfile(rf) and f.startswith('blender'):
+        file = f
+        filepath = rf
 
-    # create release package
-    try:
-        subprocess.call(['make', 'package_archive'])
-    except Exception as ex:
-        sys.stderr.write('Make package release failed' + str(ex) + '\n')
-        sys.exit(1)
-
-    # find release directory, must exist this time
-    if not os.path.exists(release_dir):
-        sys.stderr.write("Failed to find release directory %r.\n" % release_dir)
-        sys.exit(1)
-
-    # find release package
-    file = None
-    filepath = None
-
-    for f in os.listdir(release_dir):
-        rf = os.path.join(release_dir, f)
-        if os.path.isfile(rf) and f.startswith('blender'):
-            file = f
-            filepath = rf
-
-    if not file:
-        sys.stderr.write("Failed to find release package.\n")
-        sys.exit(1)
-
-    upload_filename = file
-    upload_filepath = filepath
+if not file:
+    sys.stderr.write("Failed to find release package.\n")
+    sys.exit(1)
 
 # create zip file
 try:
-    upload_zip = os.path.join(buildbot_upload_zip)
+    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(upload_filepath, arcname=upload_filename)
+    z.write(filepath, arcname=file)
     z.close()
-except Exception as ex:
+except Exception, ex:
     sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
     sys.exit(1)

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

@@ -19,7 +19,6 @@
 # <pep8 compliant>
 
 import subprocess
-import os
 import sys
 
 # get builder name
@@ -30,30 +29,12 @@ 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
-
-    print("Automated tests are still DISABLED!")
-    sys.exit(0)
-
-    build_dir = os.path.abspath(os.path.join('..', 'build', builder))
-    chroot_name = None
-    chroot_prefix = []
-
-    """
-    if builder.endswith('x86_64_cmake'):
-        chroot_name = 'buildbot_squeeze_x86_64'
-    elif builder.endswith('i686_cmake'):
-        chroot_name = 'buildbot_squeeze_i686'
-    if chroot_name:
-        chroot_prefix = ['schroot', '-c', chroot_name, '--']
-    """
-
-    os.chdir(build_dir)
-    retcode = subprocess.call(chroot_prefix + ['ctest', '--output-on-failure'])
+    retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
     sys.exit(retcode)
 else:
-    print("Unknown building system")
-    sys.exit(1)
+    # scons
+    pass

build_files/cmake/Modules/FindAudaspace.cmake

@@ -1,113 +0,0 @@
-# - Try to find audaspace
-# Once done, this will define
-#
-#  AUDASPACE_FOUND - system has audaspace
-#  AUDASPACE_INCLUDE_DIRS - the audaspace include directories
-#  AUDASPACE_LIBRARIES - link these to use audaspace
-#  AUDASPACE_C_FOUND - system has audaspace's C binding
-#  AUDASPACE_C_INCLUDE_DIRS - the audaspace's C binding include directories
-#  AUDASPACE_C_LIBRARIES - link these to use audaspace's C binding
-#  AUDASPACE_PY_FOUND - system has audaspace's python binding
-#  AUDASPACE_PY_INCLUDE_DIRS - the audaspace's python binding include directories
-#  AUDASPACE_PY_LIBRARIES - link these to use audaspace's python binding
-
-IF(NOT AUDASPACE_ROOT_DIR AND NOT $ENV{AUDASPACE_ROOT_DIR} STREQUAL "")
- SET(AUDASPACE_ROOT_DIR $ENV{AUDASPACE_ROOT_DIR})
-ENDIF()
-
-SET(_audaspace_SEARCH_DIRS
-  ${AUDASPACE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-# Use pkg-config to get hints about paths
-FIND_PACKAGE(PkgConfig)
-IF(PKG_CONFIG_FOUND)
-  PKG_CHECK_MODULES(AUDASPACE_PKGCONF audaspace)
-ENDIF(PKG_CONFIG_FOUND)
-
-# Include dir
-FIND_PATH(AUDASPACE_INCLUDE_DIR
-  NAMES ISound.h
-  HINTS ${_audaspace_SEARCH_DIRS}
-  PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
-  PATH_SUFFIXES include/audaspace
-)
-
-# Library
-FIND_LIBRARY(AUDASPACE_LIBRARY
-  NAMES audaspace
-  HINTS ${_audaspace_SEARCH_DIRS}
-  PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
-  PATH_SUFFIXES lib lib64
-)
-
-# Include dir
-FIND_PATH(AUDASPACE_C_INCLUDE_DIR
-  NAMES AUD_Sound.h
-  HINTS ${_audaspace_SEARCH_DIRS}
-  PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
-  PATH_SUFFIXES include/audaspace
-)
-
-# Library
-FIND_LIBRARY(AUDASPACE_C_LIBRARY
-  NAMES audaspace-c
-  HINTS ${_audaspace_SEARCH_DIRS}
-  PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
-  PATH_SUFFIXES lib lib64
-)
-
-# Include dir
-FIND_PATH(AUDASPACE_PY_INCLUDE_DIR
-  NAMES python/PyAPI.h
-  HINTS ${_audaspace_SEARCH_DIRS}
-  PATHS ${AUDASPACE_PKGCONF_INCLUDE_DIRS}
-  PATH_SUFFIXES include/audaspace
-)
-
-# Library
-FIND_LIBRARY(AUDASPACE_PY_LIBRARY
-  NAMES audaspace-py
-  HINTS ${_audaspace_SEARCH_DIRS}
-  PATHS ${AUDASPACE_PKGCONF_LIBRARY_DIRS}
-  PATH_SUFFIXES lib lib64
-)
-
-FIND_PACKAGE(PackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace  DEFAULT_MSG  AUDASPACE_LIBRARY AUDASPACE_INCLUDE_DIR)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_C  DEFAULT_MSG  AUDASPACE_C_LIBRARY AUDASPACE_C_INCLUDE_DIR)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Audaspace_Py  DEFAULT_MSG  AUDASPACE_PY_LIBRARY AUDASPACE_PY_INCLUDE_DIR)
-
-IF(AUDASPACE_FOUND)
-  SET(AUDASPACE_LIBRARIES ${AUDASPACE_LIBRARY})
-  SET(AUDASPACE_INCLUDE_DIRS ${AUDASPACE_INCLUDE_DIR})
-ENDIF(AUDASPACE_FOUND)
-
-IF(AUDASPACE_C_FOUND)
-  SET(AUDASPACE_C_LIBRARIES ${AUDASPACE_C_LIBRARY})
-  SET(AUDASPACE_C_INCLUDE_DIRS ${AUDASPACE_C_INCLUDE_DIR})
-ENDIF(AUDASPACE_C_FOUND)
-
-IF(AUDASPACE_PY_FOUND)
-  SET(AUDASPACE_PY_LIBRARIES ${AUDASPACE_PY_LIBRARY})
-  SET(AUDASPACE_PY_INCLUDE_DIRS ${AUDASPACE_PY_INCLUDE_DIR})
-ENDIF(AUDASPACE_PY_FOUND)
-
-MARK_AS_ADVANCED(
-  AUDASPACE_LIBRARY
-  AUDASPACE_LIBRARIES
-  AUDASPACE_INCLUDE_DIR
-  AUDASPACE_INCLUDE_DIRS
-  AUDASPACE_C_LIBRARY
-  AUDASPACE_C_LIBRARIES
-  AUDASPACE_C_INCLUDE_DIR
-  AUDASPACE_C_INCLUDE_DIRS
-  AUDASPACE_PY_LIBRARY
-  AUDASPACE_PY_LIBRARIES
-  AUDASPACE_PY_INCLUDE_DIR
-  AUDASPACE_PY_INCLUDE_DIRS
-)

build_files/cmake/Modules/FindEigen3.cmake

@@ -1,56 +0,0 @@
-# - Find Eigen3 library
-# Find the native Eigen3 includes and library
-# This module defines
-#  EIGEN3_INCLUDE_DIRS, where to find spnav.h, Set when
-#                        EIGEN3_INCLUDE_DIR is found.
-#  EIGEN3_ROOT_DIR, The base directory to search for Eigen3.
-#                    This can also be an environment variable.
-#  EIGEN3_FOUND, If false, do not try to use Eigen3.
-#
-#=============================================================================
-# Copyright 2015 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 EIGEN3_ROOT_DIR was defined in the environment, use it.
-IF(NOT EIGEN3_ROOT_DIR AND NOT $ENV{EIGEN3_ROOT_DIR} STREQUAL "")
-  SET(EIGEN3_ROOT_DIR $ENV{EIGEN3_ROOT_DIR})
-ENDIF()
-
-SET(_eigen3_SEARCH_DIRS
-  ${EIGEN3_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(EIGEN3_INCLUDE_DIR
-  NAMES
-    # header has no '.h' suffix
-    Eigen/Eigen
-  HINTS
-    ${_eigen3_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include/eigen3
-)
-
-# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG
-    EIGEN3_INCLUDE_DIR)
-
-IF(EIGEN3_FOUND)
-  SET(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
-ENDIF(EIGEN3_FOUND)
-
-MARK_AS_ADVANCED(
-  EIGEN3_INCLUDE_DIR
-)

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/FindJeMalloc.cmake

@@ -33,7 +33,6 @@ SET(_jemalloc_SEARCH_DIRS
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
-  /opt/lib/jemalloc
 )
 
 FIND_PATH(JEMALLOC_INCLUDE_DIR

build_files/cmake/Modules/FindLLVM.cmake

@@ -1,96 +0,0 @@
-# - Find LLVM library
-# Find the native LLVM includes and library
-# This module defines
-#  LLVM_INCLUDE_DIRS, where to find LLVM.h, Set when LLVM_INCLUDE_DIR is found.
-#  LLVM_LIBRARIES, libraries to link against to use LLVM.
-#  LLVM_ROOT_DIR, The base directory to search for LLVM.
-#                This can also be an environment variable.
-#  LLVM_FOUND, If false, do not try to use LLVM.
-#
-# also defined, but not for general use are
-#  LLVM_LIBRARY, where to find the LLVM library.
-
-#=============================================================================
-# Copyright 2015 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(LLVM_ROOT_DIR)
-	if(DEFINED LLVM_VERSION)
-		find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH)
-	endif()
-	if(NOT LLVM_CONFIG)
-		find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH)
-	endif()
-else()
-	if(DEFINED LLVM_VERSION)
-        message(running llvm-config-${LLVM_VERSION})
-		find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION})
-	endif()
-	if(NOT LLVM_CONFIG)
-		find_program(LLVM_CONFIG llvm-config)
-	endif()
-endif()
-
-if(NOT DEFINED LLVM_VERSION)
-	execute_process(COMMAND ${LLVM_CONFIG} --version
-					OUTPUT_VARIABLE LLVM_VERSION
-					OUTPUT_STRIP_TRAILING_WHITESPACE)
-	set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
-endif()
-if(NOT LLVM_ROOT_DIR)
-	execute_process(COMMAND ${LLVM_CONFIG} --prefix
-					OUTPUT_VARIABLE LLVM_ROOT_DIR
-					OUTPUT_STRIP_TRAILING_WHITESPACE)
-	set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
-endif()
-if(NOT LLVM_LIBPATH)
-	execute_process(COMMAND ${LLVM_CONFIG} --libdir
-					OUTPUT_VARIABLE LLVM_LIBPATH
-					OUTPUT_STRIP_TRAILING_WHITESPACE)
-	set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
-	mark_as_advanced(LLVM_LIBPATH)
-endif()
-
-if(LLVM_STATIC)
-	find_library(LLVM_LIBRARY
-	             NAMES LLVMAnalysis # first of a whole bunch of libs to get
-	             PATHS ${LLVM_LIBPATH})
-else()
-	find_library(LLVM_LIBRARY
-	             NAMES
-	               LLVM-${LLVM_VERSION}
-	               LLVMAnalysis  # check for the static library as a fall-back
-	             PATHS ${LLVM_LIBPATH})
-endif()
-
-
-if(LLVM_LIBRARY AND LLVM_ROOT_DIR AND LLVM_LIBPATH)
-	if(LLVM_STATIC)
-		# if static LLVM libraries were requested, use llvm-config to generate
-		# the list of what libraries we need, and substitute that in the right
-		# way for LLVM_LIBRARY.
-		execute_process(COMMAND ${LLVM_CONFIG} --libfiles
-		                OUTPUT_VARIABLE LLVM_LIBRARY
-		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-		string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
-	endif()
-endif()
-
-
-# handle the QUIETLY and REQUIRED arguments and set SDL2_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LLVM DEFAULT_MSG
-    LLVM_LIBRARY)
-
-MARK_AS_ADVANCED(
-  LLVM_LIBRARY
-)
-

build_files/cmake/Modules/FindLZO.cmake

@@ -1,68 +0,0 @@
-# - Find LZO library
-# Find the native LZO includes and library
-# This module defines
-#  LZO_INCLUDE_DIRS, where to find lzo1x.h, Set when
-#                        LZO_INCLUDE_DIR is found.
-#  LZO_LIBRARIES, libraries to link against to use LZO.
-#  LZO_ROOT_DIR, The base directory to search for LZO.
-#                    This can also be an environment variable.
-#  LZO_FOUND, If false, do not try to use LZO.
-#
-# also defined, but not for general use are
-#  LZO_LIBRARY, where to find the LZO library.
-
-#=============================================================================
-# Copyright 2015 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 LZO_ROOT_DIR was defined in the environment, use it.
-IF(NOT LZO_ROOT_DIR AND NOT $ENV{LZO_ROOT_DIR} STREQUAL "")
-  SET(LZO_ROOT_DIR $ENV{LZO_ROOT_DIR})
-ENDIF()
-
-SET(_lzo_SEARCH_DIRS
-  ${LZO_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h
-  HINTS
-    ${_lzo_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(LZO_LIBRARY
-  NAMES
-    lzo2
-  HINTS
-    ${_lzo_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG
-  LZO_LIBRARY LZO_INCLUDE_DIR)
-
-IF(LZO_FOUND)
-  SET(LZO_LIBRARIES ${LZO_LIBRARY})
-  SET(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR})
-ENDIF(LZO_FOUND)
-
-MARK_AS_ADVANCED(
-  LZO_INCLUDE_DIR
-  LZO_LIBRARY
-)

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)
@@ -82,7 +81,6 @@ FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
       # Alternative would be to suffix all members of search path
       # but this is less trouble, just looks strange.
       include/opencollada/${COMPONENT}
-      include/${COMPONENT}/include
     HINTS
       ${_opencollada_SEARCH_DIRS}
     )
@@ -140,8 +138,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

@@ -8,7 +8,7 @@
 #                    This can also be an environment variable.
 #  OPENEXR_FOUND, If false, do not try to use OpenEXR.
 #
-# For individual library access these advanced settings are available
+# For indervidual library access these advanced settings are available
 #  OPENEXR_HALF_LIBRARY, Path to Half library
 #  OPENEXR_IEX_LIBRARY, Path to Half library
 #  OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
@@ -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
@@ -51,63 +48,24 @@ SET(_openexr_SEARCH_DIRS
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
-  /opt/lib/openexr
 )
 
 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
@@ -116,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)
@@ -126,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,78 +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_LIBRARY
-  OPENGLES_INCLUDE_DIR
-)
-
-UNSET(_opengles_SEARCH_DIRS)

build_files/cmake/Modules/FindOpenImageIO.cmake

@@ -7,8 +7,6 @@
 #  OPENIMAGEIO_ROOT_DIR, The base directory to search for OpenImageIO.
 #                        This can also be an environment variable.
 #  OPENIMAGEIO_FOUND, If false, do not try to use OpenImageIO.
-#  OPENIMAGEIO_PUGIXML_FOUND, Indicates whether OIIO has biltin PuguXML parser.
-#  OPENIMAGEIO_IDIFF, full path to idiff application if found.
 #
 # also defined, but not for general use are
 #  OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library.
@@ -35,7 +33,6 @@ SET(_openimageio_SEARCH_DIRS
   /sw # Fink
   /opt/local # DarwinPorts
   /opt/csw # Blastwave
-  /opt/lib/oiio
 )
 
 FIND_PATH(OPENIMAGEIO_INCLUDE_DIR
@@ -56,15 +53,6 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
     lib64 lib
   )
 
-FIND_FILE(OPENIMAGEIO_IDIFF
-  NAMES
-    idiff
-  HINTS
-    ${OPENIMAGEIO_ROOT_DIR}
-  PATH_SUFFIXES
-    bin
-)
-
 # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -74,17 +62,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG
 IF(OPENIMAGEIO_FOUND)
   SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
-  IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
-    SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
-  ENDIF()
-ELSE()
-  SET(OPENIMAGEIO_PUGIXML_FOUND FALSE)
-ENDIF()
+ENDIF(OPENIMAGEIO_FOUND)
 
 MARK_AS_ADVANCED(
   OPENIMAGEIO_INCLUDE_DIR
   OPENIMAGEIO_LIBRARY
-  OPENIMAGEIO_IDIFF
 )
-
-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/FindOpenShadingLanguage.cmake

@@ -1,98 +0,0 @@
-# - Find OpenShadingLanguage library
-# Find the native OpenShadingLanguage includes and library
-# This module defines
-#  OSL_INCLUDE_DIRS, where to find OSL headers, Set when
-#                    OSL_INCLUDE_DIR is found.
-#  OSL_LIBRARIES, libraries to link against to use OSL.
-#  OSL_ROOT_DIR, the base directory to search for OSL.
-#                This can also be an environment variable.
-#  OSL_COMPILER, full path to OSL script compiler.
-#  OSL_FOUND, if false, do not try to use OSL.
-#  OSL_LIBRARY_VERSION_MAJOR, OSL_LIBRARY_VERSION_MINOR,  the major
-#                and minor versions of OSL library if found.
-#
-#=============================================================================
-# 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.
-#=============================================================================
-
-# If OSL_ROOT_DIR was defined in the environment, use it.
-IF(NOT OSL_ROOT_DIR AND NOT $ENV{OSL_ROOT_DIR} STREQUAL "")
-  SET(OSL_ROOT_DIR $ENV{OSL_ROOT_DIR})
-ENDIF()
-
-SET(_osl_FIND_COMPONENTS
-  oslcomp
-  oslexec
-  oslquery
-)
-
-SET(_osl_SEARCH_DIRS
-  ${OSL_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/lib/osl
-)
-
-FIND_PATH(OSL_INCLUDE_DIR
-  NAMES
-    OSL/oslversion.h
-  HINTS
-    ${_osl_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-SET(_osl_LIBRARIES)
-FOREACH(COMPONENT ${_osl_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OSL_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_osl_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-  LIST(APPEND _osl_LIBRARIES "${OSL_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-FIND_PROGRAM(OSL_COMPILER oslc
-             HINTS ${_osl_SEARCH_DIRS}
-             PATH_SUFFIXES bin)
-
-# handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSL DEFAULT_MSG _osl_LIBRARIES OSL_INCLUDE_DIR OSL_COMPILER)
-
-IF(OSL_FOUND)
-  SET(OSL_LIBRARIES ${_osl_LIBRARIES})
-  SET(OSL_INCLUDE_DIRS ${OSL_INCLUDE_DIR})
-
-  FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MAJOR
-       REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+[0-9]+.*$")
-  FILE(STRINGS "${OSL_INCLUDE_DIR}/OSL/oslversion.h" OSL_LIBRARY_VERSION_MINOR
-       REGEX "^[ \t]*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+[0-9]+.*$")
-  STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MAJOR[ \t]+([.0-9]+).*"
-         "\\1" OSL_LIBRARY_VERSION_MAJOR ${OSL_LIBRARY_VERSION_MAJOR})
-  STRING(REGEX REPLACE ".*#define[ \t]+OSL_LIBRARY_VERSION_MINOR[ \t]+([.0-9]+).*"
-         "\\1" OSL_LIBRARY_VERSION_MINOR ${OSL_LIBRARY_VERSION_MINOR})
-ENDIF(OSL_FOUND)
-
-MARK_AS_ADVANCED(
-  OSL_INCLUDE_DIR
-)
-FOREACH(COMPONENT ${_osl_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-  MARK_AS_ADVANCED(OSL_${UPPERCOMPONENT}_LIBRARY)
-ENDFOREACH()

build_files/cmake/Modules/FindOpenSubdiv.cmake

@@ -1,112 +0,0 @@
-# - Find OpenSubdiv library
-# Find the native OpenSubdiv includes and library
-# This module defines
-#  OPENSUBDIV_INCLUDE_DIRS, where to find OpenSubdiv headers, Set when
-#                           OPENSUBDIV_INCLUDE_DIR is found.
-#  OPENSUBDIV_LIBRARIES, libraries to link against to use OpenSubdiv.
-#  OPENSUBDIV_ROOT_DIR, the base directory to search for OpenSubdiv.
-#                        This can also be an environment variable.
-#  OPENSUBDIV_FOUND, if false, do not try to use OpenSubdiv.
-#
-# also defined, but not for general use are
-#  OPENSUBDIV_LIBRARY, where to find the OpenSubdiv library.
-
-#=============================================================================
-# Copyright 2013 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 OPENSUBDIV_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENSUBDIV_ROOT_DIR AND NOT $ENV{OPENSUBDIV_ROOT_DIR} STREQUAL "")
-  SET(OPENSUBDIV_ROOT_DIR $ENV{OPENSUBDIV_ROOT_DIR})
-ENDIF()
-
-SET(_opensubdiv_FIND_COMPONENTS
-  osdGPU
-  osdCPU
-)
-
-SET(_opensubdiv_SEARCH_DIRS
-  ${OPENSUBDIV_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/lib/opensubdiv
-  /opt/lib/osd # install_deps.sh
-)
-
-FIND_PATH(OPENSUBDIV_INCLUDE_DIR
-  NAMES
-    opensubdiv/osd/mesh.h
-  HINTS
-    ${_opensubdiv_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-SET(_opensubdiv_LIBRARIES)
-FOREACH(COMPONENT ${_opensubdiv_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_opensubdiv_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-  LIST(APPEND _opensubdiv_LIBRARIES "${OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-MACRO(OPENSUBDIV_CHECK_CONTROLLER
-      controller_include_file
-      variable_name)
-  IF(EXISTS "${OPENSUBDIV_INCLUDE_DIR}/opensubdiv/osd/${controller_include_file}")
-    SET(${variable_name} TRUE)
-  ELSE()
-    SET(${variable_name} FALSE)
-  ENDIF()
-ENDMACRO()
-
-
-# handle the QUIETLY and REQUIRED arguments and set OPENSUBDIV_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSubdiv DEFAULT_MSG
-    _opensubdiv_LIBRARIES OPENSUBDIV_INCLUDE_DIR)
-
-IF(OPENSUBDIV_FOUND)
-  SET(OPENSUBDIV_LIBRARIES ${_opensubdiv_LIBRARIES})
-  SET(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
-
-  # Find available compute controllers.
-
-  FIND_PACKAGE(OpenMP)
-  IF(OPENMP_FOUND)
-    SET(OPENSUBDIV_HAS_OPENMP TRUE)
-  ELSE()
-    SET(OPENSUBDIV_HAS_OPENMP FALSE)
-  ENDIF()
-
-  OPENSUBDIV_CHECK_CONTROLLER("tbbEvaluator.h" OPENSUBDIV_HAS_TBB)
-  OPENSUBDIV_CHECK_CONTROLLER("clEvaluator.h" OPENSUBDIV_HAS_OPENCL)
-  OPENSUBDIV_CHECK_CONTROLLER("cudaEvaluator.h" OPENSUBDIV_HAS_CUDA)
-  OPENSUBDIV_CHECK_CONTROLLER("glXFBEvaluator.h" OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK)
-  OPENSUBDIV_CHECK_CONTROLLER("glComputeEvaluator.h" OPENSUBDIV_HAS_GLSL_COMPUTE)
-ENDIF(OPENSUBDIV_FOUND)
-
-MARK_AS_ADVANCED(
-  OPENSUBDIV_INCLUDE_DIR
-)
-FOREACH(COMPONENT ${_opensubdiv_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-  MARK_AS_ADVANCED(OPENSUBDIV_${UPPERCOMPONENT}_LIBRARY)
-ENDFOREACH()

build_files/cmake/Modules/FindOpenVDB.cmake

@@ -1,74 +0,0 @@
-# - Find OPENVDB library
-# Find the native OPENVDB includes and library
-# This module defines
-#  OPENVDB_INCLUDE_DIRS, where to find openvdb.h, Set when
-#                            OPENVDB_INCLUDE_DIR is found.
-#  OPENVDB_LIBRARIES, libraries to link against to use OPENVDB.
-#  OPENVDB_ROOT_DIR, The base directory to search for OPENVDB.
-#                        This can also be an environment variable.
-#  OPENVDB_FOUND, If false, do not try to use OPENVDB.
-#
-# also defined, but not for general use are
-#  OPENVDB_LIBRARY, where to find the OPENVDB library.
-
-#=============================================================================
-# Copyright 2015 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 OPENVDB_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENVDB_ROOT_DIR AND NOT $ENV{OPENVDB_ROOT_DIR} STREQUAL "")
-  SET(OPENVDB_ROOT_DIR $ENV{OPENVDB_ROOT_DIR})
-ENDIF()
-
-SET(_openvdb_SEARCH_DIRS
-  ${OPENVDB_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/openvdb
-  /opt/lib/openvdb
-)
-
-FIND_PATH(OPENVDB_INCLUDE_DIR
-  NAMES
-    openvdb/openvdb.h
-  HINTS
-    ${_openvdb_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(OPENVDB_LIBRARY
-  NAMES
-    openvdb
-  HINTS
-    ${_openvdb_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set OPENVDB_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENVDB DEFAULT_MSG
-    OPENVDB_LIBRARY OPENVDB_INCLUDE_DIR)
-
-IF(OPENVDB_FOUND)
-  SET(OPENVDB_LIBRARIES ${OPENVDB_LIBRARY})
-  SET(OPENVDB_INCLUDE_DIRS ${OPENVDB_INCLUDE_DIR})
-ENDIF(OPENVDB_FOUND)
-
-MARK_AS_ADVANCED(
-  OPENVDB_INCLUDE_DIR
-  OPENVDB_LIBRARY
-)
-
-UNSET(_openvdb_SEARCH_DIRS)

build_files/cmake/Modules/FindPCRE.cmake

@@ -40,6 +40,7 @@ FIND_PATH(PCRE_INCLUDE_DIR pcre.h
     ${_pcre_SEARCH_DIRS}
   PATH_SUFFIXES
     include
+    include
 )
 
 FIND_LIBRARY(PCRE_LIBRARY

build_files/cmake/Modules/FindPugiXML.cmake

@@ -1,73 +0,0 @@
-# - Find PugiXML library
-# Find the native PugiXML includes and library
-# This module defines
-#  PUGIXML_INCLUDE_DIRS, where to find pugixml.hpp, Set when
-#                        PugiXML is found.
-#  PUGIXML_LIBRARIES, libraries to link against to use PugiiXML.
-#  PUGIXML_ROOT_DIR, The base directory to search for PugiXML.
-#                    This can also be an environment variable.
-#  PUGIXML_FOUND, If false, do not try to use PugiXML.
-#
-# also defined, but not for general use are
-#  PUGIXML_LIBRARY, where to find the PugiXML library.
-
-#=============================================================================
-# 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.
-#=============================================================================
-
-# If PUGIXML_ROOT_DIR was defined in the environment, use it.
-IF(NOT PUGIXML_ROOT_DIR AND NOT $ENV{PUGIXML_ROOT_DIR} STREQUAL "")
-  SET(PUGIXML_ROOT_DIR $ENV{PUGIXML_ROOT_DIR})
-ENDIF()
-
-SET(_pugixml_SEARCH_DIRS
-  ${PUGIXML_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/lib/oiio
-)
-
-FIND_PATH(PUGIXML_INCLUDE_DIR
-  NAMES
-    pugixml.hpp
-  HINTS
-    ${_pugixml_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(PUGIXML_LIBRARY
-  NAMES
-    pugixml
-  HINTS
-    ${_pugixml_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PUGIXML DEFAULT_MSG
-    PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)
-
-IF(PUGIXML_FOUND)
-  SET(PUGIXML_LIBRARIES ${PUGIXML_LIBRARY})
-  SET(PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR})
-ELSE()
-  SET(PUGIXML_PUGIXML_FOUND FALSE)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  PUGIXML_INCLUDE_DIR
-  PUGIXML_LIBRARY
-)

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -2,19 +2,15 @@
 # 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_SITE_PACKAGES, Used for installation (as a Python module)
 #  PYTHON_LINKFLAGS
 #  PYTHON_ROOT_DIR, The base directory to search for Python.
 #                   This can also be an environment variable.
@@ -38,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.5 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)
 
 
@@ -50,40 +46,30 @@ 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()
 
-STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
-
-SET(_python_SEARCH_DIRS
-  ${PYTHON_ROOT_DIR}
-  "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
-  "/opt/py${_PYTHON_VERSION_NO_DOTS}"
-  "/opt/lib/python-${PYTHON_VERSION}"
-)
 
 # 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})
 
+  SET(_python_SEARCH_DIRS
+    ${PYTHON_ROOT_DIR}
+    "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
+    "/opt/py${_PYTHON_VERSION_NO_DOTS}"
+  )
 
   FOREACH(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS})
     #IF(CMAKE_BUILD_TYPE STREQUAL Debug)
@@ -99,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
@@ -131,39 +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)
-      SET(_PYTHON_ABI_FLAGS "${_CURRENT_ABI_FLAGS}")
+    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()
 
@@ -171,59 +116,32 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_
   UNSET(_CURRENT_PATH)
 
   UNSET(_python_ABI_FLAGS)
+  UNSET(_python_SEARCH_DIRS)
 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})
 
-  FIND_FILE(PYTHON_SITE_PACKAGES
-    NAMES
-      # debian specific
-      dist-packages
-      site-packages
-    HINTS
-      ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
-  )
-
   # we need this for installation
-  # XXX No more valid with debian-like py3.5 packages...
-#  GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
+  GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
 
-  # not required for build, just used when bundling Python.
-  FIND_PROGRAM(
-    PYTHON_EXECUTABLE
-    NAMES
-      "python${PYTHON_VERSION}${_PYTHON_ABI_FLAGS}"
-      "python${PYTHON_VERSION}"
-      "python"
-    HINTS
-      ${_python_SEARCH_DIRS}
-    PATH_SUFFIXES bin
-  )
+  # not used
+  # SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
 ENDIF()
 
-UNSET(_PYTHON_VERSION_NO_DOTS)
-UNSET(_PYTHON_ABI_FLAGS)
-UNSET(_python_SEARCH_DIRS)
-
 MARK_AS_ADVANCED(
   PYTHON_INCLUDE_DIR
-  PYTHON_INCLUDE_CONFIG_DIR
   PYTHON_LIBRARY
-  PYTHON_LIBPATH
-  PYTHON_SITE_PACKAGES
-  PYTHON_EXECUTABLE
 )

build_files/cmake/Modules/FindSDL2.cmake

@@ -1,72 +0,0 @@
-# - Find SDL library
-# Find the native SDL includes and library
-# This module defines
-#  SDL2_INCLUDE_DIRS, where to find SDL.h, Set when SDL2_INCLUDE_DIR is found.
-#  SDL2_LIBRARIES, libraries to link against to use SDL.
-#  SDL2_ROOT_DIR, The base directory to search for SDL.
-#                This can also be an environment variable.
-#  SDL2_FOUND, If false, do not try to use SDL.
-#
-# also defined, but not for general use are
-#  SDL2_LIBRARY, where to find the SDL library.
-
-#=============================================================================
-# Copyright 2015 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 SDL2_ROOT_DIR was defined in the environment, use it.
-IF(NOT SDL2_ROOT_DIR AND NOT $ENV{SDL2_ROOT_DIR} STREQUAL "")
-  SET(SDL2_ROOT_DIR $ENV{SDL2_ROOT_DIR})
-ENDIF()
-
-SET(_sdl2_SEARCH_DIRS
-  ${SDL2_ROOT_DIR}
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-FIND_PATH(SDL2_INCLUDE_DIR
-  NAMES
-  SDL.h
-  HINTS
-    ${_sdl2_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include/SDL2 include
-)
-
-FIND_LIBRARY(SDL2_LIBRARY
-  NAMES
-  SDL2
-  HINTS
-    ${_sdl2_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set SDL2_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 DEFAULT_MSG
-    SDL2_LIBRARY SDL2_INCLUDE_DIR)
-
-IF(SDL2_FOUND)
-  SET(SDL2_LIBRARIES ${SDL2_LIBRARY})
-  SET(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
-ENDIF(SDL2_FOUND)
-
-MARK_AS_ADVANCED(
-  SDL2_INCLUDE_DIR
-  SDL2_LIBRARY
-)

build_files/cmake/Modules/FindTBB.cmake

@@ -1,73 +0,0 @@
-# - Find TBB library
-# Find the native TBB includes and library
-# This module defines
-#  TBB_INCLUDE_DIRS, where to find tbb.h, Set when
-#                    TBB is found.
-#  TBB_LIBRARIES, libraries to link against to use TBB.
-#  TBB_ROOT_DIR, The base directory to search for TBB.
-#                This can also be an environment variable.
-#  TBB_FOUND, If false, do not try to use TBB.
-#
-# also defined, but not for general use are
-#  TBB_LIBRARY, where to find the TBB library.
-
-#=============================================================================
-# Copyright 2016 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 TBB_ROOT_DIR was defined in the environment, use it.
-IF(NOT TBB_ROOT_DIR AND NOT $ENV{TBB_ROOT_DIR} STREQUAL "")
-  SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR})
-ENDIF()
-
-SET(_tbb_SEARCH_DIRS
-  ${TBB_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt/lib/tbb
-)
-
-FIND_PATH(TBB_INCLUDE_DIR
-  NAMES
-    tbb/tbb.h
-  HINTS
-    ${_tbb_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(TBB_LIBRARY
-  NAMES
-    tbb
-  HINTS
-    ${_tbb_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set TBB_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB DEFAULT_MSG
-    TBB_LIBRARY TBB_INCLUDE_DIR)
-
-IF(TBB_FOUND)
-  SET(TBB_LIBRARIES ${TBB_LIBRARY})
-  SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
-ELSE()
-  SET(TBB_TBB_FOUND FALSE)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  TBB_INCLUDE_DIR
-  TBB_LIBRARY
-)

build_files/cmake/Modules/GTestTesting.cmake

@@ -1,61 +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_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
-	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/glog/src
-			${CMAKE_SOURCE_DIR}/extern/gflags/src
-			${CMAKE_SOURCE_DIR}/extern/gtest/include
-		)
-		unset(_current_include_directories)
-
-		add_executable(${NAME}_test ${SRC})
-		target_link_libraries(${NAME}_test
-		                      ${EXTRA_LIBS}
-		                      ${PLATFORM_LINKLIBS}
-		                      bf_testing_main
-		                      bf_intern_guardedalloc
-		                      extern_gtest
-		                      # needed for glog
-		                      ${PTHREADS_LIBRARIES}
-		                      extern_glog
-		                      extern_gflags)
-		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}")
-		if(${DO_ADD_TEST})
-			add_test(${NAME}_test ${TESTS_OUTPUT_DIR}/${NAME}_test)
-		endif()
-	endif()
-endmacro()
-
-macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
-	BLENDER_SRC_GTEST_EX("${NAME}" "${SRC}" "${EXTRA_LIBS}" "TRUE")
-endmacro()
-
-macro(BLENDER_TEST NAME EXTRA_LIBS)
-	BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "TRUE")
-endmacro()
-
-macro(BLENDER_TEST_PERFORMANCE NAME EXTRA_LIBS)
-	BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "FALSE")
-endmacro()

build_files/cmake/buildinfo.cmake

@@ -1,132 +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)
-	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
-		                ERROR_QUIET)
-		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)
+# 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()
-
-	execute_process(COMMAND git log -1 --format=%ct
-	                WORKING_DIRECTORY ${SOURCE_DIR}
-	                OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
-	                OUTPUT_STRIP_TRAILING_WHITESPACE)
-	# May fail in rare cases
-	if(MY_WC_COMMIT_TIMESTAMP STREQUAL "")
-		set(MY_WC_COMMIT_TIMESTAMP 0)
-	endif()
-
-	# 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)
 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)
@@ -136,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 python
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -28,17 +28,13 @@ if not sys.version.startswith("3"):
           sys.version.partition(" ")[0])
     sys.exit(1)
 
-from cmake_consistency_check_config import (
-        IGNORE,
-        UTF8_CHECK,
-        SOURCE_DIR,
-        BUILD_DIR,
-        )
-
+from cmake_consistency_check_config import IGNORE, UTF8_CHECK, SOURCE_DIR
 
 import os
 from os.path import join, dirname, normpath, splitext
 
+print("Scanning:", SOURCE_DIR)
+
 global_h = set()
 global_c = set()
 global_refs = {}
@@ -62,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
 
@@ -79,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):
@@ -138,7 +134,6 @@ def cmake_get_src(f):
 
         if found:
             cmake_base = dirname(f)
-            cmake_base_bin = os.path.join(BUILD_DIR, os.path.relpath(cmake_base, SOURCE_DIR))
 
             while it is not None:
                 i += 1
@@ -159,8 +154,6 @@ def cmake_get_src(f):
 
                     # replace dirs
                     l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
-                    l = l.replace("${CMAKE_CURRENT_BINARY_DIR}", cmake_base_bin)
-                    l = l.strip('"')
 
                     if not l:
                         pass
@@ -181,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"):
@@ -194,26 +187,21 @@ def cmake_get_src(f):
                                 pass
                             elif new_file.endswith(".osl"):  # open shading language
                                 pass
-                            elif new_file.endswith(".glsl"):
-                                pass
                             else:
                                 raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
 
                         elif context_name == "INC":
-                            if new_file.startswith(BUILD_DIR):
-                                # assume generated path
-                                pass
-                            elif os.path.isdir(new_file):
+                            if os.path.isdir(new_file):
                                 new_path_rel = os.path.relpath(new_file, cmake_base)
 
                                 if new_path_rel != l:
                                     print("overly relative path:\n  %s:%d\n  %s\n  %s" % (f, i, l, new_path_rel))
 
-                                    # # Save time. just replace the line
+                                    ## Save time. just replace the line
                                     # 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)
 
@@ -234,105 +222,90 @@ def cmake_get_src(f):
             '''
 
             # reset
-            del sources_h[:]
-            del sources_c[:]
+            sources_h[:] = []
+            sources_c[:] = []
 
     filen.close()
 
 
-def is_ignore(f, ignore_used):
-    for index, ig in enumerate(IGNORE):
+for cmake in source_list(SOURCE_DIR, is_cmake):
+    cmake_get_src(cmake)
+
+
+def is_ignore(f):
+    for ig in IGNORE:
         if ig in f:
-            ignore_used[index] = True
             return True
     return False
 
 
-def main():
+# First do stupid check, do these files exist?
+print("\nChecking for missing references:")
+is_err = False
+errs = []
+for f in (global_h | global_c):
+    if f.endswith("dna.c"):
+        continue
 
-    print("Scanning:", SOURCE_DIR)
+    if not os.path.exists(f):
+        refs = global_refs[f]
+        if refs:
+            for cf, i in refs:
+                errs.append((cf, i))
+        else:
+            raise Exception("CMake referenecs missing, internal error, aborting!")
+        is_err = True
 
-    for cmake in source_list(SOURCE_DIR, is_cmake):
-        cmake_get_src(cmake)
-
-    # First do stupid check, do these files exist?
-    print("\nChecking for missing references:")
-    is_err = False
-    errs = []
-    for f in (global_h | global_c):
-        if f.startswith(BUILD_DIR):
-            continue
-
-        if not os.path.exists(f):
-            refs = global_refs[f]
-            if refs:
-                for cf, i in refs:
-                    errs.append((cf, i))
-            else:
-                raise Exception("CMake referenecs missing, internal error, aborting!")
-            is_err = True
-
-    errs.sort()
-    errs.reverse()
-    for cf, i in errs:
-        print("%s:%d" % (cf, i))
-        # Write a 'sed' script, useful if we get a lot of these
-        # print("sed '%dd' '%s' > '%s.tmp' ; mv '%s.tmp' '%s'" % (i, cf, cf, cf, cf))
-
-    if is_err:
-        raise Exception("CMake referenecs missing files, aborting!")
-    del is_err
-    del errs
-
-    ignore_used = [False] * len(IGNORE)
-
-    # now check on files not accounted for.
-    print("\nC/C++ Files CMake doesnt know about...")
-    for cf in sorted(source_list(SOURCE_DIR, is_c)):
-        if not is_ignore(cf, ignore_used):
-            if cf not in global_c:
-                print("missing_c: ", cf)
-
-            # check if automake builds a corrasponding .o file.
-            '''
-            if cf in global_c:
-                out1 = os.path.splitext(cf)[0] + ".o"
-                out2 = os.path.splitext(cf)[0] + ".Po"
-                out2_dir, out2_file = out2 = os.path.split(out2)
-                out2 = os.path.join(out2_dir, ".deps", out2_file)
-                if not os.path.exists(out1) and not os.path.exists(out2):
-                    print("bad_c: ", cf)
-            '''
-
-    print("\nC/C++ Headers CMake doesnt know about...")
-    for hf in sorted(source_list(SOURCE_DIR, is_c_header)):
-        if not is_ignore(hf, ignore_used):
-            if hf not in global_h:
-                print("missing_h: ", hf)
-
-    if UTF8_CHECK:
-        # test encoding
-        import traceback
-        for files in (global_c, global_h):
-            for f in sorted(files):
-                if os.path.exists(f):
-                    # ignore outside of our source tree
-                    if "extern" not in f:
-                        i = 1
-                        try:
-                            for l in open(f, "r", encoding="utf8"):
-                                i += 1
-                        except UnicodeDecodeError:
-                            print("Non utf8: %s:%d" % (f, i))
-                            if i > 1:
-                                traceback.print_exc()
-
-    # Check ignores aren't stale
-    print("\nCheck for unused 'IGNORE' paths...")
-    for index, ig in enumerate(IGNORE):
-        if not ignore_used[index]:
-            print("unused ignore: %r" % ig)
+errs.sort()
+errs.reverse()
+for cf, i in errs:
+    print("%s:%d" % (cf, i))
+    # Write a 'sed' script, useful if we get a lot of these
+    # print("sed '%dd' '%s' > '%s.tmp' ; mv '%s.tmp' '%s'" % (i, cf, cf, cf, cf))
 
 
-if __name__ == "__main__":
-    main()
+if is_err:
+    raise Exception("CMake referenecs missing files, aborting!")
+del is_err
+del errs
+
+# now check on files not accounted for.
+print("\nC/C++ Files CMake doesnt know about...")
+for cf in sorted(source_list(SOURCE_DIR, is_c)):
+    if not is_ignore(cf):
+        if cf not in global_c:
+            print("missing_c: ", cf)
+
+        # check if automake builds a corrasponding .o file.
+        '''
+        if cf in global_c:
+            out1 = os.path.splitext(cf)[0] + ".o"
+            out2 = os.path.splitext(cf)[0] + ".Po"
+            out2_dir, out2_file = out2 = os.path.split(out2)
+            out2 = os.path.join(out2_dir, ".deps", out2_file)
+            if not os.path.exists(out1) and not os.path.exists(out2):
+                print("bad_c: ", cf)
+        '''
+
+print("\nC/C++ Headers CMake doesnt know about...")
+for hf in sorted(source_list(SOURCE_DIR, is_c_header)):
+    if not is_ignore(hf):
+        if hf not in global_h:
+            print("missing_h: ", hf)
+
+if UTF8_CHECK:
+    # test encoding
+    import traceback
+    for files in (global_c, global_h):
+        for f in sorted(files):
+            if os.path.exists(f):
+                # ignore outside of our source tree
+                if "extern" not in f:
+                    i = 1
+                    try:
+                        for l in open(f, "r", encoding="utf8"):
+                            i += 1
+                    except:
+                        print("Non utf8: %s:%d" % (f, i))
+                        if i > 1:
+                            traceback.print_exc()

build_files/cmake/cmake_consistency_check_config.py

@@ -2,10 +2,18 @@ import os
 
 IGNORE = (
     "/test/",
-    "/tests/gtests/",
+    "/decimate_glut_test/",
+    "/BSP_GhostTest/",
     "/release/",
+    "/xembed/",
+    "/decimation/intern/future/",
+    "/TerraplayNetwork/",
+    "/ik_glut_test/",
 
     # specific source files
+    "extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp",
+    "extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp",
+    "extern/Eigen2/Eigen/src/QR/QrInstantiations.cpp",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp",
@@ -14,6 +22,13 @@ IGNORE = (
     "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp",
+    "extern/eltopo/common/meshes/ObjLoader.cpp",
+    "extern/eltopo/common/meshes/meshloader.cpp",
+    "extern/eltopo/common/openglutils.cpp",
+    "extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp",
+    "source/blender/imbuf/intern/imbuf_cocoa.m",
+    "extern/recastnavigation/Recast/Source/RecastLog.cpp",
+    "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
     "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
 
@@ -25,10 +40,13 @@ IGNORE = (
     "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
-    "extern/carve/include/carve/config.h",
-    "extern/carve/include/carve/random/random.h",
-    "extern/carve/patches/files/config.h",
-    "extern/carve/patches/files/random.h",
+    "extern/eltopo/common/meshes/Edge.hpp",
+    "extern/eltopo/common/meshes/ObjLoader.hpp",
+    "extern/eltopo/common/meshes/TriangleIndex.hpp",
+    "extern/eltopo/common/meshes/meshloader.h",
+    "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
+    "extern/recastnavigation/Recast/Include/RecastLog.h",
+    "extern/recastnavigation/Recast/Include/RecastTimer.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
     )
@@ -36,6 +54,3 @@ IGNORE = (
 UTF8_CHECK = True
 
 SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", ".."))))
-
-# doesn't have to exist, just use as reference
-BUILD_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(SOURCE_DIR, "..", "build"))))

build_files/cmake/cmake_netbeans_project.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -24,32 +24,23 @@
 
 """
 Example linux usage
- python3 ~/blender-git/blender/build_files/cmake/cmake_netbeans_project.py ~/blender-git/cmake
+ python .~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
 
 Windows not supported so far
 """
 
-import sys
-
-# until we have arg parsing
-import project_info
-if not project_info.init(sys.argv[-1]):
-    sys.exit(1)
-
-from project_info import (
-        SIMPLE_PROJECTFILE,
-        SOURCE_DIR,
-        CMAKE_DIR,
-        PROJECT_DIR,
-        source_list,
-        is_project_file,
-        is_c_header,
-        # is_py,
-        cmake_advanced_info,
-        cmake_compiler_defines,
-        cmake_cache_var,
-        project_name_get,
-        )
+from project_info import (SIMPLE_PROJECTFILE,
+                          SOURCE_DIR,
+                          CMAKE_DIR,
+                          PROJECT_DIR,
+                          source_list,
+                          is_project_file,
+                          is_c_header,
+                          # is_py,
+                          cmake_advanced_info,
+                          cmake_compiler_defines,
+                          project_name_get,
+                          )
 
 
 import os
@@ -57,8 +48,6 @@ from os.path import join, dirname, normpath, relpath, exists
 
 
 def create_nb_project_main():
-    from xml.sax.saxutils import escape
-
     files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
     files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
     files_rel.sort()
@@ -67,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()
@@ -78,11 +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()
-
-        make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
-        make_exe_basename = os.path.basename(make_exe)
+            # 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]
@@ -119,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')
@@ -132,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="95">\n')
+        f.write('<configurationDescriptor version="79">\n')
         f.write('  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">\n')
-        f.write('    <df root="%s" name="0">\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]
@@ -164,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:
@@ -197,28 +174,16 @@ 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('        <dependencyChecking>false</dependencyChecking>\n')
-        f.write('        <rebuildPropChanged>false</rebuildPropChanged>\n')
         f.write('      </toolsSet>\n')
-        f.write('      <codeAssistance>\n')
-        f.write('      </codeAssistance>\n')
         f.write('      <makefileType>\n')
 
         f.write('        <makeTool>\n')
         f.write('          <buildCommandWorkingDir>.</buildCommandWorkingDir>\n')
-
-        if make_exe_basename == "ninja":
-            build_cmd = "ninja"
-            clean_cmd = "ninja -t clean"
-        else:
-            build_cmd = "${MAKE} -f Makefile"
-            clean_cmd = "${MAKE} -f Makefile clean"
-
-        f.write('          <buildCommand>%s</buildCommand>\n' % escape(build_cmd))
-        f.write('          <cleanCommand>%s</cleanCommand>\n' % escape(clean_cmd))
+        f.write('          <buildCommand>${MAKE} -f Makefile</buildCommand>\n')
+        f.write('          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>\n')
         f.write('          <executablePath>./bin/blender</executablePath>\n')
-        del build_cmd, clean_cmd
 
         def write_toolinfo():
             f.write('            <incDir>\n')
@@ -227,7 +192,7 @@ def create_nb_project_main():
             f.write('            </incDir>\n')
             f.write('            <preprocessorList>\n')
             for cdef in defines:
-                f.write('              <Elem>%s</Elem>\n' % escape(cdef))
+                f.write('              <Elem>%s</Elem>\n' % cdef)
             f.write('            </preprocessorList>\n')
 
         f.write('          <cTool>\n')
@@ -245,11 +210,10 @@ def create_nb_project_main():
         f.write('    \n')
 
         for path in files_rel_local:
-            is_c = path.endswith(".c")
             f.write('      <item path="%s"\n' % path)
             f.write('            ex="false"\n')
-            f.write('            tool="%d"\n' % (0 if is_c else 1))
-            f.write('            flavor2="%d">\n' % (3 if is_c else 0))
+            f.write('            tool="1"\n')
+            f.write('            flavor="0">\n')
             f.write('      </item>\n')
 
         f.write('      <runprofile version="9">\n')
@@ -271,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 python
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -22,16 +22,29 @@
 
 # <pep8 compliant>
 
-r"""
-Example Linux usage:
- python ~/blender-git/blender/build_files/cmake/cmake_qtcreator_project.py --build-dir ~/blender-git/cmake
-
+"""
 Example Win32 usage:
- c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py --build-dir c:\blender_dev\cmake_build
+ 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
 """
 
+from project_info import (SIMPLE_PROJECTFILE,
+                          SOURCE_DIR,
+                          # CMAKE_DIR,
+                          PROJECT_DIR,
+                          source_list,
+                          is_project_file,
+                          is_c_header,
+                          is_py,
+                          cmake_advanced_info,
+                          cmake_compiler_defines,
+                          project_name_get,
+                          )
 
 import os
+import sys
 
 
 def quote_define(define):
@@ -41,20 +54,7 @@ def quote_define(define):
         return define
 
 
-def create_qtc_project_main(name):
-    from project_info import (
-            SIMPLE_PROJECTFILE,
-            SOURCE_DIR,
-            # CMAKE_DIR,
-            PROJECT_DIR,
-            source_list,
-            is_project_file,
-            is_c_header,
-            cmake_advanced_info,
-            cmake_compiler_defines,
-            project_name_get,
-            )
-
+def create_qtc_project_main():
     files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
     files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
     files_rel.sort()
@@ -62,138 +62,90 @@ def create_qtc_project_main(name):
     # --- qtcreator specific, simple format
     if SIMPLE_PROJECTFILE:
         # --- qtcreator specific, simple format
-        PROJECT_NAME = name or "Blender"
-        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))
+        PROJECT_NAME = "Blender"
+        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" % FILE_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" % FILE_NAME)
-        with open(qtc_prj, 'w') as f:
-            f.write("[General]\n")
+        qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
+        f = open(qtc_prj, 'w')
+        f.write("[General]\n")
 
-        qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
+        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)))
         includes.sort()
 
-        # be tricky, get the project name from CMake if we can!
-        PROJECT_NAME = name or project_name_get()
+        if 0:
+            PROJECT_NAME = "Blender"
+        else:
+            # 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 os.name != "nt":
-                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
 
 
-def create_qtc_project_python(name):
-    from project_info import (
-            SOURCE_DIR,
-            # CMAKE_DIR,
-            PROJECT_DIR,
-            source_list,
-            is_py,
-            project_name_get,
-            )
-
+def create_qtc_project_python():
     files = list(source_list(SOURCE_DIR, filename_check=is_py))
     files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
     files_rel.sort()
 
     # --- qtcreator specific, simple format
-    # be tricky, get the project name from git if we can!
-    PROJECT_NAME = (name or project_name_get()) + "_Python"
+    if 0:
+        PROJECT_NAME = "Blender_Python"
+    else:
+        # 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)
 
 
-def argparse_create():
-    import argparse
-
-    parser = argparse.ArgumentParser(
-            description="This script generates Qt Creator project files for Blender",
-            )
-
-    parser.add_argument(
-            "-n", "--name",
-            dest="name",
-            metavar='NAME', type=str,
-            help="Override default project name (\"Blender\")",
-            required=False,
-            )
-
-    parser.add_argument(
-            "-b", "--build-dir",
-            dest="build_dir",
-            metavar='BUILD_DIR', type=str,
-            help="Specify the build path (or fallback to the $PWD)",
-            required=False,
-            )
-
-    return parser
-
-
 def main():
-    parser = argparse_create()
-    args = parser.parse_args()
-    name = args.name
-
-    import project_info
-    if not project_info.init(args.build_dir):
-        return
-
-    create_qtc_project_main(name)
-    create_qtc_project_python(name)
+    create_qtc_project_main()
+    create_qtc_project_python()
 
 
 if __name__ == "__main__":

build_files/cmake/cmake_static_check_clang_array.py

@@ -1,85 +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",
-    ]
-
-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 python
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -27,8 +27,6 @@ import subprocess
 import sys
 import os
 
-USE_QUIET = (os.environ.get("QUIET", None) is not None)
-
 CHECKER_IGNORE_PREFIX = [
     "extern",
     "intern/moto",
@@ -39,41 +37,35 @@ CHECKER_BIN = "cppcheck"
 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
+	"--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+    # "--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)
 
@@ -82,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,79 +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",
-    ]
-
-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 python
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -34,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 python
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -67,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():
@@ -78,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,76 +0,0 @@
-# Turn everything ON thats expected for an official release builds.
-#
-# 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_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
-set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
-set(WITH_LIBMV_SCHUR_SPECIALIZATIONS 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_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_OPENVDB             ON  CACHE BOOL "" FORCE)
-set(WITH_OPENVDB_BLOSC       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)
-
-
-# platform dependant options
-if(UNIX AND NOT APPLE)
-	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-	set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
-	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
-elseif(WIN32)
-	set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-	if(NOT CMAKE_COMPILER_IS_GNUCC)
-		set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
-	else()
-		# MinGW exceptions
-		set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-		set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
-		set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
-	endif()
-elseif(APPLE)
-	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
-	set(WITH_OPENSUBDIV          OFF 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,44 @@
 #   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_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
-set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
-set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
-set(WITH_LLVM                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_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_OPENVDB             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_BUILDINFO           OFF CACHE FORCE BOOL)
+set(WITH_BUILTIN_GLEW        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_CARVE               OFF CACHE FORCE BOOL)
+set(WITH_GAMEENGINE          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,31 +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_OPENVDB             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 python
 
 # ##### BEGIN GPL LICENSE BLOCK #####
 #

build_files/cmake/packaging.cmake

@@ -1,7 +1,8 @@
 set(PROJECT_DESCRIPTION  "Blender is a very fast and versatile 3D modeller/renderer.")
-set(PROJECT_COPYRIGHT    "Copyright (C) 2001-2012 Blender Foundation")
+set(PROJECT_COPYRIGHT    "Copyright (C) 2001-2011 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,37 +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/)
-	find_package(Git)
-	if(GIT_FOUND)
-		message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-		execute_process(COMMAND git rev-parse --short HEAD
-		                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		                OUTPUT_VARIABLE MY_WC_HASH
-		                OUTPUT_STRIP_TRAILING_WHITESPACE
-		                ERROR_QUIET)
+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)
-string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR})
+set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${BLENDER_VERSION}-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()
@@ -63,26 +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}/release/windows/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}/release/windows/icons/winblender.ico)
-	set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
-
-	set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template)
-	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
@@ -97,26 +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()
 
-unset(MAJOR_VERSION)
-unset(MINOR_VERSION)
-unset(PATCH_VERSION)
-
-unset(BUILD_REV)
-

build_files/cmake/project_info.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -23,9 +23,11 @@
 # <pep8 compliant>
 
 """
-Module for accessing project file data for Blender.
+Example Win32 usage:
+ c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
 
-Before use, call init(cmake_build_dir).
+example linux usage
+ python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
 """
 
 __all__ = (
@@ -40,7 +42,6 @@ __all__ = (
     "cmake_advanced_info",
     "cmake_compiler_defines",
     "project_name_get"
-    "init",
 )
 
 
@@ -60,26 +61,19 @@ SOURCE_DIR = abspath(SOURCE_DIR)
 
 SIMPLE_PROJECTFILE = False
 
-# must initialize from 'init'
-CMAKE_DIR = None
+# get cmake path
+CMAKE_DIR = sys.argv[-1]
+
+if not exists(join(CMAKE_DIR, "CMakeCache.txt")):
+    CMAKE_DIR = os.getcwd()
+if not exists(join(CMAKE_DIR, "CMakeCache.txt")):
+    print("CMakeCache.txt not found in %r or %r\n    Pass CMake build dir as an argument, or run from that dir, aborting" % (CMAKE_DIR, os.getcwd()))
+    sys.exit(1)
 
 
-def init(cmake_path):
-    global CMAKE_DIR, PROJECT_DIR
-
-    # get cmake path
-    cmake_path = cmake_path or ""
-
-    if (not cmake_path) or (not exists(join(cmake_path, "CMakeCache.txt"))):
-        cmake_path = os.getcwd()
-    if not exists(join(cmake_path, "CMakeCache.txt")):
-        print("CMakeCache.txt not found in %r or %r\n"
-              "    Pass CMake build dir as an argument, or run from that dir, aborting" %
-              (cmake_path, os.getcwd()))
-        return False
-
-    PROJECT_DIR = CMAKE_DIR = cmake_path
-    return True
+# could be either.
+# PROJECT_DIR = SOURCE_DIR
+PROJECT_DIR = CMAKE_DIR
 
 
 def source_list(path, filename_check=None):
@@ -103,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):
@@ -118,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):
@@ -136,38 +130,25 @@ def is_project_file(filename):
 
 
 def cmake_advanced_info():
-    """ Extract includes and defines from cmake.
+    """ 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')
@@ -245,5 +226,21 @@ 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
+    info = subprocess.Popen(["svn", "info", path],
+                            stdout=subprocess.PIPE).communicate()[0]
+    # 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):
@@ -59,21 +59,14 @@ def is_c_any(filename):
 CMAKE_DIR = "."
 
 
-def cmake_cache_var_iter():
-    import re
-    re_cache = re.compile(r'([A-Za-z0-9_\-]+)?:?([A-Za-z0-9_\-]+)?=(.*)$')
-    with open(join(CMAKE_DIR, "CMakeCache.txt"), 'r', encoding='utf-8') as cache_file:
-        for l in cache_file:
-            match = re_cache.match(l.strip())
-            if match is not None:
-                var, type_, val = match.groups()
-                yield (var, type_ or "", val)
-
-
 def cmake_cache_var(var):
-    for var_iter, type_iter, value_iter in cmake_cache_var_iter():
-        if var == var_iter:
-            return value_iter
+    cache_file = open(join(CMAKE_DIR, "CMakeCache.txt"))
+    lines = [l_strip for l in cache_file for l_strip in (l.strip(),) if l_strip if not l_strip.startswith("//") if not l_strip.startswith("#")]
+    cache_file.close()
+
+    for l in lines:
+        if l.split(":")[0] == var:
+            return l.split("=", 1)[-1]
     return None
 
 
@@ -89,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)
@@ -162,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):
@@ -178,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/build_archive.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 # <pep8 compliant>
 

build_files/package_spec/pacman/PKGBUILD

@@ -12,12 +12,12 @@ blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blen
 # map the version a -> 1
 # not to be confused with blender's internal subversions
 if [ "$blender_version_char" ]; then
-  blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
+    blender_version_full=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
 else
-  blender_version_full=${blender_version}
+	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
 }
@@ -60,7 +64,7 @@ package() {
   cd $srcdir/build
   make DESTDIR="$pkgdir" install
   python -m compileall \
-  $pkgdir/usr/share/blender/$blender_version/scripts/startup \
-  $pkgdir/usr/share/blender/$blender_version/scripts/modules \
-  $pkgdir/usr/share/blender/$blender_version/scripts/addons
+	$pkgdir/usr/share/blender/$blender_version/scripts/startup \
+	$pkgdir/usr/share/blender/$blender_version/scripts/modules \
+	$pkgdir/usr/share/blender/$blender_version/scripts/addons
 }

build_files/package_spec/rpm/blender.spec.in

@@ -1,11 +1,5 @@
 # -*- rpm-spec -*-
 %global __python %{__python3}
-%global blender_api @CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@
-
-%define _rpmdir @CPACK_RPM_DIRECTORY@
-%define _rpmfilename @CPACK_RPM_FILE_NAME@
-%define _unpackaged_files_terminate_build 0
-%define _topdir @CPACK_RPM_DIRECTORY@
 
 BuildRoot:      @CPACK_RPM_DIRECTORY@/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
 Summary:        @CPACK_RPM_PACKAGE_SUMMARY@
@@ -15,17 +9,12 @@ Release:        @CPACK_RPM_PACKAGE_RELEASE@%{?dist}
 License:        @CPACK_RPM_PACKAGE_LICENSE@
 Group:          @CPACK_RPM_PACKAGE_GROUP@
 Vendor:         @CPACK_RPM_PACKAGE_VENDOR@
-Epoch:          1
+Epoch:         1
 
-Requires(post):   desktop-file-utils
-Requires(post):   shared-mime-info
-Requires(postun): desktop-file-utils
-Requires(postun): shared-mime-info
-
-Provides:         blender(ABI) = %{blender_api}
-Provides:         blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}
-
-Obsoletes:        blender-fonts <= 2.49a-9
+%define _rpmdir @CPACK_RPM_DIRECTORY@
+%define _rpmfilename @CPACK_RPM_FILE_NAME@
+%define _unpackaged_files_terminate_build 0
+%define _topdir @CPACK_RPM_DIRECTORY@
 
 %description
 Blender is an integrated 3d suite for modelling, animation, rendering,
@@ -51,10 +40,6 @@ then
 fi
 mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" ${RPM_BUILD_ROOT}
 
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/blender-thumbnailer.py
-
-%find_lang %{name}
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -72,17 +57,14 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi || :
 
-%files -f blender.lang
+%files
 %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}/%{name}/@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/doc/%{name}
-%{_mandir}/man1/%{name}.*
+%{_datadir}/doc/blender
+%{_mandir}/man1/blender.*
 
 %changelog
 @CPACK_RPM_SPEC_CHANGELOG@

build_files/scons/config/darwin-config.py

@@ -0,0 +1,405 @@
+#
+# 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
+
+# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
+USE_SDK=True
+
+#############################################################################
+###################     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'
+cmd = 'xcodebuild -version'
+cmd_xcode=commands.getoutput(cmd)
+XCODE_CUR_VER=cmd_xcode
+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'
+    else:
+        # 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'
+
+LIBDIR = '${LCGDIR}'
+
+#############################################################################
+###################          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.endswith('4.6.1'):
+    WITH_BF_OPENMP = True  # multithreading for fluids, cloth, sculpt and smoke
+else:
+    WITH_BF_OPENMP = False
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+BF_FFMPEG = LIBDIR + '/ffmpeg'
+BF_FFMPEG_INC = "${BF_FFMPEG}/include"
+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.2'
+WITH_OSX_STATICPYTHON = True
+
+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
+#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 !!!!
+#BF_OPENAL_LIB = 'openal'
+#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'
+
+# we use simply jack framework
+WITH_BF_JACK = True
+BF_JACK = '/Library/Frameworks/Jackmp.framework'
+BF_JACK_INC = '${BF_JACK}/headers'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile FLAC ogg vorbis vorbisenc'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib ${BF_FFMPEG}/lib' #ogg libs are stored in ffmpeg dir
+
+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 = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = '${LCGDIR}/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath 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
+
+#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_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 + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = '/usr'
+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
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB =
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = True
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LIBDIR + '/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = True
+
+WITH_BF_ICONV = True
+BF_ICONV = '/usr'
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+#BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = True
+BF_OPENGL_LIB = 'GL GLU'
+BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
+BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
+
+#OpenCollada flags
+WITH_BF_COLLADA = True
+BF_COLLADA = '#source/blender/collada'
+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 UTF xml2 buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada'
+BF_PCRE = LIBDIR + '/opencollada'
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+#BF_EXPAT = '/usr'
+#BF_EXPAT_LIB = 'expat'
+#BF_EXPAT_LIBPATH = '/usr/lib'
+
+# Cycles
+WITH_BF_CYCLES = True
+
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/openimageio'
+BF_OIIO_INC = BF_OIIO + '/include'
+BF_OIIO_LIB = 'OpenImageIO'
+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'
+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_13', 'sm_20', 'sm_21']
+
+#Ray trace optimization
+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
+
+#############################################################################
+###################  various compile settings and flags    ##################
+#############################################################################
+
+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 = list(ARCH_FLAGS)
+
+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
+
+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_DEPLOYMENT_TARGET == '10.7':
+    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']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_LINKFLAGS = ['-pg']
+BF_PROFILE = False
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG']
+
+#############################################################################
+###################           Output directories           ##################
+#############################################################################
+
+BF_BUILDDIR='../build/darwin'
+BF_INSTALLDIR='../install/darwin'

build_files/scons/config/freebsd7-config.py

@@ -0,0 +1,211 @@
+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'
+
+# enable freetype2 support for text objects
+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 # -DWITH_QUICKTIME
+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  # -DWITH_FFMPEG
+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
+
+#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,211 @@
+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'
+
+# enable freetype2 support for text objects
+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 # -DWITH_QUICKTIME
+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  # -DWITH_FFMPEG
+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
+
+#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,211 @@
+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'
+
+# enable freetype2 support for text objects
+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 # -DWITH_QUICKTIME
+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  # -DWITH_FFMPEG
+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
+
+#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

@@ -0,0 +1,288 @@
+# find library directory
+import platform
+import os
+bitness = platform.architecture()[0]
+if bitness == '64bit':
+    LCGDIR = '../lib/linux64'
+else:
+    LCGDIR = '../lib/linux'
+LIBDIR = "#${LCGDIR}"
+
+BF_PYTHON_ABI_FLAGS = 'm'  # Most common for linux distros
+BF_PYTHON = '/usr'
+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/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+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'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_JACK = False
+BF_JACK = '/usr'
+BF_JACK_INC = '${BF_JACK}/include/jack'
+BF_JACK_LIB = 'jack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = False
+WITH_BF_STATICSNDFILE = False
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
+
+WITH_BF_SDL = True
+BF_SDL = '/usr' #$(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'
+# 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'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+
+WITH_BF_PNG = True
+BF_PNG = '/usr'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+
+WITH_BF_TIFF = True
+BF_TIFF = '/usr'
+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'
+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
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = '/usr'
+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 # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = False
+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  # -DWITH_FFMPEG
+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'
+#WITH_BF_STATICFFMPEG = True
+#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = False
+BF_OGG = '/usr'
+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 = False
+WITH_BF_STATICFFTW3 = False
+BF_FFTW3 = '/usr'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+BF_FFTW3_LIB_STATIC = '${BF_FFTW3_LIBPATH}/libfftw3.a'
+
+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'
+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 = ''
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '/usr/lib'
+BF_EXPAT = '/usr'
+BF_EXPAT_LIB = 'expat'
+BF_EXPAT_LIBPATH = '/usr/lib'
+
+WITH_BF_JEMALLOC = False
+WITH_BF_STATICJEMALLOC = False
+BF_JEMALLOC = '/usr'
+BF_JEMALLOC_INC = '${BF_JEMALLOC}/include'
+BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
+BF_JEMALLOC_LIB = 'jemalloc'
+BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
+
+WITH_BF_OIIO = True
+WITH_BF_STATICOIIO = False
+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_LIBPATH = BF_OIIO + '/lib'
+
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = False
+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_13', 'sm_20', 'sm_21']
+
+WITH_BF_OPENMP = True
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
+#SpaceNavigator and friends
+WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = False
+BF_3DMOUSE = '/usr'
+BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'
+BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
+BF_3DMOUSE_LIB = 'spnav'
+BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a'
+
+##
+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 = []
+
+CPPFLAGS = []
+# g++ 4.6, only needed for bullet
+CXXFLAGS += ['-fpermissive']
+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', '-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']
+
+
+##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', '-D_DEBUG']
+
+BF_BUILDDIR = '../build/linux'
+BF_INSTALLDIR='../install/linux'
+
+#Link against pthread
+PLATFORM_LINKFLAGS = ['-pthread']
+

build_files/scons/config/linuxcross-config.py

@@ -0,0 +1,196 @@
+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'
+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'
+
+# enable freetype2 support for text objects
+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 # -DWITH_QUICKTIME
+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  # -DWITH_FFMPEG
+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

@@ -0,0 +1,206 @@
+LCGDIR = '#../lib/windows'
+LIBDIR = "${LCGDIR}"
+
+BF_PYTHON = LIBDIR + '/python'
+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 = 'python32'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
+
+WITH_BF_OPENAL = True
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'OpenAL32'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+
+WITH_BF_FFMPEG = True
+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-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'
+BF_JACK_INC = '${BF_JACK}/include'
+BF_JACK_LIB = 'libjack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile-1'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL'
+BF_SDL_LIBPATH = '${BF_SDL}/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 Imath IlmThread Iex'
+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 = 'liblibjpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/gcc/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_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 + '/gcc/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'fftw3'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_GAMEENGINE = True
+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_WINTAB = LIBDIR + '/wintab'
+BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
+
+# enable freetype2 support for text objects
+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 # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = False
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/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',
+             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+
+WITH_BF_COLLADA = True
+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'
+
+#Cycles
+WITH_BF_CYCLES = True 
+
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/gcc/openimageio'
+BF_OIIO_INC = BF_OIIO + '/include'
+BF_OIIO_LIB = 'OpenImageIO'
+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-mgw45-mt-s-1_47 boost_filesystem-mgw45-mt-s-1_47 boost_regex-mgw45-mt-s-1_47 boost_system-mgw45-mt-s-1_47 boost_thread-mgw45-mt-s-1_47'
+BF_BOOST_LIBPATH = BF_BOOST + '/lib/gcc'
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+
+##
+CC = 'gcc'
+CXX = 'g++'
+
+CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
+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']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+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']
+
+PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
+
+## DISABLED, causes linking errors!
+## for re-distrobution, so users dont need mingw installed
+# PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
+
+BF_DEBUG = False
+BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
+
+BF_PROFILE_CCFLAGS = ['-pg', '-g']
+BF_PROFILE_LINKFLAGS = ['-pg']
+BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS
+BF_PROFILE = False
+
+BF_BUILDDIR = '..\\build\\win32-mingw'
+BF_INSTALLDIR='..\\install\\win32-mingw'

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

@@ -0,0 +1,215 @@
+LCGDIR = '#../lib/windows'
+LIBDIR = '${LCGDIR}'
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+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.2'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = 'python'
+BF_PYTHON_LIB = 'python32'
+BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+
+WITH_BF_OPENAL = True
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include '
+BF_OPENAL_LIB = 'OpenAL32'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+
+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_JACK = False
+BF_JACK = LIBDIR + '/jack'
+BF_JACK_INC = '${BF_JACK}/include ${BF_FFMPEG}/include/msvc'
+BF_JACK_LIB = 'libjack'
+BF_JACK_LIBPATH = '${BF_JACK}/lib'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile-1'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL.lib'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+BF_PTHREADS = LIBDIR + '/pthreads'
+BF_PTHREADS_INC = '${BF_PTHREADS}/include'
+BF_PTHREADS_LIB = 'pthreadVC2'
+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/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath 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 = 'libpng'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+WITH_BF_TIFF = True
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'libtiff'
+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 + '/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
+
+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'
+
+WITH_BF_BINRELOC = False
+
+# enable freetype2 support for text objects
+BF_WITH_FREETYPE = True
+BF_FREETYPE = LIBDIR + '/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype2ST'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+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 = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_FFTW3 = True
+BF_FFTW3 = LIBDIR + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_REDCODE = False  
+BF_REDCODE_INC = '#extern'
+
+WITH_BF_COLLADA = True
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+
+BF_OPENCOLLADA = LIBDIR + '/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
+
+WITH_BF_OPENMP = True
+
+#Cycles
+WITH_BF_CYCLES = True 
+
+WITH_BF_OIIO = True
+BF_OIIO = '${LIBDIR}/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = '${LIBDIR}/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+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_13', 'sm_20', 'sm_21']
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
+
+WITH_BF_STATICOPENGL = False
+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',
+                         '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+                         '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+                         
+CC = 'cl.exe'
+CXX = 'cl.exe'
+
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
+CXXFLAGS = ['/EHsc']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
+
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
+
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+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']
+
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/STACK:2097152','/INCREMENTAL:NO', '/LARGEADDRESSAWARE', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
+
+# # Todo
+# BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+# BF_PROFILE_LINKFLAGS = ['-pg']
+# BF_PROFILE = False
+
+BF_BSC=False
+
+BF_BUILDDIR = '..\\build\\win32-vc'
+BF_INSTALLDIR='..\\install\\win32-vc'

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

@@ -0,0 +1,214 @@
+LCGDIR = '#../lib/win64'
+LIBDIR = '${LCGDIR}'
+
+# enable ffmpeg  support
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+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.2'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = 'python'
+BF_PYTHON_LIB = 'python32'
+BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+
+WITH_BF_OPENAL = True
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include '
+BF_OPENAL_LIB = 'OpenAL32'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+
+WITH_BF_SNDFILE = True
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile-1'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
+# TODO - are these useful on win32?
+# BF_CXX = '/usr'
+# WITH_BF_STATICCXX = False
+# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+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_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL.lib'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_JACK = False
+
+BF_PTHREADS = LIBDIR + '/pthreads'
+BF_PTHREADS_INC = '${BF_PTHREADS}/include'
+BF_PTHREADS_LIB = 'pthreadVC2'
+BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
+
+WITH_BF_FMOD = False
+BF_FMOD = LIBDIR + '/fmod'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = LIBDIR + '/openexr'
+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'
+# 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 = 'libpng'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+WITH_BF_TIFF = True
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'libtiff'
+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 + '/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
+
+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'
+
+WITH_BF_BINRELOC = False
+
+# enable freetype2 support for text objects
+BF_WITH_FREETYPE = True
+BF_FREETYPE = LIBDIR + '/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype2ST'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+BF_QUICKTIME = LIBDIR + '/QTDevWin'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
+BF_QUICKTIME_LIB = 'qtmlClient'
+BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
+
+WITH_BF_OPENJPEG = False
+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 + '/fftw3'
+BF_FFTW3_INC = '${BF_FFTW3}/include'
+BF_FFTW3_LIB = 'libfftw'
+BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
+
+WITH_BF_REDCODE = False  
+BF_REDCODE_INC = '#extern'
+
+WITH_BF_COLLADA = True
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+
+BF_OPENCOLLADA = LIBDIR + '/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
+
+WITH_BF_OPENMP = True
+
+#Cycles
+WITH_BF_CYCLES = True
+
+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'
+
+WITH_BF_BOOST = True
+BF_BOOST = '${LIBDIR}/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+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_13', 'sm_20', 'sm_21']
+
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = True
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
+
+WITH_BF_STATICOPENGL = False
+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',
+                         '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+                         '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+CC = 'cl.exe'
+CXX = 'cl.exe'
+
+CFLAGS = []
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CXXFLAGS = ['/EHsc']
+BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
+
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
+
+CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
+REL_CFLAGS = []
+REL_CXXFLAGS = []
+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']
+
+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_BUILDDIR = '..\\build\\blender25-win64-vc'
+BF_INSTALLDIR='..\\install\\blender25-win64-vc'
+

build_files/scons/tools/Blender.py

@@ -0,0 +1,880 @@
+#!/usr/bin/env python
+
+"""
+tools.BlenderEnvironment
+
+This environment builds on SCons.Script.SConscript.SConsEnvironment
+
+* library repository
+* custom printout
+* wrapper functions
+
+TODO: clean up and sanitise code - crosscheck with btools and SConstruct
+to kill any code duplication
+
+"""
+
+import os
+import os.path
+import string
+import glob
+import time
+import sys
+import tarfile
+import shutil
+import cStringIO
+import platform
+
+from SCons.Script.SConscript import SConsEnvironment
+import SCons.Action
+import SCons.Util
+import SCons.Builder
+import SCons.Tool
+import bcolors
+bc = bcolors.bcolors()
+import btools
+VERSION = btools.VERSION
+VERSION_RELEASE_CYCLE = btools.VERSION_RELEASE_CYCLE
+
+Split = SCons.Util.Split
+Action = SCons.Action.Action
+Builder = SCons.Builder.Builder
+GetBuildPath = SConsEnvironment.GetBuildPath
+
+# a few globals
+root_build_dir = ''
+doc_build_dir = ''
+quickie = None # Anything else than None if BF_QUICK has been passed
+quicklist = [] # The list of libraries/programs to compile during a quickie
+program_list = [] # A list holding Nodes to final binaries, used to create installs
+arguments = None
+targets = None
+resources = []
+bitness = 0
+
+#some internals
+blenderdeps = [] # don't manipulate this one outside this module!
+
+##### LIB STUFF ##########
+
+possible_types = ['core'] # can be set in ie. SConstruct
+libs = {}
+vcp = []
+
+def getresources():
+    return resources
+
+def init_lib_dict():
+    for pt in possible_types:
+        libs[pt] = {}
+
+# helper func for add_lib_to_dict
+def internal_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100):
+    if not libname in dict[libtype]:
+        done = None
+        while not done:
+            if dict[libtype].has_key(priority):
+                priority = priority + 1
+            else:
+                done = True
+        dict[libtype][priority] = libname
+
+# libtype and priority can both be lists, for defining lib in multiple places
+def add_lib_to_dict(env, dict = None, libtype = None, libname = None, priority = 100):
+    if not dict or not libtype or not libname:
+        print "Passed wrong arg"
+        env.Exit()
+
+    if type(libtype) is str and type(priority) is int:
+        internal_lib_to_dict(dict, libtype, libname, priority)
+    elif type(libtype) is list and type(priority) is list:
+        if len(libtype)==len(priority):
+            for lt, p in zip(libtype, priority):
+                internal_lib_to_dict(dict, lt, libname, p)
+        else:
+            print "libtype and priority lists are unequal in length"
+            env.Exit()
+    else:
+        print "Wrong type combinations for libtype and priority. Only str and int or list and list"
+        env.Exit()
+
+def create_blender_liblist(lenv = None, libtype = None):
+    if not lenv or not libtype:
+        print "missing arg"
+
+    lst = []
+    if libtype in possible_types:
+        curlib = libs[libtype]
+        sortlist = curlib.keys()
+        sortlist.sort()
+        for sk in sortlist:
+            v = curlib[sk]
+            if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+                target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+            else:
+                target = os.path.abspath(root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+            lst.append(target)
+
+    return lst
+
+## TODO: static linking
+def setup_staticlibs(lenv):
+    statlibs = [
+        #here libs for static linking
+    ]
+
+    libincs = []
+
+    if lenv['WITH_BF_FFMPEG']:
+        libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
+
+    libincs.extend([
+        lenv['BF_OPENGL_LIBPATH'],
+        lenv['BF_JPEG_LIBPATH'],
+        lenv['BF_ZLIB_LIBPATH'],
+        lenv['BF_PNG_LIBPATH'],
+        lenv['BF_ICONV_LIBPATH']
+        ])
+
+    libincs += Split(lenv['BF_FREETYPE_LIBPATH'])
+    if lenv['WITH_BF_PYTHON']:
+        libincs += Split(lenv['BF_PYTHON_LIBPATH'])
+    if lenv['WITH_BF_SDL']:
+        libincs += Split(lenv['BF_SDL_LIBPATH'])
+    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_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']:
+        libincs += Split(lenv['BF_OPENAL_LIBPATH'])
+        if lenv['WITH_BF_STATICOPENAL']:
+            statlibs += Split(lenv['BF_OPENAL_LIB_STATIC'])
+    if lenv['WITH_BF_STATICOPENGL']:
+        statlibs += Split(lenv['BF_OPENGL_LIB_STATIC'])
+    if lenv['WITH_BF_STATICCXX']:
+        statlibs += Split(lenv['BF_CXX_LIB_STATIC'])
+
+    if lenv['WITH_BF_PYTHON'] and lenv['WITH_BF_STATICPYTHON']:
+        statlibs += Split(lenv['BF_PYTHON_LIB_STATIC'])
+
+    if lenv['WITH_BF_SNDFILE'] and lenv['WITH_BF_STATICSNDFILE']:
+        statlibs += Split(lenv['BF_SNDFILE_LIB_STATIC'])
+
+    if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+        libincs += Split(lenv['BF_PTHREADS_LIBPATH'])
+
+    if lenv['WITH_BF_COLLADA']:
+        libincs += Split(lenv['BF_OPENCOLLADA_LIBPATH'])
+        if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+            libincs += Split(lenv['BF_PCRE_LIBPATH'])
+            libincs += Split(lenv['BF_EXPAT_LIBPATH'])
+
+    if lenv['WITH_BF_OPENMP']:
+        if lenv['OURPLATFORM'] == 'linuxcross':
+            libincs += Split(lenv['BF_OPENMP_LIBPATH'])
+            
+    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_BOOST']:
+        libincs += Split(lenv['BF_BOOST_LIBPATH'])
+        if lenv['WITH_BF_STATICBOOST']:
+            statlibs += Split(lenv['BF_BOOST_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'):
+        libincs.append('/usr/lib')
+
+    if lenv['WITH_BF_JEMALLOC']:
+        libincs += Split(lenv['BF_JEMALLOC_LIBPATH'])
+        if lenv['WITH_BF_STATICJEMALLOC']:
+            statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC'])
+
+    if lenv['OURPLATFORM']=='linux':
+        if lenv['WITH_BF_3DMOUSE']:
+            libincs += Split(lenv['BF_3DMOUSE_LIBPATH'])
+            if lenv['WITH_BF_STATIC3DMOUSE']:
+                statlibs += Split(lenv['BF_3DMOUSE_LIB_STATIC'])
+
+    return statlibs, libincs
+
+def setup_syslibs(lenv):
+    syslibs = []
+
+    if not lenv['WITH_BF_FREETYPE_STATIC']:
+        syslibs += Split(lenv['BF_FREETYPE_LIB'])
+    if lenv['WITH_BF_PYTHON'] and not lenv['WITH_BF_STATICPYTHON']:
+        if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
+            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':
+        if lenv['CC'] == 'cl.exe':
+            syslibs += ['vcomp']
+        else:
+            syslibs += ['gomp']
+    if lenv['WITH_BF_ICONV']:
+        syslibs += Split(lenv['BF_ICONV_LIB'])
+    if lenv['WITH_BF_OIIO']:
+        if not lenv['WITH_BF_STATICOIIO']:
+            syslibs += Split(lenv['BF_OIIO_LIB'])
+
+    if lenv['WITH_BF_OPENEXR'] and not lenv['WITH_BF_STATICOPENEXR']:
+        syslibs += Split(lenv['BF_OPENEXR_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']:
+        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_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'):
+        syslibs += Split(lenv['BF_PTHREADS_LIB'])
+    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'])]
+        else:
+            syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
+        syslibs.append(lenv['BF_EXPAT_LIB'])
+
+    if lenv['WITH_BF_JEMALLOC']:
+        if not lenv['WITH_BF_STATICJEMALLOC']:
+            syslibs += Split(lenv['BF_JEMALLOC_LIB'])
+
+    if lenv['OURPLATFORM']=='linux':
+        if lenv['WITH_BF_3DMOUSE']:
+            if not lenv['WITH_BF_STATIC3DMOUSE']:
+                syslibs += Split(lenv['BF_3DMOUSE_LIB'])
+                
+    if lenv['WITH_BF_BOOST'] and not lenv['WITH_BF_STATICBOOST']:
+        syslibs += Split(lenv['BF_BOOST_LIB'])
+
+    syslibs += Split(lenv['BF_JPEG_LIB'])
+    syslibs += Split(lenv['BF_PNG_LIB'])
+
+    syslibs += lenv['LLIBS']
+
+    return syslibs
+
+def propose_priorities():
+    print bc.OKBLUE+"Priorities:"+bc.ENDC
+    for t in possible_types:
+        print bc.OKGREEN+"\t"+t+bc.ENDC
+        new_priority = 0
+        curlib = libs[t]
+        sortlist = curlib.keys()
+        sortlist.sort()
+
+        for sk in sortlist:
+            v = curlib[sk]
+            #for p,v in sorted(libs[t].iteritems()):
+            print "\t\t",new_priority, v
+            new_priority += 5
+
+# emits the necessary file objects for creator.c, to be used in creating
+# the final blender executable
+def creator(env):
+    sources = ['creator.c']# + Blender.buildinfo(env, "dynamic") + Blender.resources
+
+    incs = ['#/intern/guardedalloc', '#/source/blender/blenlib', '#/source/blender/blenkernel', '#/source/blender/editors/include', '#/source/blender/blenloader', '#/source/blender/imbuf', '#/source/blender/renderconverter', '#/source/blender/render/extern/include', '#/source/blender/windowmanager', '#/source/blender/makesdna', '#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines', '#/extern/glew/include', '#/source/blender/gpu', '#/source/blender/opencl', env['BF_OPENGL_INC']]
+
+    defs = []
+
+    if env['WITH_BF_BINRELOC']:
+        incs.append('#/extern/binreloc/include')
+        defs.append('WITH_BINRELOC')
+
+    if env['WITH_BF_SDL']:
+        defs.append('WITH_SDL')
+
+    if env['WITH_BF_LIBMV']:
+        incs.append('#/extern/libmv')
+        defs.append('WITH_LIBMV')
+
+    if env['WITH_BF_PYTHON']:
+        incs.append('#/source/blender/python')
+        defs.append('WITH_PYTHON')
+        if env['BF_DEBUG']:
+            defs.append('_DEBUG')
+
+    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
+        incs.append(env['BF_PTHREADS_INC'])
+
+    env.Append(CPPDEFINES=defs)
+    env.Append(CPPPATH=incs)
+    obj = [env.Object(root_build_dir+'source/creator/creator/creator', ['#source/creator/creator.c'])]
+
+    return obj
+
+## TODO: see if this can be made in an emitter
+def buildinfo(lenv, build_type):
+    """
+    Generate a buildinfo object
+    """
+    build_date = time.strftime ("%Y-%m-%d")
+    build_time = time.strftime ("%H:%M:%S")
+    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'])
+        build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['CPPFLAGS'])
+    else:
+        build_type = "Release"
+        build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['REL_CFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS'])
+        build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['REL_CXXFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS'])
+
+    build_linkflags = ' '.join(lenv['PLATFORM_LINKFLAGS'])
+
+    obj = []
+    if lenv['BF_BUILDINFO']:
+        lenv.Append (CPPDEFINES = ['BUILD_TIME=\\"%s\\"'%(build_time),
+                                    'BUILD_DATE=\\"%s\\"'%(build_date),
+                                    'BUILD_TYPE=\\"%s\\"'%(build_type),
+                                    'BUILD_REV=\\"%s\\"'%(build_rev),
+                                    'WITH_BUILDINFO',
+                                    'BUILD_PLATFORM=\\"%s:%s\\"'%(platform.system(), platform.architecture()[0]),
+                                    'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
+                                    'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
+                                    'BUILD_LINKFLAGS=\\"%s\\"'%(build_linkflags),
+                                    'BUILD_SYSTEM=\\"SCons\\"'
+                    ])
+
+        lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])
+
+        obj = [lenv.Object (root_build_dir+'source/creator/%s_buildinfo'%build_type, ['#source/creator/buildinfo.c'])]
+
+    return obj
+
+##### END LIB STUFF ############
+
+##### ACTION STUFF #############
+
+def my_print_cmd_line(self, s, target, source, env):
+    sys.stdout.write(' ' * 70 + '\r')
+    sys.stdout.flush()
+    sys.stdout.write(s + "\r")
+    sys.stdout.flush()
+
+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
+
+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
+
+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
+
+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
+
+def msvc_hack(env):
+    static_lib = SCons.Tool.createStaticLibBuilder(env)
+    program = SCons.Tool.createProgBuilder(env)
+    
+    env['BUILDERS']['Library'] = static_lib
+    env['BUILDERS']['StaticLibrary'] = static_lib
+    env['BUILDERS']['Program'] = program
+        
+def set_quiet_output(env):
+    mycaction = Action("$CCCOM", strfunction=my_compile_print)
+    myshcaction = Action("$SHCCCOM", strfunction=my_compile_print)
+    mycppaction = Action("$CXXCOM", strfunction=my_compile_print)
+    myshcppaction = Action("$SHCXXCOM", strfunction=my_compile_print)
+    mylibaction = Action("$ARCOM", strfunction=my_linking_print)
+    mylinkaction = Action("$LINKCOM", strfunction=my_program_print)
+
+    static_ob, shared_ob = SCons.Tool.createObjBuilders(env)
+    static_ob.add_action('.c', mycaction)
+    static_ob.add_action('.cpp', mycppaction)
+    shared_ob.add_action('.c', myshcaction)
+    shared_ob.add_action('.cpp', myshcppaction)
+
+    static_lib = SCons.Builder.Builder(action = mylibaction,
+                                       emitter = '$LIBEMITTER',
+                                       prefix = '$LIBPREFIX',
+                                       suffix = '$LIBSUFFIX',
+                                       src_suffix = '$OBJSUFFIX',
+                                       src_builder = 'StaticObject')
+
+    program = SCons.Builder.Builder(action = mylinkaction,
+                                    emitter = '$PROGEMITTER',
+                                    prefix = '$PROGPREFIX',
+                                    suffix = '$PROGSUFFIX',
+                                    src_suffix = '$OBJSUFFIX',
+                                    src_builder = 'Object',
+                                    target_scanner = SCons.Defaults.ProgScan)
+
+    env['BUILDERS']['Object'] = static_ob
+    env['BUILDERS']['StaticObject'] = static_ob
+    env['BUILDERS']['StaticLibrary'] = static_lib
+    env['BUILDERS']['Library'] = static_lib
+    env['BUILDERS']['Program'] = program
+    if env['BF_LINE_OVERWRITE']:
+        SCons.Action._ActionAction.print_cmd_line = my_print_cmd_line
+
+def untar_pybundle(from_tar,to_dir,exclude_re):
+    tar= tarfile.open(from_tar, mode='r')
+    exclude_re= list(exclude_re) #single re object or list of re objects
+    debug= 0 #list files instead of unpacking
+    good= []
+    if debug: print '\nFiles not being unpacked:\n'
+    for name in tar.getnames():
+        is_bad= 0
+        for r in exclude_re:
+            if r.match(name):
+                is_bad=1
+                if debug: print name
+                break
+        if not is_bad:
+            good.append(tar.getmember(name))
+    if debug:
+        print '\nFiles being unpacked:\n'
+        for g in good:
+            print g
+    else:
+        tar.extractall(to_dir, good)
+
+def my_winpybundle_print(target, source, env):
+    pass
+
+def WinPyBundle(target=None, source=None, env=None):
+    import re
+    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'] )
+    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.
+            print str(func) + ' failed on ' + str(path)
+    print "Trying to remove existing py bundle."
+    shutil.rmtree(py_target, False, printexception)
+    exclude_re=[re.compile('.*/test/.*'),
+                re.compile('^config/.*'),
+                re.compile('^config-*/.*'),
+                re.compile('^distutils/.*'),
+                re.compile('^idlelib/.*'),
+                re.compile('^lib2to3/.*'),
+                re.compile('^tkinter/.*'),
+                re.compile('^_tkinter_d.pyd'),
+                re.compile('^turtledemo'),
+                re.compile('^turtle.py'),
+                ]
+
+    print "Unpacking '" + py_tar + "' to '" + py_target + "'"
+    untar_pybundle(py_tar,py_target,exclude_re)
+
+def  my_appit_print(target, source, env):
+    a = '%s' % (target[0])
+    d, f = os.path.split(a)
+    return "making bundle for " + f
+
+def AppIt(target=None, source=None, env=None):
+    import shutil
+    import commands
+    import os.path
+    
+    
+    a = '%s' % (target[0])
+    builddir, b = os.path.split(a)
+    libdir = env['LCGDIR'][1:]
+    osxarch = env['MACOSX_ARCHITECTURE']
+    installdir = env['BF_INSTALLDIR']
+    print("compiled architecture: %s"%(osxarch))
+    print("Installing to %s"%(installdir))
+    # TODO, use tar.
+    python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
+    if env['WITH_OSX_STATICPYTHON']:
+        print("unzipping to app-bundle: %s"%(python_zip))
+    else:
+        print("dynamic build - make sure to have python3.x-framework installed")
+    bldroot = env.Dir('.').abspath
+    binary = env['BINARYKIND']
+     
+    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
+    
+    if os.path.isdir(cmd):
+        shutil.rmtree(cmd)
+    shutil.copytree(sourcedir, cmd)
+    cmd = "cat %s | sed s/\$\{MACOSX_BUNDLE_SHORT_VERSION_STRING\}/%s/ | "%(sourceinfo,VERSION)
+    cmd += "sed s/\$\{MACOSX_BUNDLE_LONG_VERSION_STRING\}/%s,\ %s/g > %s"%(VERSION,time.strftime("%Y-%b-%d"),targetinfo)
+    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/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/MacOS/%s/datafiles'%(installdir, binary, VERSION)
+        commands.getoutput(cmd)
+        cmd = 'cp -R %s/release/datafiles/locale %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+        commands.getoutput(cmd)
+        cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+        commands.getoutput(cmd)
+        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/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/MacOS/%s/scripts/addons/cycles' % (installdir,binary,VERSION)
+
+            cmd = 'mkdir %s' % (cinstalldir)
+            commands.getoutput(cmd)
+            cmd = 'mkdir %s/kernel' % (cinstalldir)
+            commands.getoutput(cmd)
+            cmd = 'mkdir %s/lib' % (cinstalldir)
+            commands.getoutput(cmd)
+            cmd = 'cp -R %s/blender/addon/*.py %s/' % (croot, cinstalldir)
+            commands.getoutput(cmd)
+            cmd = 'cp -R %s/doc/license %s/license' % (croot, cinstalldir)
+            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/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_OSX_STATICPYTHON']:
+        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/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
+        commands.getoutput(cmd)
+
+    cmd = 'chmod +x  %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
+    commands.getoutput(cmd)
+    cmd = 'find %s/%s.app -name .svn -prune -exec rm -rf {} \;'%(installdir, binary)
+    commands.getoutput(cmd)
+    cmd = 'find %s/%s.app -name .DS_Store -exec rm -rf {} \;'%(installdir, binary)
+    commands.getoutput(cmd)
+    cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary)
+    commands.getoutput(cmd)
+    if env['CC'].endswith('4.6.1'): # for correct errorhandling with gcc 4.6.1 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.
+def my_unixpybundle_print(target, source, env):
+    pass
+
+def UnixPyBundle(target=None, source=None, env=None):
+    # Any Unix except osx
+    #-- VERSION/python/lib/python3.1
+    
+    import commands
+    
+    def run(cmd):
+        print 'Install command:', cmd
+        commands.getoutput(cmd)
+
+    dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+
+    py_src =    env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] )
+    py_target =    env.subst( dir + '/python/lib/python'+env['BF_PYTHON_VERSION'] )
+    
+    # This is a bit weak, but dont install if its been installed before, makes rebuilds quite slow.
+    if os.path.exists(py_target):
+        print 'Using existing python from:'
+        print '\t"%s"' %            py_target
+        print '\t(skipping copy)\n'
+        return
+
+    # Copied from source/creator/CMakeLists.txt, keep in sync.
+    print 'Install python from:'
+    print '\t"%s" into...' % py_src
+    print '\t"%s"\n' % py_target
+
+    run("rm -rf '%s'" % py_target)
+    try:
+        os.makedirs(os.path.dirname(py_target)) # the final part is copied
+    except:
+        pass
+
+    run("cp -R '%s' '%s'" % (py_src, os.path.dirname(py_target)))
+    run("rm -rf '%s/distutils'" % py_target)
+    run("rm -rf '%s/lib2to3'" % py_target)
+    run("rm -rf '%s/config'" % py_target)
+
+    for f in os.listdir(py_target):
+        if f.startswith("config-"):
+            run("rm -rf '%s/%s'" % (py_target, f))
+
+    run("rm -rf '%s/site-packages'" % py_target)
+    run("mkdir '%s/site-packages'" % py_target)    # python needs it.'
+    run("rm -rf '%s/idlelib'" % py_target)
+    run("rm -rf '%s/tkinter'" % py_target)
+    run("rm -rf '%s/turtledemo'" % py_target)
+    run("rm -r '%s/turtle.py'" % py_target)
+    run("rm -f '%s/lib-dynload/_tkinter.so'" % py_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)
+    run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target)
+    run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target)
+    
+
+#### END ACTION STUFF #########
+
+def bsc(env, target, source):
+    
+    bd = os.path.dirname(target[0].abspath)
+    bscfile = '\"'+target[0].abspath+'\"'
+    bscpathcollect = '\"'+bd + os.sep + '*.sbr\"'
+    bscpathtmp = '\"'+bd + os.sep + 'bscmake.tmp\"'
+
+    os.system('dir /b/s '+bscpathcollect+' >'+bscpathtmp)
+
+    myfile = open(bscpathtmp[1:-1], 'r')
+    lines = myfile.readlines()
+    myfile.close()
+
+    newfile = open(bscpathtmp[1:-1], 'w')
+    for l in lines:
+        newfile.write('\"'+l[:-1]+'\"\n')
+    newfile.close()
+                
+    os.system('bscmake /nologo /n /o'+bscfile+' @'+bscpathtmp)
+    os.system('del '+bscpathtmp)
+
+class BlenderEnvironment(SConsEnvironment):
+
+    PyBundleActionAdded = False
+
+    def BlenderRes(self=None, libname=None, source=None, libtype=['core'], priority=[100]):
+        global libs
+        if not self or not libname or not source:
+            print bc.FAIL+'Cannot continue.  Missing argument for BlenderRes '+libname+bc.ENDC
+            self.Exit()
+        if self['OURPLATFORM'] not in ('win32-vc','win32-mingw','linuxcross', 'win64-vc'):
+            print bc.FAIL+'BlenderRes is for windows only!'+bc.END
+            self.Exit()
+        
+        print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
+        lenv = self.Clone()
+        if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+            res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
+        else:
+            res = lenv.RES(root_build_dir+'lib/'+libname, source)
+
+        
+        SConsEnvironment.Default(self, res)
+        resources.append(res)
+
+    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
+        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 libname.find(q) != -1:
+                    return True
+            return False
+
+        if list_substring(quickie, libname) or len(quickie)==0:
+            if list_substring(quickdebug, libname):
+                print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC
+            else:
+                print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC
+            lenv = self.Clone()
+            lenv.Append(CPPPATH=includes)
+            lenv.Append(CPPDEFINES=defines)
+            if lenv['BF_DEBUG'] or (libname in quickdebug):
+                lenv.Append(CFLAGS = lenv['BF_DEBUG_CFLAGS'])
+                lenv.Append(CCFLAGS = lenv['BF_DEBUG_CCFLAGS'])
+                lenv.Append(CXXFLAGS = lenv['BF_DEBUG_CXXFLAGS'])
+            else:
+                lenv.Append(CFLAGS = lenv['REL_CFLAGS'])
+                lenv.Append(CCFLAGS = lenv['REL_CCFLAGS'])
+                lenv.Append(CXXFLAGS = lenv['REL_CXXFLAGS'])
+            if lenv['BF_PROFILE']:
+                lenv.Append(CFLAGS = lenv['BF_PROFILE_CFLAGS'])
+                lenv.Append(CCFLAGS = lenv['BF_PROFILE_CCFLAGS'])
+                lenv.Append(CXXFLAGS = lenv['BF_PROFILE_CXXFLAGS'])
+            if compileflags:
+                lenv.Replace(CFLAGS = compileflags)
+            if cc_compileflags:
+                lenv.Replace(CCFLAGS = cc_compileflags)
+            if cxx_compileflags:
+                lenv.Replace(CXXFLAGS = cxx_compileflags)
+            if cc_compilerchange:
+                lenv.Replace(CC = cc_compilerchange)
+            if cxx_compilerchange:
+                lenv.Replace(CXX = cxx_compilerchange)
+            lenv.Append(CFLAGS = lenv['C_WARN'])
+            lenv.Append(CCFLAGS = lenv['CC_WARN'])
+            lenv.Append(CXXFLAGS = lenv['CXX_WARN'])
+
+            if lenv['OURPLATFORM'] == 'win64-vc':
+                lenv.Append(LINKFLAGS = ['/MACHINE:X64'])
+
+            if lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+                if lenv['BF_DEBUG']:
+                    lenv.Append(CCFLAGS = ['/MTd'])
+                else:
+                    lenv.Append(CCFLAGS = ['/MT'])
+            
+            targetdir = root_build_dir+'lib/' + libname
+            if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+                targetdir = '#'+targetdir
+            lib = lenv.Library(target= targetdir, source=sources)
+            SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build
+            if self['BF_MSVS'] and self['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+                #if targetdir[0] == '#':
+                #    targetdir = targetdir[1:-1]
+                print "! ",targetdir+ '.vcproj' # + self['MSVSPROJECTSUFFIX']
+                vcproject = self.MSVSProject(target = targetdir + '.vcproj', # + self['MSVSPROJECTSUFFIX'],
+                         srcs = sources,
+                         buildtarget = lib,
+                         variant = 'Release',
+                         auto_build_solution=0)
+                vcp.append(vcproject)
+                SConsEnvironment.Default(self, vcproject)
+        else:
+            print bc.WARNING+'Not building '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC+' for '+bc.OKBLUE+'BF_QUICK'+bc.ENDC
+        # note: libs is a global
+        add_lib_to_dict(self, libs, libtype, libname, priority)
+
+    def BlenderProg(self=None, builddir=None, progname=None, sources=None, libs=None, libpath=None, binarykind=''):
+        global vcp
+        print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
+        lenv = self.Clone()
+        lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
+        if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
+            if lenv['BF_DEBUG']:
+                lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])
+        if  lenv['OURPLATFORM']=='linux':
+            if lenv['WITH_BF_PYTHON']:
+                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
+        if  lenv['OURPLATFORM']=='sunos5':
+            if lenv['WITH_BF_PYTHON']:
+                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
+            if lenv['CXX'].endswith('CC'):
+                lenv.Replace(LINK = '$CXX')
+        if  lenv['OURPLATFORM']=='darwin':
+            if lenv['WITH_BF_PYTHON']:
+                lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS'])
+            lenv.Append(LINKFLAGS = lenv['BF_OPENGL_LINKFLAGS'])
+        if lenv['BF_PROFILE']:
+            lenv.Append(LINKFLAGS = lenv['BF_PROFILE_LINKFLAGS'])
+        if root_build_dir[0]==os.sep or root_build_dir[1]==':':
+            lenv.Append(LIBPATH=root_build_dir + '/lib')
+        lenv.Append(LIBPATH=libpath)
+        lenv.Append(LIBS=libs)
+        if lenv['WITH_BF_QUICKTIME']:
+            lenv.Append(LIBS = lenv['BF_QUICKTIME_LIB'])
+            lenv.Append(LIBPATH = lenv['BF_QUICKTIME_LIBPATH'])
+        prog = lenv.Program(target=builddir+'bin/'+progname, source=sources)
+        if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc') and lenv['BF_BSC']:
+            f = lenv.File(progname + '.bsc', builddir)
+            brs = lenv.Command(f, prog, [bsc])
+            SConsEnvironment.Default(self, brs)
+        SConsEnvironment.Default(self, prog)
+        if self['BF_MSVS'] and self['OURPLATFORM'] in ('win32-vc', 'win64-vc') and progname == 'blender':
+            print "! ",builddir + "/" + progname + '.sln'
+            sln = self.MSVSProject(target = builddir + "/" + progname + '.sln',
+                     projects= vcp,
+                     variant = 'Release')
+            SConsEnvironment.Default(self, sln)
+        program_list.append(prog)
+        if  lenv['OURPLATFORM']=='darwin':
+            lenv['BINARYKIND'] = binarykind
+            lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
+        elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation)
+            if lenv['WITH_BF_PYTHON']:
+                if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+                    lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print))
+                    BlenderEnvironment.PyBundleActionAdded = True
+        elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation
+            if lenv['WITH_BF_PYTHON']:
+                if not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+                    lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print))
+                    BlenderEnvironment.PyBundleActionAdded = True
+        return prog
+
+    def Glob(lenv, pattern):
+        path = string.replace(GetBuildPath(lenv,'SConscript'),'SConscript', '')
+        files = []
+        for i in glob.glob(path + pattern):
+            files.append(string.replace(i, path, ''))
+        return files

build_files/scons/tools/bcolors.py

@@ -0,0 +1,16 @@
+class bcolors:
+    HEADER = '\033[95m'
+    OKBLUE = '\033[94m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[93m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'
+
+    def disable(self):
+        self.HEADER = ''
+        self.OKBLUE = ''
+        self.OKGREEN = ''
+        self.WARNING = ''
+        self.FAIL = ''
+        self.ENDC = ''
+

build_files/scons/tools/btools.py

@@ -0,0 +1,791 @@
+import os
+import os.path
+import SCons.Options
+
+import SCons.Variables
+try:
+    import subprocess
+except ImportError:
+    pass
+import string
+import glob
+import shutil
+import sys
+
+Variables = SCons.Variables
+BoolVariable = SCons.Variables.BoolVariable
+
+def get_version():
+    import re
+
+    fname = os.path.join(os.path.dirname(__file__), "..", "..", "..", "source", "blender", "blenkernel", "BKE_blender.h")
+    ver_base = None
+    ver_char = None
+    ver_cycle = None
+
+    re_ver = re.compile("^#\s*define\s+BLENDER_VERSION\s+([0-9]+)")
+    re_ver_char = re.compile("^#\s*define\s+BLENDER_VERSION_CHAR\s*(\S*)") # optional arg
+    re_ver_cycle = re.compile("^#\s*define\s+BLENDER_VERSION_CYCLE\s*(\S*)") # optional arg
+
+    for l in open(fname, "r"):
+        match = re_ver.match(l)
+        if match:
+            ver = int(match.group(1))
+            ver_base = "%d.%d" % (ver / 100, ver % 100)
+
+        match = re_ver_char.match(l)
+        if match:
+            ver_char = match.group(1)
+            if ver_char == "BLENDER_CHAR_VERSION":
+                ver_char = ""
+
+        match = re_ver_cycle.match(l)
+        if match:
+            ver_cycle = match.group(1)
+            if ver_cycle == "BLENDER_CYCLE_VERSION":
+                ver_cycle = ""
+
+        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:
+                ver_display = "%s%s-%s" % (ver_base, ver_char, ver_cycle)
+            else:
+                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_revision():
+    build_rev = os.popen('svnversion').read()[:-1] # remove \n
+    if build_rev == '' or build_rev==None: 
+        build_rev = 'UNKNOWN'
+
+    return 'r' + build_rev
+
+
+# copied from: http://www.scons.org/wiki/AutoconfRecipes
+def checkEndian():
+    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()
+REVISION = get_revision()
+ENDIAN = checkEndian()
+
+
+def print_arguments(args, bc):
+    if len(args):
+        for k,v in args.iteritems():
+            if type(v)==list:
+                v = ' '.join(v)
+            print '\t'+bc.OKBLUE+k+bc.ENDC+' = '+bc.OKGREEN + v + bc.ENDC
+    else:
+        print '\t'+bc.WARNING+'No  command-line arguments given'+bc.ENDC
+
+def validate_arguments(args, bc):
+    opts_list = [
+            '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_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',
+            'WITH_BF_DDS', 'WITH_BF_CINEON', 'WITH_BF_HDR',
+            'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG',  'BF_FFMPEG_INC', 'BF_FFMPEG_DLL',
+            'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
+            'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
+            '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_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',
+            '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_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_PLAYER',
+            'WITH_BF_NOBLENDER',
+            'WITH_BF_BINRELOC',
+            'WITH_BF_LZO', 'WITH_BF_LZMA',
+            'LCGDIR',
+            'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
+            'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
+            'WITHOUT_BF_INSTALL',
+            'WITHOUT_BF_PYTHON_INSTALL',
+            'WITHOUT_BF_OVERWRITE_INSTALL',
+            'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
+            'WITH_GHOST_COCOA',
+            'WITH_GHOST_SDL',
+            'BF_GHOST_DEBUG',
+            'USE_QTKIT',
+            'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
+            'BF_X264_CONFIG',
+            'BF_XVIDCORE_CONFIG',
+            'WITH_BF_DOCS',
+            'BF_NUMJOBS',
+            'BF_MSVS',
+            'BF_VERSION',
+            'WITH_BF_RAYOPTIMIZATION',
+            'BF_RAYOPTIMIZATION_SSE_FLAGS',
+            'WITH_BF_FLUID',
+            'WITH_BF_DECIMATE',
+            'WITH_BF_BOOLEAN',
+            'WITH_BF_REMESH',
+            'WITH_BF_OCEANSIM',
+            'WITH_BF_CXX_GUARDEDALLOC',
+            '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',
+            'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
+            'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
+            'WITH_BF_LIBMV', 'WITH_BF_CARVE'
+            ]
+    
+    # Have options here that scons expects to be lists
+    opts_list_split = [
+            'BF_PYTHON_LINKFLAGS',
+            'BF_OPENGL_LINKFLAGS',
+            '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_CHECK', 'XCODE_CUR_VER',
+    ]
+    
+    
+    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']
+
+    okdict = {}
+
+    for k,v in args.iteritems():
+        if (k in opts_list) or (k in arg_list):
+            okdict[k] = v
+        elif k in opts_list_split:
+            okdict[k] = v.split() # "" have already been stripped
+        else:
+            print '\t'+bc.WARNING+'Invalid argument: '+bc.ENDC+k+'='+v
+
+    return okdict
+
+def print_targets(targs, bc):
+    if len(targs)>0:
+        for t in targs:
+            print '\t'+bc.OKBLUE+t+bc.ENDC
+    else:
+        print '\t'+bc.WARNING+'No targets given, using '+bc.ENDC+bc.OKGREEN+'default'+bc.ENDC
+
+def validate_targets(targs, bc):
+    valid_list = ['.', 'blender', 'blenderstatic', 'blenderplayer', 'webplugin',
+            'blendernogame', 'blenderstaticnogame', 'blenderlite', 'release',
+            'everything', 'clean', 'install-bin', 'install', 'nsis','buildslave']
+    oklist = []
+    for t in targs:
+        if t in valid_list:
+            oklist.append(t)
+        else:
+            print '\t'+bc.WARNING+'Invalid target: '+bc.ENDC+t
+    return oklist
+
+class ourSpawn:
+    def ourspawn(self, sh, escape, cmd, args, env):
+        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)
+        data, err = proc.communicate()
+        rv = proc.wait()
+        if data:
+            print(data)
+        if err:
+            print(err)
+        return rv
+
+def SetupSpawn( env ):
+    buf = ourSpawn()
+    buf.ourenv = env
+    env['SPAWN'] = buf.ourspawn
+
+
+def read_opts(env, cfg, args):
+    localopts = Variables.Variables(cfg, args)
+    localopts.AddVariables(
+        ('LCGDIR', 'location of cvs lib dir'),
+        ('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)),
+        ('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_DLL', 'Python dll - used on Windows only', ''),
+        ('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''),
+        ('BF_PYTHON_LIBPATH', 'Library path', ''),
+        ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),
+        (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
+        (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
+        ('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)),
+        ('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
+        (BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
+        ('BF_OPENAL', 'Base path for OpenAL', ''),
+        ('BF_OPENAL_INC', 'Include path for python headers', ''),
+        ('BF_OPENAL_LIB', 'Path to OpenAL library', ''),
+        ('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''),
+        ('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''),
+        (BoolVariable('WITH_BF_STATICOPENAL', 'Staticly link to openal', False)),
+
+        (BoolVariable('WITH_BF_SDL', 'Use SDL if true', False)),
+        ('BF_SDL', 'SDL base path', ''),
+        ('BF_SDL_INC', 'SDL include path', ''),
+        ('BF_SDL_LIB', 'SDL library', ''),
+        ('BF_SDL_LIBPATH', 'SDL library path', ''),
+
+        (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_SNDFILE', 'Enable sndfile support if true', True)),
+        ('BF_SNDFILE', 'sndfile base path', ''),
+        ('BF_SNDFILE_INC', 'sndfile include path', ''),
+        ('BF_SNDFILE_LIB', 'sndfile library', ''),
+        ('BF_SNDFILE_LIB_STATIC', 'Path to sndfile static library', ''),
+        ('BF_SNDFILE_LIBPATH', 'sndfile library path', ''),
+        (BoolVariable('WITH_BF_STATICSNDFILE', 'Staticly link to sndfile', False)),
+
+        ('BF_PTHREADS', 'Pthreads base path', ''),
+        ('BF_PTHREADS_INC', 'Pthreads include path', ''),
+        ('BF_PTHREADS_LIB', 'Pthreads library', ''),
+        ('BF_PTHREADS_LIBPATH', 'Pthreads library path', ''),
+
+        (BoolVariable('WITH_BF_OPENEXR', 'Use OPENEXR if true', True)),
+        (BoolVariable('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', False)),
+        ('BF_OPENEXR', 'OPENEXR base path', ''),
+        ('BF_OPENEXR_INC', 'OPENEXR include path', ''),
+        ('BF_OPENEXR_LIB', 'OPENEXR library', ''),
+        ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''),
+        ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''),
+
+        (BoolVariable('WITH_BF_DDS', 'Support DDS image format if true', True)),
+
+        (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_FFMPEG', 'Use FFMPEG if true', False)),
+        ('BF_FFMPEG', 'FFMPEG base path', ''),
+        ('BF_FFMPEG_LIB', 'FFMPEG library', ''),
+        ('BF_FFMPEG_DLL', 'FFMPEG dll libraries to be installed', ''),
+        ('BF_FFMPEG_EXTRA', 'FFMPEG flags that must be preserved', ''),
+
+        ('BF_FFMPEG_INC', 'FFMPEG includes', ''),
+        ('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)),
+        ('BF_JPEG', 'JPEG base path', ''),
+        ('BF_JPEG_INC', 'JPEG include path', ''),
+        ('BF_JPEG_LIB', 'JPEG library', ''),
+        ('BF_JPEG_LIBPATH', 'JPEG library path', ''),
+
+        (BoolVariable('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', False)),
+        ('BF_OPENJPEG', 'OPENJPEG base path', ''),
+        ('BF_OPENJPEG_INC', 'OPENJPEG include path', ''),
+        ('BF_OPENJPEG_LIB', 'OPENJPEG library', ''),
+        ('BF_OPENJPEG_LIBPATH', 'OPENJPEG library path', ''),
+
+        (BoolVariable('WITH_BF_REDCODE', 'Use REDCODE if true', False)),
+        ('BF_REDCODE', 'REDCODE base path', ''),
+        ('BF_REDCODE_INC', 'REDCODE include path', ''),
+        ('BF_REDCODE_LIB', 'REDCODE library', ''),
+        ('BF_REDCODE_LIBPATH', 'REDCODE library path', ''),
+
+        (BoolVariable('WITH_BF_PNG', 'Use PNG if true', True)),
+        ('BF_PNG', 'PNG base path', ''),
+        ('BF_PNG_INC', 'PNG include path', ''),
+        ('BF_PNG_LIB', 'PNG library', ''),
+        ('BF_PNG_LIBPATH', 'PNG library path', ''),
+
+        (BoolVariable('WITH_BF_TIFF', 'Use TIFF if true', True)),
+        (BoolVariable('WITH_BF_STATICTIFF', 'Staticly link to TIFF', False)),
+        ('BF_TIFF', 'TIFF base path', ''),
+        ('BF_TIFF_INC', 'TIFF include path', ''),
+        ('BF_TIFF_LIB', 'TIFF library', ''),
+        ('BF_TIFF_LIBPATH', 'TIFF library path', ''),
+        ('BF_TIFF_LIB_STATIC', 'TIFF static library', ''),
+
+        (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)),
+        (BoolVariable('WITH_BF_STATICZLIB', 'Staticly link to ZLib', False)),
+        ('BF_ZLIB', 'ZLib base path', ''),
+        ('BF_ZLIB_INC', 'ZLib include path', ''),
+        ('BF_ZLIB_LIB', 'ZLib library', ''),
+        ('BF_ZLIB_LIBPATH', 'ZLib library path', ''),
+        ('BF_ZLIB_LIB_STATIC', 'ZLib static library', ''),
+
+        (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_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)),
+        
+        ('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', ''),
+        (BoolVariable('WITH_BF_STATICCXX', 'static link to stdc++', False)),
+        ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''),
+
+        ('BF_FREETYPE', 'Freetype base path', ''),
+        ('BF_FREETYPE_INC', 'Freetype include path', ''),
+        ('BF_FREETYPE_LIB', 'Freetype library', ''),
+        ('BF_FREETYPE_LIBPATH', 'Freetype library path', ''),
+        (BoolVariable('WITH_BF_FREETYPE_STATIC', 'Use Static Freetype if true', False)),
+        ('BF_FREETYPE_LIB_STATIC', 'Static Freetype library', ''),
+
+        (BoolVariable('WITH_BF_OPENMP', 'Use OpenMP if true', 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('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', ''),
+        ('BF_FFTW3_LIB', 'FFTW3 library', ''),
+        ('BF_FFTW3_LIB_STATIC', 'FFTW3 static libraries', ''),
+        ('BF_FFTW3_LIBPATH', 'FFTW3 library path', ''),
+        (BoolVariable('WITH_BF_STATICFFTW3', 'Staticly link to FFTW3', False)),
+
+        (BoolVariable('WITH_BF_STATICOPENGL', 'Use MESA if true', True)),
+        ('BF_OPENGL', 'OpenGL base path', ''),
+        ('BF_OPENGL_INC', 'OpenGL include path', ''),
+        ('BF_OPENGL_LIB', 'OpenGL libraries', ''),
+        ('BF_OPENGL_LIBPATH', 'OpenGL library path', ''),
+        ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''),
+        ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''),
+
+        (BoolVariable('WITH_BF_COLLADA', 'Build COLLADA import/export module if true', False)),
+        ('BF_COLLADA', 'COLLADA base path', ''),
+        ('BF_COLLADA_INC', 'COLLADA include path', ''),
+        ('BF_COLLADA_LIB', 'COLLADA library', ''),
+        ('BF_OPENCOLLADA', 'OpenCollada base path', ''),
+        ('BF_OPENCOLLADA_INC', 'OpenCollada base include path', ''),
+        ('BF_OPENCOLLADA_LIB', 'OpenCollada library', ''),
+        ('BF_OPENCOLLADA_LIBPATH', 'OpenCollada library path', ''),
+        ('BF_PCRE', 'PCRE base path', ''),
+        ('BF_PCRE_LIB', 'PCRE library', ''),
+        ('BF_PCRE_LIBPATH', 'PCRE library path', ''),
+        ('BF_EXPAT', 'Expat base path', ''),
+        ('BF_EXPAT_LIB', 'Expat library', ''),
+        ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
+        
+        (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
+        (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
+        ('BF_JEMALLOC', 'jemalloc base path', ''),
+        ('BF_JEMALLOC_INC', 'jemalloc include path', ''),
+        ('BF_JEMALLOC_LIB', 'jemalloc library', ''),
+        ('BF_JEMALLOC_LIBPATH', 'jemalloc library path', ''),
+        ('BF_JEMALLOC_LIB_STATIC', 'jemalloc static library', ''),
+
+        (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)),
+        (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
+
+        (BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)),
+        (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)),
+        ('BF_3DMOUSE', '3d mouse library base path', ''),
+        ('BF_3DMOUSE_INC', '3d mouse library include path', ''),
+        ('BF_3DMOUSE_LIB', '3d mouse library', ''),
+        ('BF_3DMOUSE_LIBPATH', '3d mouse library path', ''),
+        ('BF_3DMOUSE_LIB_STATIC', '3d mouse static library', ''),
+
+        ('CFLAGS', 'C only flags', []),
+        ('CCFLAGS', 'Generic C and C++ flags', []),
+        ('CXXFLAGS', 'C++ only flags', []),
+        ('BGE_CXXFLAGS', 'C++ only flags for BGE', []),
+        ('CPPFLAGS', 'Defines', []),
+        ('REL_CFLAGS', 'C only release flags', []),
+        ('REL_CCFLAGS', 'Generic C and C++ release flags', []),
+        ('REL_CXXFLAGS', 'C++ only release flags', []),
+
+        ('C_WARN', 'C warning flags', []),
+        ('CC_WARN', 'Generic C and C++ warning flags', []),
+        ('CXX_WARN', 'C++ only warning flags', []),
+
+        ('LLIBS', 'Platform libs', []),
+        ('PLATFORM_LINKFLAGS', 'Platform linkflags', []),
+        ('MACOSX_ARCHITECTURE', 'python_arch.zip select', ''),
+        ('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', []),
+        ('BF_PROFILE_CCFLAGS', 'C and C++ profiling flags', []),
+        ('BF_PROFILE_CXXFLAGS', 'C++ only profiling flags', []),
+        ('BF_PROFILE_LINKFLAGS', 'Profile linkflags', []),
+
+        (BoolVariable('BF_DEBUG', 'Add debug flags if true', False)),
+        ('BF_DEBUG_CFLAGS', 'C only debug flags', []),
+        ('BF_DEBUG_CCFLAGS', 'C and C++ debug flags', []),
+        ('BF_DEBUG_CXXFLAGS', 'C++ only debug flags', []),
+
+        (BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', False)),
+
+        ('BF_BUILDDIR', 'Build dir', ''),
+        ('BF_INSTALLDIR', 'Installation dir', ''),
+
+        ('CC', 'C compiler to use', env['CC']),
+        ('CXX', 'C++ compiler to use', env['CXX']),
+
+        (BoolVariable('BF_BUILDINFO', 'Buildtime in splash if true', True)),
+
+        (BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)),
+        (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('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_CARVE', 'Enable carve library for mesh boolean operations', True)),
+        
+        (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
+
+        ('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),
+
+        ('BF_VERSION', 'The root path for Unix (non-apple)', '2.5'),
+
+        (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_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
+
+        (BoolVariable('WITH_BF_OIIO', 'Build with 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_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_LIBPATH', 'Boost library path', ''),
+        ('BF_BOOST_LIB_STATIC', 'Boost static library', '')
+    ) # end of opts.AddOptions()
+
+    return localopts
+
+def buildbot_zip(src, dest, package_name, extension):
+    import zipfile
+    ln = len(src)+1 # one extra to remove leading os.sep when cleaning root for package_root
+    flist = list()
+
+    # create list of tuples containing file and archive name
+    for root, dirs, files in os.walk(src):
+        package_root = os.path.join(package_name, root[ln:])
+        flist.extend([(os.path.join(root, file), os.path.join(package_root, file)) for file in files])
+
+    if extension == '.zip':
+        package = zipfile.ZipFile(dest, 'w', zipfile.ZIP_DEFLATED)
+        package.comment = package_name + ' is a zip-file containing the Blender software. Visit http://www.blender.org for more information.'
+        for entry in flist:
+            package.write(entry[0], entry[1])
+        package.close()
+    else:
+        import tarfile
+        package = tarfile.open(dest, 'w:bz2')
+        for entry in flist:
+            package.add(entry[0], entry[1], recursive=False)
+        package.close()
+    bb_zip_name = os.path.normpath(src + os.sep + '..' + os.sep + 'buildbot_upload.zip')
+    print("creating %s" % (bb_zip_name))
+    bb_zip = zipfile.ZipFile(bb_zip_name, 'w', zipfile.ZIP_DEFLATED)
+    print("writing %s to %s" % (dest, bb_zip_name))
+    bb_zip.write(dest, os.path.split(dest)[1])
+    bb_zip.close()
+    print("removing unneeded packed file %s (to keep install directory clean)" % (dest))
+    os.remove(dest)
+    print("done.")
+
+def buildslave_print(target, source, env):
+    return "Running buildslave target"
+
+def buildslave(target=None, source=None, env=None):
+    """
+    Builder for buildbot integration. Used by buildslaves of http://builder.blender.org only.
+    """
+
+    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw', 'darwin'):
+        extension = '.zip'
+    else:
+        extension = '.tar.bz2'
+
+    platform = env['OURPLATFORM'].split('-')[0]
+    if platform == 'linux':
+        import platform
+
+        bitness = platform.architecture()[0]
+        if bitness == '64bit':
+            platform = 'linux-glibc27-x86_64'
+        elif bitness == '32bit':
+            platform = 'linux-glibc27-i686'
+    if platform == 'darwin':
+        platform = 'OSX-' + env['MACOSX_ARCHITECTURE']
+
+    branch = env['BUILDBOT_BRANCH']
+
+    outdir = os.path.abspath(env['BF_INSTALLDIR'])
+    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)
+    package_archive = os.path.normpath(outdir + os.sep + '..' + os.sep + package_name + extension)
+
+    try:
+        if os.path.exists(package_archive):
+            os.remove(package_archive)
+        if os.path.exists(package_dir):
+            shutil.rmtree(package_dir)
+    except Exception, ex:
+        sys.stderr.write('Failed to clean up old package files: ' + str(ex) + '\n')
+        return 1
+
+    buildbot_zip(outdir, package_archive, package_name, extension)
+
+    return 0
+
+def NSIS_print(target, source, env):
+    return "Creating NSIS installer for Blender"
+
+def NSIS_Installer(target=None, source=None, env=None):
+    print "="*35
+
+    if env['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc'):
+        print "NSIS installer is only available on Windows."
+        Exit()
+    if env['OURPLATFORM'] == 'win32-vc':
+        bitness = '32'
+    elif env['OURPLATFORM'] == 'win64-vc':
+        bitness = '64'
+    else:
+        bitness = '-mingw'
+
+    start_dir = os.getcwd()
+    rel_dir = os.path.join(start_dir,'release','windows','installer')
+    install_base_dir = start_dir + os.sep
+
+    bf_installdir = os.path.join(os.getcwd(),env['BF_INSTALLDIR'])
+    bf_installdir = os.path.normpath(bf_installdir)
+
+    doneroot = False
+    rootdirconts = []
+    datafiles = ''
+    deldatafiles = ''
+    deldatadirs = ''
+    l = len(bf_installdir)
+    
+    for dp,dn,df in os.walk(bf_installdir):
+        # install
+        if not doneroot:
+            for f in df:
+                rootdirconts.append(os.path.join(dp,f))
+            doneroot = True
+        else:
+            if len(df)>0:
+                dp_tmp = dp[l:]
+                datafiles += "\n" +r'SetOutPath $INSTDIR'+dp[l:]+"\n\n"
+
+                for f in df:
+                    outfile = os.path.join(dp,f)
+                    datafiles += '  File '+outfile + "\n"
+
+        # uninstall
+        deldir = dp[l+1:]
+
+        if len(deldir)>0:
+            deldatadirs = "RMDir $INSTDIR\\" + deldir + "\n" + deldatadirs
+            deldatadirs = "RMDir /r $INSTDIR\\" + deldir + "\\__pycache__\n" + deldatadirs
+
+            for f in df:
+                deldatafiles += 'Delete \"$INSTDIR\\' + os.path.join(deldir, f) + "\"\n"
+
+    #### change to suit install dir ####
+    inst_dir = install_base_dir + env['BF_INSTALLDIR']
+    
+    os.chdir(rel_dir)
+
+    ns = open("00.sconsblender.nsi","r")
+
+    ns_cnt = str(ns.read())
+    ns.close()
+
+    # var replacements
+    ns_cnt = string.replace(ns_cnt, "[DISTDIR]", os.path.normpath(inst_dir+os.sep))
+    ns_cnt = string.replace(ns_cnt, "[VERSION]", VERSION_DISPLAY)
+    ns_cnt = string.replace(ns_cnt, "[SHORTVERSION]", VERSION)
+    ns_cnt = string.replace(ns_cnt, "[RELDIR]", os.path.normpath(rel_dir))
+    ns_cnt = string.replace(ns_cnt, "[BITNESS]", bitness)
+
+    # do root
+    rootlist = []
+    for rootitem in rootdirconts:
+        rootlist.append("File \"" + rootitem + "\"")
+    rootstring = string.join(rootlist, "\n  ")
+    rootstring = rootstring
+    rootstring += "\n\n"
+    ns_cnt = string.replace(ns_cnt, "[ROOTDIRCONTS]", rootstring)
+
+
+    # do delete items
+    delrootlist = []
+    for rootitem in rootdirconts:
+        delrootlist.append("Delete $INSTDIR\\" + rootitem[l+1:])
+    delrootstring = string.join(delrootlist, "\n ")
+    delrootstring += "\n"
+    ns_cnt = string.replace(ns_cnt, "[DELROOTDIRCONTS]", delrootstring)
+
+    ns_cnt = string.replace(ns_cnt, "[DODATAFILES]", datafiles)
+    ns_cnt = string.replace(ns_cnt, "[DELDATAFILES]", deldatafiles)
+    ns_cnt = string.replace(ns_cnt, "[DELDATADIRS]", deldatadirs)
+
+    tmpnsi = os.path.normpath(install_base_dir+os.sep+env['BF_BUILDDIR']+os.sep+"00.blender_tmp.nsi")
+    new_nsis = open(tmpnsi, 'w')
+    new_nsis.write(ns_cnt)
+    new_nsis.close()
+    print "NSIS Installer script created"
+
+    os.chdir(start_dir)
+    print "Launching 'makensis'"
+
+    cmdline = "makensis " + "\""+tmpnsi+"\""
+
+    startupinfo = subprocess.STARTUPINFO()
+    startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+    proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE, startupinfo=startupinfo, shell = True)
+    data, err = proc.communicate()
+    rv = proc.wait()
+
+    if rv != 0:
+        print
+        print data.strip().split("\n")[-1]
+    return rv
+
+def check_environ():
+    problematic_envvars = ""
+    for i in os.environ:
+        try:
+            os.environ[i].decode('ascii')
+        except UnicodeDecodeError:
+            problematic_envvars = problematic_envvars + "%s = %s\n" % (i, os.environ[i])
+    if len(problematic_envvars)>0:
+        print("================\n\n")
+        print("@@ ABORTING BUILD @@\n")
+        print("PROBLEM DETECTED WITH ENVIRONMENT")
+        print("---------------------------------\n\n")
+        print("A problem with one or more environment variable was found")
+        print("Their value contain non-ascii characters. Check the below")
+        print("list and override them locally to be ASCII-clean by doing")
+        print("'set VARNAME=cleanvalue' on the command-line prior to")
+        print("starting the build process:\n")
+        print(problematic_envvars)
+        return False
+    else:
+        return True

build_files/scons/tools/crossmingw.py

@@ -0,0 +1,184 @@
+"""SCons.Tool.gcc
+
+Tool-specific initialization for MinGW (http://www.mingw.org/)
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "src/engine/SCons/Tool/mingw.py 4043 2009/02/23 09:06:45 scons"
+
+import os
+import os.path
+import string
+
+import SCons.Action
+import SCons.Builder
+import SCons.Defaults
+import SCons.Tool
+import SCons.Util
+
+# This is what we search for to find mingw:
+prefixes = SCons.Util.Split("""
+    mingw32-
+    i386-mingw32msvc-
+    i486-mingw32msvc-
+    i586-mingw32msvc-
+    i686-mingw32msvc-
+    i686-pc-mingw32-
+""")
+
+def find(env):
+    for prefix in prefixes:
+        # First search in the SCons path and then the OS path:
+        if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
+            return prefix
+
+    return ''
+
+def shlib_generator(target, source, env, for_signature):
+    cmd = SCons.Util.CLVar(['$SHLINK']) 
+
+    dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
+    if dll: cmd.extend(['-o', dll])
+
+    cmd.extend(['$SOURCES', '$SHLINKFLAGS', '$_LIBDIRFLAGS', '$_LIBFLAGS'])
+
+    implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX')
+    if implib: cmd.append('-Wl,--out-implib,'+implib.get_string(for_signature))
+
+    def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
+    insert_def = env.subst("$WINDOWS_INSERT_DEF")
+    if not insert_def in ['', '0', 0] and def_target: \
+        cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature))
+
+    return [cmd]
+
+def shlib_emitter(target, source, env):
+    dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
+    no_import_lib = env.get('no_import_lib', 0)
+
+    if not dll:
+        raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")
+
+    if not no_import_lib and \
+       not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'):
+
+        # Append an import library to the list of targets.
+        target.append(env.ReplaceIxes(dll,  
+                                      'SHLIBPREFIX', 'SHLIBSUFFIX',
+                                      'LIBPREFIX', 'LIBSUFFIX'))
+
+    # Append a def file target if there isn't already a def file target
+    # or a def file source. There is no option to disable def file
+    # target emitting, because I can't figure out why someone would ever
+    # want to turn it off.
+    def_source = env.FindIxes(source, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
+    def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
+    if not def_source and not def_target:
+        target.append(env.ReplaceIxes(dll,  
+                                      'SHLIBPREFIX', 'SHLIBSUFFIX',
+                                      'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX'))
+
+    return (target, source)
+
+
+shlib_action = SCons.Action.Action(shlib_generator, generator=1)
+
+res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
+
+res_builder = SCons.Builder.Builder(action=res_action, suffix='.o',
+                                    source_scanner=SCons.Tool.SourceFileScanner)
+SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan)
+
+def generate(env):
+    mingw = find(env)
+    if mingw:
+        dir = os.path.dirname(mingw)
+        env.PrependENVPath('PATH', dir )
+        
+
+    # Most of mingw is the same as gcc and friends...
+    gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas', 'm4']
+    for tool in gnu_tools:
+        SCons.Tool.Tool(tool)(env)
+
+    #... but a few things differ:
+    env['CC'] = mingw + 'gcc'
+    env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
+    env['CXX'] = mingw + 'g++'
+    env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+    env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
+    env['SHLINKCOM']   = shlib_action
+    env['LDMODULECOM'] = shlib_action
+    env.Append(SHLIBEMITTER = [shlib_emitter])
+    env['RANLIB'] = mingw + 'ranlib'
+    env['LINK'] = mingw + 'gcc'
+    env['AS'] = mingw + 'as'
+    env['AR'] = mingw + 'ar'
+
+    env['WIN32DEFPREFIX']        = ''
+    env['WIN32DEFSUFFIX']        = '.def'
+    env['WINDOWSDEFPREFIX']      = '${WIN32DEFPREFIX}'
+    env['WINDOWSDEFSUFFIX']      = '${WIN32DEFSUFFIX}'
+
+    env['SHOBJSUFFIX'] = '.o'
+    env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
+
+    env['RC'] = mingw + 'windres'
+    env['RCFLAGS'] = SCons.Util.CLVar('')
+    env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'
+    env['RCINCPREFIX'] = '--include-dir '
+    env['RCINCSUFFIX'] = ''
+    env['RCCOM'] = '$RC $_CPPDEFFLAGS $RCINCFLAGS ${RCINCPREFIX} ${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
+    env['BUILDERS']['RES'] = res_builder
+
+    # Some setting from the platform also have to be overridden:
+    env['OBJPREFIX']      = ''
+    env['OBJSUFFIX']      = '.o'
+    env['LIBPREFIX']      = 'lib'
+    env['LIBSUFFIX']      = '.a'
+    env['SHOBJPREFIX']    = '$OBJPREFIX'
+    env['SHOBJSUFFIX']    = '$OBJSUFFIX'
+    env['PROGPREFIX']     = ''
+    env['PROGSUFFIX']     = '.exe'
+    env['LIBPREFIX']      = ''
+    env['LIBSUFFIX']      = '.lib'
+    env['SHLIBPREFIX']    = ''
+    env['SHLIBSUFFIX']    = '.dll'
+    env['LIBPREFIXES']    = [ '$LIBPREFIX' ]
+    env['LIBSUFFIXES']    = [ '$LIBSUFFIX' ]
+
+def exists(env):
+    return find(env)
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:

build_files/scons/tools/mstoolkit.py

@@ -0,0 +1,353 @@
+"""tools.mstoolkit
+
+Tool-specific initialization for Microsoft Visual C/C++ Toolkit Commandline
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+#
+# Copyright (c) 2004 John Connors
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+
+import os.path
+import re
+import string
+import types
+
+import SCons.Action
+import SCons.Builder
+import SCons.Errors
+import SCons.Platform.win32
+import SCons.Tool
+import SCons.Util
+import SCons.Warnings
+
+CSuffixes = ['.c', '.C']
+CXXSuffixes = ['.cc', '.cpp', '.cxx', '.c++', '.C++']
+
+def get_msvctoolkit_paths():
+    """Return a 4-tuple of (INCLUDE, LIB, PATH, TOOLKIT) as the values of those
+    three environment variables that should be set in order to execute
+    the MSVC .NET tools properly, if the information wasn't available
+    from the registry."""
+
+    MSToolkitDir = None
+    paths = {}
+    exe_path = ''
+    lib_path = ''
+    include_path = ''
+
+    # First, we get the shell folder for this user:
+    if not SCons.Util.can_read_reg:
+        raise SCons.Errors.InternalError, "No Windows registry module was found"
+
+    # look for toolkit
+    if os.environ.has_key('VCToolkitInstallDir'):
+        MSToolkitDir = os.path.normpath(os.environ['VCToolkitInstallDir'])
+    else:
+        # last resort -- default install location
+        MSToolkitDir = r'C:\Program Files\Microsoft Visual C++ Toolkit 2003'
+
+    # look for platform sdk
+    if os.environ.has_key('MSSdk'):
+        PlatformSDKDir = os.path.normpath(os.environ['MSSdk'])
+    else:
+        try:
+            PlatformSDKDir = SCons.Util.RegGetValue(SCons.Util.HKEY_LOCAL_MACHINE, r'SOFTWARE\Microsoft\MicrosoftSDK\Directories\Install Dir')[0]
+            PlatformSDKDir = str(PlatformSDKDir)
+        except SCons.Util.RegError:
+            raise SCons.Errors.InternalError, "The Platform SDK directory was not found in the registry or in the `MSSdk` environment variable."
+
+    # look for DX Sdk (expecting DX9)
+    # dxsdk docs have a directory key, look for it, extract path
+    #dxsdkdocs = ""
+    DXsdkDir = ""
+    #try:
+    #   dxsdkdocs = SCons.Util.RegGetValue(SCons.Util.HKEY_LOCAL_MACHINE, r'SOFTWARE\Microsoft\DirectX SDK\DX9SDK Doc Path')
+    #except SCons.Util.RegError:
+    #   raise SCons.Errors.InternalError, "The DXSDK directory was not found in the registry."
+    if os.environ.has_key('DXSDK_DIR'):
+        DXsdkDir = os.path.normpath(os.environ['DXSDK_DIR'])
+
+    #DXsdkDir = os.path.split(dxsdkdocs[0])[0]
+    DXsdkDir = os.path.split(DXsdkDir)[0]
+
+    include_path = r'%s\include;%s\include;%s\include' % (MSToolkitDir, PlatformSDKDir, DXsdkDir)
+    lib_path = r'%s\lib;%s\lib;%s\lib' % (MSToolkitDir, PlatformSDKDir, DXsdkDir)
+    exe_path = r'%s\bin;%s\bin\win95;%s\bin' % (MSToolkitDir, PlatformSDKDir, PlatformSDKDir)
+    return (include_path, lib_path, exe_path, PlatformSDKDir)
+
+def validate_vars(env):
+    """Validate the PDB, PCH, and PCHSTOP construction variables."""
+    if env.has_key('PCH') and env['PCH']:
+        if not env.has_key('PCHSTOP'):
+            raise SCons.Errors.UserError, "The PCHSTOP construction must be defined if PCH is defined."
+        if not SCons.Util.is_String(env['PCHSTOP']):
+            raise SCons.Errors.UserError, "The PCHSTOP construction variable must be a string: %r"%env['PCHSTOP']
+
+def pch_emitter(target, source, env):
+    """Sets up the PDB dependencies for a pch file, and adds the object
+    file target."""
+
+    validate_vars(env)
+
+    pch = None
+    obj = None
+
+    for t in target:
+        if SCons.Util.splitext(str(t))[1] == '.pch':
+            pch = t
+        if SCons.Util.splitext(str(t))[1] == '.obj':
+            obj = t
+
+    if not obj:
+        obj = SCons.Util.splitext(str(pch))[0]+'.obj'
+
+    target = [pch, obj] # pch must be first, and obj second for the PCHCOM to work
+
+    if env.has_key('PDB') and env['PDB']:
+        env.SideEffect(env['PDB'], target)
+        env.Precious(env['PDB'])
+
+    return (target, source)
+
+def object_emitter(target, source, env, parent_emitter):
+    """Sets up the PDB and PCH dependencies for an object file."""
+
+    validate_vars(env)
+
+    parent_emitter(target, source, env)
+
+    if env.has_key('PDB') and env['PDB']:
+        env.SideEffect(env['PDB'], target)
+        env.Precious(env['PDB'])
+
+    if env.has_key('PCH') and env['PCH']:
+        env.Depends(target, env['PCH'])
+
+    return (target, source)
+
+def static_object_emitter(target, source, env):
+    return object_emitter(target, source, env,
+                          SCons.Defaults.StaticObjectEmitter)
+
+def shared_object_emitter(target, source, env):
+    return object_emitter(target, source, env,
+                          SCons.Defaults.SharedObjectEmitter)
+
+pch_builder = SCons.Builder.Builder(action='$PCHCOM', suffix='.pch', emitter=pch_emitter)
+res_builder = SCons.Builder.Builder(action='$RCCOM', suffix='.res')
+
+def pdbGenerator(env, target, source, for_signature):
+    if target and env.has_key('PDB') and env['PDB']:
+        return ['/PDB:%s'%target[0].File(env['PDB']).get_string(for_signature),
+                '/DEBUG']
+
+def win32ShlinkTargets(target, source, env, for_signature):
+    listCmd = []
+    dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
+    if dll: listCmd.append("/out:%s"%dll.get_string(for_signature))
+
+    implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX')
+    if implib: listCmd.append("/implib:%s"%implib.get_string(for_signature))
+
+    return listCmd
+
+def win32ShlinkSources(target, source, env, for_signature):
+    listCmd = []
+
+    deffile = env.FindIxes(source, "WIN32DEFPREFIX", "WIN32DEFSUFFIX")
+    for src in source:
+        if src == deffile:
+            # Treat this source as a .def file.
+            listCmd.append("/def:%s" % src.get_string(for_signature))
+        else:
+            # Just treat it as a generic source file.
+            listCmd.append(src)
+    return listCmd
+
+def win32LibEmitter(target, source, env):
+    # SCons.Tool.msvc.validate_vars(env)
+
+    dll = env.FindIxes(target, "SHLIBPREFIX", "SHLIBSUFFIX")
+    no_import_lib = env.get('no_import_lib', 0)
+
+    if not dll:
+        raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")
+
+    if env.get("WIN32_INSERT_DEF", 0) and \
+       not env.FindIxes(source, "WIN32DEFPREFIX", "WIN32DEFSUFFIX"):
+
+        # append a def file to the list of sources
+        source.append(env.ReplaceIxes(dll,
+                                      "SHLIBPREFIX", "SHLIBSUFFIX",
+                                      "WIN32DEFPREFIX", "WIN32DEFSUFFIX"))
+
+    if env.has_key('PDB') and env['PDB']:
+        env.SideEffect(env['PDB'], target)
+        env.Precious(env['PDB'])
+
+    if not no_import_lib and \
+       not env.FindIxes(target, "LIBPREFIX", "LIBSUFFIX"):
+        # Append an import library to the list of targets.
+        target.append(env.ReplaceIxes(dll,
+                                      "SHLIBPREFIX", "SHLIBSUFFIX",
+                                      "LIBPREFIX", "LIBSUFFIX"))
+        # and .exp file is created if there are exports from a DLL
+        target.append(env.ReplaceIxes(dll,
+                                      "SHLIBPREFIX", "SHLIBSUFFIX",
+                                      "WIN32EXPPREFIX", "WIN32EXPSUFFIX"))
+
+    return (target, source)
+
+def prog_emitter(target, source, env):
+    #SCons.Tool.msvc.validate_vars(env)
+
+    if env.has_key('PDB') and env['PDB']:
+        env.SideEffect(env['PDB'], target)
+        env.Precious(env['PDB'])
+
+    return (target,source)
+
+def RegServerFunc(target, source, env):
+    if env.has_key('register') and env['register']:
+        ret = regServerAction([target[0]], [source[0]], env)
+        if ret:
+            raise SCons.Errors.UserError, "Unable to register %s" % target[0]
+        else:
+            print "Registered %s sucessfully" % target[0]
+        return ret
+    return 0
+
+regServerAction = SCons.Action.Action("$REGSVRCOM")
+regServerCheck = SCons.Action.Action(RegServerFunc, None)
+shlibLinkAction = SCons.Action.Action('${TEMPFILE("$SHLINK $SHLINKFLAGS $_SHLINK_TARGETS $( $_LIBDIRFLAGS $) $_LIBFLAGS $_PDB $_SHLINK_SOURCES")}')
+compositeLinkAction = shlibLinkAction + regServerCheck
+
+def generate(env):
+    """Add Builders and construction variables for MSVC++ to an Environment."""
+    static_obj, shared_obj = SCons.Tool.createObjBuilders(env)
+
+    for suffix in CSuffixes:
+        static_obj.add_action(suffix, SCons.Defaults.CAction)
+        shared_obj.add_action(suffix, SCons.Defaults.ShCAction)
+
+    for suffix in CXXSuffixes:
+        static_obj.add_action(suffix, SCons.Defaults.CXXAction)
+        shared_obj.add_action(suffix, SCons.Defaults.ShCXXAction)
+
+    SCons.Tool.createStaticLibBuilder(env)
+    SCons.Tool.createSharedLibBuilder(env)
+    SCons.Tool.createProgBuilder(env)
+
+    env['CCPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Zi /Fd%s"%File(PDB)) or ""}'])
+    env['CCPCHFLAGS'] = SCons.Util.CLVar(['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'])
+    env['CCCOMFLAGS'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS'
+    env['CC']        = 'cl'
+    env['CCFLAGS']    = SCons.Util.CLVar('/nologo')
+    env['CCCOM']      = '$CC $CCFLAGS $CCCOMFLAGS'
+    env['SHCC']        = '$CC'
+    env['SHCCFLAGS']  = SCons.Util.CLVar('$CCFLAGS')
+    env['SHCCCOM']    = '$SHCC $SHCCFLAGS $CCCOMFLAGS'
+    env['CXX']      = '$CC'
+    env['CXXFLAGS']   = SCons.Util.CLVar('$CCFLAGS $( /TP $)')
+    env['CXXCOM']     = '$CXX $CXXFLAGS $CCCOMFLAGS'
+    env['SHCXX']      = '$CXX'
+    env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+    env['SHCXXCOM']   = '$SHCXX $SHCXXFLAGS $CCCOMFLAGS'
+    env['CPPDEFPREFIX']  = '/D'
+    env['CPPDEFSUFFIX']  = ''
+    env['INCPREFIX']  = '/I'
+    env['INCSUFFIX']  = ''
+    env['OBJEMITTER'] = static_object_emitter
+    env['SHOBJEMITTER'] = shared_object_emitter
+    env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
+
+    env['RC'] = 'rc'
+    env['RCFLAGS'] = SCons.Util.CLVar('')
+    env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES'
+    CScan = env.get_scanner('.c')
+    if CScan:
+        CScan.add_skey('.rc')
+    env['BUILDERS']['RES'] = res_builder
+
+    include_path, lib_path, exe_path, sdk_path = get_msvctoolkit_paths()
+    env.PrependENVPath('INCLUDE', include_path)
+    env.PrependENVPath('LIB', lib_path)
+    env.PrependENVPath('PATH', exe_path)
+
+    env['ENV']['CPU'] = 'i386'
+    env['ENV']['MSSDK'] = sdk_path
+    env['ENV']['BkOffice'] = sdk_path
+    env['ENV']['Basemake'] = sdk_path + "\\Include\\BKOffice.Mak"
+    env['ENV']['INETSDK'] = sdk_path
+    env['ENV']['MSSDK'] = sdk_path
+    env['ENV']['MSTOOLS'] = sdk_path
+    env['ENV']['TARGETOS'] = 'WINNT'
+    env['ENV']['APPVER'] = '5.0'
+
+    env['CFILESUFFIX'] = '.c'
+    env['CXXFILESUFFIX'] = '.cc'
+
+    env['PCHCOM'] = '$CXX $CXXFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo${TARGETS[1]} /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS'
+    env['BUILDERS']['PCH'] = pch_builder
+
+    env['AR']     = 'lib.exe' #'"' +sdk_path + '\\bin\\Win64\\lib.exe"'
+    env['ARFLAGS']     = SCons.Util.CLVar('/nologo')
+    env['ARCOM']       = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}"
+
+    env['SHLINK']      = '$LINK'
+    env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS /dll')
+    env['_SHLINK_TARGETS'] = win32ShlinkTargets
+    env['_SHLINK_SOURCES'] = win32ShlinkSources
+    env['SHLINKCOM']   =  compositeLinkAction
+    env['SHLIBEMITTER']= win32LibEmitter
+    env['LINK'] =  'link.exe' #'"' +sdk_path + '\\bin\\Win64\\' + 'link.exe"'
+    env['LINKFLAGS']   = SCons.Util.CLVar('/nologo')
+    env['_PDB'] = pdbGenerator
+    env["TEMPFILE"] = SCons.Platform.win32.TempFileMunge
+    env['LINKCOM'] = '${TEMPFILE("$LINK $LINKFLAGS /OUT:$TARGET $( $_LIBDIRFLAGS $) $_LIBFLAGS $_PDB $SOURCES")}'
+    env['PROGEMITTER'] = prog_emitter
+    env['LIBDIRPREFIX']='/LIBPATH:'
+    env['LIBDIRSUFFIX']=''
+    env['LIBLINKPREFIX']=''
+    env['LIBLINKSUFFIX']='$LIBSUFFIX'
+
+    env['WIN32DEFPREFIX']   = ''
+    env['WIN32DEFSUFFIX']   = '.def'
+    env['WIN32_INSERT_DEF']      = 0
+
+    env['WIN32EXPPREFIX']   = ''
+    env['WIN32EXPSUFFIX']   = '.exp'
+
+    env['REGSVRACTION'] = regServerCheck
+    env['REGSVR'] = os.path.join(SCons.Platform.win32.get_system_root(),'System32','regsvr32')
+    env['REGSVRFLAGS'] = '/s '
+    env['REGSVRCOM'] = '$REGSVR $REGSVRFLAGS $TARGET'
+
+
+def exists(env):
+    return env.Detect('cl')

build_files/utils/build_tgz.sh

@@ -1,72 +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]) "\
-"if os.path.basename(l[:-1]) not in {"\
-"'.gitignore', "\
-"'.gitmodules', "\
-"'.arcconfig', "\
-"}"\
-"]"
-
-# 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
 
 # ***** 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'
@@ -206,13 +206,13 @@ class DNACatalogHTML:
                 <td>${size}</td>
             </tr>"""
         
-        if field.Type.Structure is None or field.Name.IsPointer():
+        if field.Type.Structure == None or field.Name.IsPointer():
 
             # ${reference}
             reference = field.Name.AsReference(parentReference)
 
             # ${struct}
-            if parentReference is not None:
+            if parentReference != None:
                 struct = '<a href="#{0}">{0}</a>'.format(structure.Type.Name)
             else:
                 struct = structure.Type.Name
@@ -240,7 +240,7 @@ class DNACatalogHTML:
             
             structure_field = Template(structure_field_template).substitute(d)
         
-        elif field.Type.Structure is not None:
+        elif field.Type.Structure != None:
             reference = field.Name.AsReference(parentReference)
             structure_field = self.StructureFields(field.Type.Structure, reference, offset) 
 
@@ -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
 
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -329,7 +329,7 @@ class DNAName:
         self.Name = name
         
     def AsReference(self, parent):
-        if parent is None:
+        if parent == None:
             result = ""
         else:
             result = parent+"."

doc/build_systems/cmake.txt

@@ -0,0 +1,154 @@
+
+    Blender CMake build system
+    ============================
+
+    Contents
+    ---------------
+
+    1. Introduction
+    2. Obtaining CMake
+    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
+    ---------------
+
+    This document describes general usage of the new CMake scripts. The
+    inner workings will be described in blender-cmake-dev.txt (TODO).
+
+    2. Obtaining CMake
+    ------------------
+
+    CMake for can either be downloaded using your favorite package manager 
+    or is also available from the CMake website at http://www.cmake.org 
+    The website also contains some documentation on CMake usage but I found
+    the man page alone pretty helpful. 
+
+    3. Obtaining Dependencies
+    -------------------------
+
+    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.
+
+    4. Deciding on a Build Environment
+    ----------------------------------
+
+    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
+    with different Blender configurations (Audio/NoAudio, GameEngine/NoGameEngine etc.)
+    while maintaining a clean source tree. It also makes it possible to generate files
+    for different build systems on the same source tree. This also has benefits for 
+    general SVN management for the developer as patches and submit logs are much cleaner.
+
+    Create a directory outside the blender source tree where you would like to build
+    Blender (from now on called $BLENDERBUILD). On the commandline you can then run
+    the cmake command to generate your initial build files. First just run 'cmake' which
+    will inform you what the available generators are. Thn you can run 
+    'cmake -G generator $BLENDERSOURCE' to generate the build files. Here is an example 
+    of all this for Xcode:
+
+        % mkdir $BLENDERBUILD
+        % cd $BLENDERBUILD
+        % cmake
+
+        ...
+        ...
+        --version [file]            = Show program name/version banner and exit.
+
+        Generators
+
+        The following generators are available on this platform:
+          KDevelop3                   = Generates KDevelop 3 project files.
+          Unix Makefiles              = Generates standard UNIX makefiles.
+          Xcode                       = Generate XCode project files.
+
+
+
+        % cmake -G Xcode $BLENDERSOURCE
+        ...
+        ...
+        -- Configuring blender
+        -- Configuring blenderplayer
+        -- Configuring done
+        -- Generating done
+        -- Build files have been written to: $BLENDERBUILD 
+
+    This will generate the build files with default values. Specific features can
+    be enabled or disabled by running the ccmake "GUI" from $BLENDERBUILD as follows:
+
+        % ccmake $BLENDERSOURCE
+
+    A number of options appear which can be changed depending on your needs and
+    available dependencies (e.g. setting WITH_OPENEXR to OFF will disable support
+    for OpenEXR). It will also allow you to override default and detected paths 
+    (e.g. Python directories) and compile and link flags. When you are satisfied
+    used ccmake to re-configure the build files and exit.
+
+    It is also possible to use the commandline of 'cmake' to override certain
+    of these settings. 
+
+    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
+    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/build_systems/scons-dev.txt

@@ -0,0 +1,192 @@
+
+    Internals of Blenders SCons scripts
+    ===================================
+
+    Scope
+    ------
+    This document describes the architecture of the SCons scripts for
+    Blender. An overview of available functionality and how to modify,
+    extend and maintain the system.
+
+    Audience
+    --------
+    This document is for developers who need to modify the system,
+    ie. add or remove new libraries, add new arguments for SCons, etc.
+
+    Files and their meaning
+    -----------------------
+
+    The main entry point for the build system is the SConstruct-file in
+    $BLENDERHOME. This file creates the first BlenderEnvironment to work
+    with, reads in options, and sets up some directory structures. Further
+    it defines some targets.
+
+    Platform-specific configurations are in $BLENDERHOME/config. The
+    filenames have the form (platform)-config.py, where platform one of:
+
+        * darwin
+        * linux
+        * win32-mingw
+        * win32-vc
+
+    The user can override options by creating a file
+    $BLENDERHOME/user-config.py. It can have any option from
+    (platform)-config.py. Options in this file will override the platform
+    defaults.
+
+    Much of the actual functionality can be found in the python scripts
+    in the directory $BLENDERHOME/tools, with Blender.py defining the
+    bulk of the functionality. btools.py has some helper functions, and
+    bcolors.py is for the terminal colours. mstoolkit.py and crossmingw.py
+    are modules which set up SCons for the MS VC++ 2003 toolkit and
+    the cross-compile toolset for compiling Windows binaries on Linux
+    respectively. Note: the cross-compile doesn't work yet for Blender,
+    but is added in preparation for having it work in the distant future.
+
+    BlenderEnvironment
+    ------------------
+
+    The module Blender.py implements a BlenderEnvironment class, derived
+    from the SConsEnvironment of SCons. This is done to wrap some often
+    used functionality. The BlenderEnvironment offers two important
+    wrappers: BlenderProg() and BlenderLib(). The first one is used to
+    specify a binary to be built, the second one is used to specify what
+    static library is built from given sources.
+
+    Build a static library called "somelib". The system handles library
+    pre- and suffixes automatically, you don't need to bother yourself
+    with these details:
+
+        env = BlenderEnvironment(ENV = os.environ) # create an environment
+        env.BlenderLib(libname="somelib", sources=['list.c','with.c','sources.c'],
+                        includes=['/list/with/include/paths', '.', '..'],
+                        defines=['LIST_WITH', 'CPP_DEFINES', 'TO_USE'],
+                        libtype=['blender', 'common'] # this is a list with libtypes. Normally you don't
+                                                      # need to specify this, but if you encounter linking
+                                                      # problems you may need this
+                        priority=[10, 20]             # Priorities, list as long as libtype, priority per type
+                        compileflags=['/O2']          # List of compile flags needed for this particular library.
+                                                      # used only in rare cases, like SOLID, qhull and Bullet
+                        )
+
+    There should be no need to ever add an extra BlenderProg to the
+    existing ones in SConstruct, see that file for its use, and Blender.py
+    for its implementation.
+
+    The new system works so that using these wrappers, has all libraries
+    (and programs) register with a central repository. This means that
+    adding a new library is as easy as just creating the new SConscript
+    and making sure that it gets called properly. Linking and such will
+    then be handled automatically.
+
+    If you want that adding new source files for a certain library
+    is handled automatically, you can use the Glob() function from
+    the BlenderEnvironment to create lists of needed files. See
+    $BLENDERHOME/source/blender/src/SConscript for an example. Keep in
+    mind that this will add any new file that complies to the rule given
+    to the Glob() function. There are a few (external) libraries with
+    which this can't be used, because it'd take files that shouldn't be
+    compiled, and create subsequentially problems during the linking stage
+    (like SOLID, qhull, Bullet).
+
+    Linking order and priorities
+    ----------------------------
+
+    As shown above, you can give a library a priority in a certain
+    group. If you need to make sure that a Blender library is linked
+    before or after another one, you can give it a priority. To debug
+    the priorities us BF_PRIORITYLIST=1 on the command-line while running
+    a build.
+
+    % scons BF_PRIORITYLIST=1
+
+    This will give a list with values suggested by the system. Make
+    changes to all SConscripts in question to reflect or change the
+    values given by this command. ALWAYS check this after adding a new
+    internal, external library or core library, and make sure there are
+    sane values. You can use large and negative numbers to test with,
+    but after you've got a working linking order, do change the system
+    to reflect BF_PRIORITYLIST values.
+
+    Also, if you find that a library needs to be given multiple times to
+    the linker, you can do that by giving a python list with the names
+    of the available library types. They are currently:
+
+        B.possible_types = ['core', 'common', 'blender', 'intern',
+                            'international', 'game', 'game2',
+                            'player', 'player2', 'system']
+
+    More groups can be added, but that should be carefully considered,
+    as it may lead to large-scale changes. The current amount of libraries
+    should suffice.
+
+    The central repository is utilised in the SConstruct in two
+    ways. Firstly, it is used to determine the order of all static
+    libraries to link into the main Blender executable. Secondly, it
+    is used to keep track of all built binaries and their location,
+    so that they can be properly copied to BF_INSTALLDIR.
+
+    The libraries can be fetched in their priority order with
+    create_blender_liblist from Blender.py, see the SConstruct on how
+    it is used.
+
+    The program repository is the global list program_list from
+    Blender.py. See SConstruct for its usage.
+
+
+    Adding a new option and libraries
+    ---------------------------------
+
+    Lets say we want to add WITH_BF_NEWLIB, which will
+    enable or disable a new feature library with sources in
+    $BLENDERHOME/source/blender/newlib. This 'newlib' needs external
+    headers from a 3rd party library '3rdparty'. For this we want to
+    add a set of options BF_3RDPARTY, BF_3RDPARTY_INC, BF_3RDPARTY_LIB,
+    BF_3RDPARTY_LIBPATH:
+
+        1) Add all mentiond options to all (platform)-config.py
+        files. WITH_BF_NEWLIB is a boolean option ('true', 'false'),
+        the rest are strings with paths and library names. See the
+        OpenEXR options for example.
+
+        2) Add all options to the argument checking function
+        validate_arguments() in btools.py. See again OpenEXR options
+        for example.
+
+        3) Add all options to the option reading function read_opts()
+        in btools.py. See again OpenEXR options for example. All default
+        values can be empty, as the actual default values are in the
+        (platform)-config.py files.
+
+        4) Add BF_3RDPARTY_LIB to the function setup_syslibs()
+        and BF_3RDPARTY_LIBPATH to the function setup_staticlibs()
+        in Blender.py
+
+    At this stage we have prepared all option setting and linking needs,
+    but we still need to add in the compiling of the 'newlib'.
+
+        5) Create a SConscript in $BLENDERHOME/source/blender/newlib. Look
+        at ie. $BLENDERHOME/source/blender/src/SConscript for
+        template. The new SConscript will register the new library
+        like so:
+
+            env.BlenderLib(libname='newlib', sources=sourcefiles, includes=incs) # the rest of the arguments get defaults = empty lists and values
+
+        6) Edit $BLENDERHOME/source/blender/SConscript with the following
+        addition:
+
+            if env['WITH_BF_NEWLIB'] == 1:
+                SConscript(['newlib/SConscript'])
+
+    After this you can see if this works by trying to build:
+
+            % scons WITH_BF_NEWLIB=1  # build with newlib
+            % scons WITH_BF_NEWLIB=0  # disable newlib
+
+    This is all what should be needed. Changing the library name doesn't
+    need changes elsewhere in the system, as it is handled automatically
+    with the central library repository.
+
+    Enjoy the new system!!
+
+    /Nathan Letwory (jesterKing)

doc/build_systems/scons.txt

@@ -0,0 +1,230 @@
+
+    Blenders SCons build scripts
+    ============================
+
+    Introduction
+    ------------
+
+    Since the beginning of 2004 Blender has had the SCons system as a
+    build option. SCons is a Python-based, accurate build system. The
+    scripts that were implemented in the first iteration worked, but
+    the system grew quickly into such a state that maintaining it became
+    a nightmare, and adding new features was just horrible, leading to
+    many hacks without much sense in the overall structure.
+
+    The rewrite has been waiting for a long time. Jonathan Jacobs provided
+    a first overhaul of the scripts, which I used in the first phase of
+    the rewrite. To make the system as maintainable as possible I made
+    some radical changes, but thanks go to Jonathan for providing me
+    with the patch to get started.
+
+    This document describes the usage of the new SCons scripts. The
+    inner workings are described in scons-dev.txt.
+
+    Building Blender
+    ----------------
+
+    To build Blender with the SCons scripts you need a full Python
+    install, version 2.4 or later (http://www.python.org). We already provide
+    a scons-local installation, which can be found in the scons/ subdirectory.
+    This document uses the scons-local installation for its examples.
+
+    Check from the page
+    http://www.blender.org/development/building-blender/getting-dependencies/
+    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 CVS.
+
+    In the base directory of the sources (from now on called $BLENDERHOME)
+    you'll see a file named SConstruct. This is the entry point for the
+    SCons build system. In a terminal, change to this directory. To just
+    build, start the SCons entry script on Windows (will be used for the remainder
+    of this document):
+
+        % python scons\scons.py
+
+    On a Unix-compatible system it would be
+
+        % python ./scons/scons.py
+
+    This will start the build process with default values. Depending
+    on your platform you may see colour in your output (non-Windows
+    machines). In the the beginning an overview of targets and arguments
+    from the command-line is given, then all libraries and binaries to
+    build are configured.
+
+    The build uses BF_BUILDDIR to build into and BF_INSTALLDIR to
+    finally copy all needed files to get a proper setup. The BF_DOCDIR is
+    used to generate Blender Python documentation files to. These
+    variables have default values for every platform in
+    $BLENDERHOME/config/(platform)-config.py. After the build successfully
+    completes, you can find everything you need in BF_INSTALLDIR.
+
+    If you want to create the installer package of Blender on Windows you'll
+    need to install nullsoft scriptable install system from http://nsis.sf.net.
+    As an extra dependency, you need the MoreInfo plugin too. The creation of
+    the installer is tied into the build process and can be triggered with:
+
+        % python scons\scons.py nsis
+
+
+    Configuring the build
+    ---------------------
+
+    The default values for your platform can be found in the directory
+    $BLENDERHOME/config. Your platform specific defaults are in
+    (platform)-config.py, where platform is one of:
+
+        - linux, for machines running Linux
+        - win32-vc, for Windows machines, compiling with a Microsoft compiler
+        - win32-mingw, for Windows machines, compiling with the MingW compiler
+        - darwin, for OS X machines
+        (TBD: add cygwin, solaris and freebsd support)
+
+    These files you will normally not change. If you need to override
+    a default value, make a file called  $BLENDERHOME/user-config.py, and copy
+    settings from the config/(platform)-config.py that you want to change. Don't
+    copy the entire file (unless explicitely stated in the configuration file),
+    because you may not get updated options you don't change yourself, which may
+    result in build errors.
+
+    You can use BF_CONFIG argument to override the default user-config.py
+    check. This is just like the user-config.py, but just with another name:
+
+        % python scons\scons.py BF_CONFIG=myownsettings
+
+    If you want to quickly test a new setting, you can give the option
+    also on the command-line:
+
+        % python scons\scons.py BF_BUILDDIR=../mybuilddir WITH_BF_OPENEXR=0
+
+    This command sets the build directory to BF_BUILDDIR and disables
+    OpenEXR support.
+
+    If you need to know what can be set through the command-line, run
+    scons with -h:
+
+        % python scons\scons.py -h
+
+    This command will print a long list with settable options and what
+    every option means. Many of the default values will be empty, and
+    from a fresh checkout without a user-config.py the actual values
+    are the defaults as per $BLENDERHOME/config/(platform)-config.py
+    (unless you have overridden any of them in your
+    $BLENDERHOME/user-config.py).
+
+    NOTE: The best way to avoid confusion is the
+    copy $BLENDERHOME/config/(platform)-config.py to
+    $BLENDERHOME/user-config.py. You should NEVER have to modify
+    $BLENDERHOME/config/(platform)-config.py
+
+    Configuring the output
+    ----------------------
+
+    This rewrite features a cleaner output during the build process. If
+    you need to see the full command-line for compiles, then you can
+    change that behaviour. Also the use of colours can be changed:
+
+        % python scons\scons.py BF_FANCY=0
+
+    This will disable the use of colours.
+
+        % python scons\scons.py BF_QUIET=0
+
+    This will give the old, noisy output. Every command-line per
+    compile is printed out in its full glory. This is very useful when
+    debugging problems with compiling, because you can see what the
+    included paths are, what defines are given on the command-line,
+    what compiler switches are used, etc.
+
+    Compiling Only Some Libraries
+    -----------------------------
+    
+    Our implementation now has support for specifying a list of libraries that are
+    exclusively compiled, ignoring all other libraries.  This is invoked 
+    with the BF_QUICK arguments; for example:
+    
+        % python scons\scons.py BF_QUICK=src,bf_blenkernel
+    
+    Note that this not the same as passing a list of folders as in the 
+    makefile's "quicky" command.  In Scons, all of Blender's code modules
+    are in their own static library; this corresponds to one-lib-per-folder 
+    in some cases (especially in blender/source/blender).
+    
+    To obtain a list of the libraries, simple fire up scons and CTRL-C out once 
+    it finishes configuring (and printing to the console) the library list.
+    
+    Compiling Libraries With Debug Profiling
+    ----------------------------------------
+    
+    Scons has support for specifying a list of libraries that are compiled
+    with debug profiling enabled.  This is implemented in two commands:
+    BF_QUICKDEBUG which is a command-line argument and BF_DEBUG_LIBS, which goes
+    in your user-config.py
+    
+    BF_QUICKDEBUG is similar to BF_QUICK:
+    
+        % python scons\scons.py BF_QUICKDEBUG=src,bf_blenkernel,some-other-lib
+    
+    To use BF_DEBUG_LIBS, put something like the following in you user-config.py:
+    
+        BF_DEBUG_LIBS = ['bf_blenlib', 'src', 'some_lib']
+        
+    For instructions on how to find the names of the libraries (folders) you 
+    wish to use, see the above section.  Note that the command BF_DEBUG 
+    (see below) will override these settings and compile ALL of Blender with
+    debug symbols.  Also note that BF_QUICKDEBUG and BF_DEBUG_LIBS are combined;
+    for example, setting BF_QUICKDEBUG won't overwrite the contents of BF_DEBUG_LIBS.
+
+    Supported toolset
+    -----------------
+
+    WINDOWS
+
+        * msvc, this is a full install of Microsoft Visual C++. You'll
+        likely have the .NET Framework SDK, Platform SDK and DX9 SDK
+        installed * mstoolkit, this is the free MS VC++ 2003 Toolkit. You
+        need to verify you have also the SDKs installed as mentioned
+        for msvc.  * mingw, this is a minimal MingW install. TBD: write
+        proper instructions on getting needed packages.
+
+    On Windows with all of the three toolset installed you need to
+    specify what toolset to use
+
+        % python scons\scons.py BF_TOOLSET=msvc
+        % python scons\scons.py BF_TOOLSET=mingw
+
+    LINUX and OS X
+
+    Currently only the default toolsets are supported for these platforms,
+    so nothing special needs to be told to SCons when building. The
+    defaults should work fine in most cases.
+
+    Examples
+    --------
+
+    Build Blender with the defaults:
+
+        % python scons\scons.py
+
+    Build Blender, but disable OpenEXR support:
+
+        % python scons\scons.py WITH_BF_OPENEXR=0
+
+    Build Blender, enable debug symbols:
+
+        % python scons\scons.py BF_DEBUG=1
+
+    Build Blender, install to different directory:
+
+        % python scons\scons.py BF_INSTALLDIR=../myown/installdir
+
+    Build Blender in ../myown/builddir and install to ../myown/installdir:
+
+        % python scons\scons.py BF_BUILDDIR=../myown/builddir BF_INSTALLDIR=../myown/installdir
+
+    Clean BF_BUILDDIR:
+
+        % python scons\scons.py clean
+
+    /Nathan Letwory (jesterKing)

doc/doxygen/doxygen.extern

@@ -0,0 +1,17 @@
+/** \defgroup extern External libraries
+ *  \section externabout External libraries
+ *  As with \ref intern these libraries are
+ *  provided in the Blender codebase. This is
+ *  to make building Blender easier. The main
+ *  development of these libraries is \b not part
+ *  of the normal Blender development process, but
+ *  each of the library is developed separately.
+ *  Whenever deemed necessary libraries in \c extern/
+ *  folder are updated.
+ *
+ */
+
+/** \defgroup bullet Bullet Physics Library
+ *  \ingroup extern
+ *  \see \ref bulletdoc
+ */

doc/doxygen/doxygen.extern.h

@@ -1,21 +0,0 @@
-/** \defgroup extern External libraries
- *  \section externabout External libraries
- *  As with \ref intern these libraries are
- *  provided in the Blender codebase. This is
- *  to make building Blender easier. The main
- *  development of these libraries is \b not part
- *  of the normal Blender development process, but
- *  each of the library is developed separately.
- *  Whenever deemed necessary libraries in \c extern/
- *  folder are updated.
- *
- */
-
-/** \defgroup curve_fit Curve Fitting Library
- *  \ingroup extern
- */
-
-/** \defgroup bullet Bullet Physics Library
- *  \ingroup extern
- *  \see \ref bulletdoc
- */

doc/doxygen/doxygen.intern

@@ -0,0 +1,102 @@
+/** \defgroup intern Internal libraries
+ *  \section internabout Internal libraries
+ *  Blender comes with some of its dependencies
+ *  directly included in the codebase. Libraries
+ *  that are in the \c intern/ folder are maintained
+ *  as part of the normal development process.
+ */
+
+/** \defgroup MEM Guarded memory (de)allocation
+ *  \ingroup intern
+ */
+
+/** \defgroup boolop boolop
+ *  \ingroup intern
+ */
+
+/** \defgroup ctr container
+ *  \ingroup intern
+ */
+
+/** \defgroup decimation decimation
+ *  \ingroup intern
+ */
+
+/** \defgroup elbeem elbeem
+ *  \ingroup intern
+ */
+
+/** \defgroup bsp bsp
+ *  \ingroup intern
+ */
+
+/** \defgroup iksolver iksolver
+ *  \ingroup intern
+ */
+
+/** \defgroup itasc itasc
+ *  \ingroup intern
+ */
+
+/** \defgroup memutil memutil
+ *  \ingroup intern
+ */
+
+/** \defgroup mikktspace mikktspace
+ *  \ingroup intern
+ */
+
+/** \defgroup moto moto
+ *  \ingroup intern
+ */
+
+/** \defgroup opennl opennl
+ *  \ingroup intern
+ */
+
+/** \defgroup smoke smoke
+ *  \ingroup intern
+ */
+
+/** \defgroup string string
+ *  \ingroup intern
+ */
+
+/** \defgroup audaspace Audaspace
+ *  \ingroup intern undoc
+ *  \todo add to doxygen
+ */
+/** \defgroup audfx Audaspace FX
+ *  \ingroup audaspace
+ */
+/** \defgroup audopenal Audaspace OpenAL
+ *  \ingroup audaspace
+ */
+/** \defgroup audpython Audaspace Python
+ *  \ingroup audaspace
+ */
+/** \defgroup audsdl Audaspace SDL
+ *  \ingroup audaspace
+ */
+/** \defgroup audsrc Audaspace SRC
+
+ *  \ingroup audaspace
+ */
+/** \defgroup audffmpeg Audaspace FFMpeg
+ *  \ingroup audaspace
+ */
+/** \defgroup audfftw Audaspace FFTW
+ *  \ingroup audaspace
+ */
+/** \defgroup audjack Audaspace Jack
+ *  \ingroup audaspace
+ */
+/** \defgroup audsndfile Audaspace sndfile
+ *  \ingroup audaspace
+ */
+
+/** \defgroup GHOST GHOST API
+ * \ingroup intern GUI
+ * \ref GHOSTPage
+ */
+

doc/doxygen/doxygen.intern.h

@@ -1,90 +0,0 @@
-/** \defgroup intern Internal libraries
- *  \section internabout Internal libraries
- *  Blender comes with some of its dependencies
- *  directly included in the codebase. Libraries
- *  that are in the \c intern/ folder are maintained
- *  as part of the normal development process.
- */
-
-/** \defgroup MEM Guarded memory (de)allocation
- *  \ingroup intern
- */
-
-/** \defgroup ctr container
- *  \ingroup intern
- */
-
-/** \defgroup elbeem elbeem
- *  \ingroup intern
- */
-
-/** \defgroup iksolver iksolver
- *  \ingroup intern
- */
-
-/** \defgroup itasc itasc
- *  \ingroup intern
- */
-
-/** \defgroup memutil memutil
- *  \ingroup intern
- */
-
-/** \defgroup mikktspace mikktspace
- *  \ingroup intern
- */
-
-/** \defgroup moto moto
- *  \ingroup intern
- */
-
-/** \defgroup eigen eigen
- *  \ingroup intern
- */
-
-/** \defgroup smoke smoke
- *  \ingroup intern
- */
-
-/** \defgroup string string
- *  \ingroup intern
- */
-
-/** \defgroup audaspace Audaspace
- *  \ingroup intern undoc
- *  \todo add to doxygen
- */
-/** \defgroup audfx Audaspace FX
- *  \ingroup audaspace
- */
-/** \defgroup audopenal Audaspace OpenAL
- *  \ingroup audaspace
- */
-/** \defgroup audpython Audaspace Python
- *  \ingroup audaspace
- */
-/** \defgroup audsdl Audaspace SDL
- *  \ingroup audaspace
- */
-/** \defgroup audsrc Audaspace SRC
-
- *  \ingroup audaspace
- */
-/** \defgroup audffmpeg Audaspace FFMpeg
- *  \ingroup audaspace
- */
-/** \defgroup audfftw Audaspace FFTW
- *  \ingroup audaspace
- */
-/** \defgroup audjack Audaspace Jack
- *  \ingroup audaspace
- */
-/** \defgroup audsndfile Audaspace sndfile
- *  \ingroup audaspace
- */
-
-/** \defgroup GHOST GHOST API
- * \ingroup intern GUI
- * \ref GHOSTPage
- */
-

doc/doxygen/doxygen.main

@@ -0,0 +1,19 @@
+/** \mainpage Blender
+ *
+ * \section intro Introduction
+ *
+ * Blender is an integrated 3d package.
+ *
+ * These pages document the source code of blender.
+ *
+ * \subsection implinks Important Links
+ * - <a href="http://projects.blender.org">projects.blender.org</a> with <a href="http://projects.blender.org/tracker/index.php?group_id=9&atid=498">bug tracker</a>
+ * - <a href="http://wiki.blender.org/index.php/Dev:Contents">Development documents</a> on our wiki.
+ *
+ * \subsection blother Other
+ * For more information on using Blender browse to http://www.blender.org
+ *
+ */
+
+/** \defgroup undoc Undocumented
+ *  \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */

doc/doxygen/doxygen.main.h

@@ -1,19 +0,0 @@
-/** \mainpage Blender
- *
- * \section intro Introduction
- *
- * Blender is an integrated 3d package.
- *
- * These pages document the source code of blender.
- *
- * \subsection implinks Important Links
- * - <a href="http://developer.blender.org">developer.blender.org</a> with bug tracker.
- * - <a href="http://wiki.blender.org/index.php/Dev:Contents">Development documents</a> on our wiki.
- *
- * \subsection blother Other
- * For more information on using Blender browse to http://www.blender.org
- *
- */
-
-/** \defgroup undoc Undocumented
- *  \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */

doc/doxygen/doxygen.source

@@ -0,0 +1,346 @@
+
+/** \defgroup blenderplayer Blender Player */
+
+/** \defgroup blc bad level calls
+ *  \ingroup blenderplayer
+ */
+
+/** \defgroup render Rendering
+ *  \ingroup blender
+ */
+/** \defgroup meshedit Mesh Editing */
+/** \defgroup texture Texturing */
+/** \defgroup compositor Compositing */
+
+/** \defgroup scripts Scripting */
+
+/** \defgroup python Python
+ *  \ingroup blender scripts
+ */
+
+/** \defgroup pygen Python Generic
+ *  \ingroup python
+ */
+
+/** \defgroup pymathutils Python Mathutils
+ *  \ingroup python
+ */
+
+/** \defgroup pythonintern Python RNA and Operators
+ *  \ingroup python
+ */
+
+/** \defgroup blpluginapi Blender pluginapi
+ *  \ingroup blender
+ *  \attention not in use currently
+ */
+
+/* ================================ */
+
+/** \defgroup bge Game Engine */
+/** \defgroup gamelogic Game Logic
+ *  \ingroup bge
+ */
+/** \defgroup bgeconv Converter
+ *  \ingroup bge
+ */
+/** \defgroup blroutines Blender Routines
+ *  \ingroup bge
+ */
+/** \defgroup expressions Expressions
+ *  \ingroup bge
+ */
+/** \defgroup player Game Player
+ *  \ingroup bge
+ */
+/** \defgroup ketsji Ketsji
+ *  \ingroup bge
+ *  \todo check all headers and code files for proper licenses
+ */
+/** \defgroup ketsjinet Ketsji Network
+ *  \ingroup ketsji
+ */
+/** \defgroup bgenet Network
+ *  \ingroup bge
+ */
+/** \defgroup bgenetlb Loopback Network
+ *  \ingroup bgenet
+ */
+/** \defgroup phys Physics
+ *  \ingroup bge
+ */
+/** \defgroup physbullet Bullet Physics
+ *  \ingroup phys
+ */
+/** \defgroup physdummy Dummy Physics (none)
+ *  \ingroup phys
+ */
+/** \defgroup bgerast Rasterizer
+ *  \ingroup bge
+ */
+/** \defgroup bgerastoglfilters OpenGL Filters
+ *  \ingroup bgerast
+ */
+/** \defgroup bgerastogl OpenGL Rasterizer
+ *  \ingroup bgerast
+ */
+/** \defgroup bgesg BGE SceneGraph
+ *  \ingroup bge
+ */
+/** \defgroup bgevideotex BGE Video Texture
+ *  \ingroup bge
+ */
+
+/* ================================ */
+
+/** \defgroup blender blender */
+
+/** \defgroup blf blenfont
+ *  \ingroup blender
+ */
+
+/** \defgroup bke blenkernel
+ *  \ingroup blender
+ */
+
+/** \defgroup bli blenlib
+ *  \ingroup blender
+ */
+
+/** \defgroup nodes nodes
+ *  \ingroup blender
+ */
+
+/** \defgroup cmpnodes cmpnodes
+ *  \ingroup nodes
+ */
+
+/** \defgroup shdnodes shdnodes
+ *  \ingroup nodes
+ */
+
+/** \defgroup texnodes texnodes
+ *  \ingroup nodes
+ */
+/** \defgroup modifiers modifiers
+ *  \ingroup blender
+ */
+
+/** \defgroup data DNA, RNA and .blend access*/
+
+/** \defgroup gpu GPU
+ *  \ingroup blender
+ */
+
+/** \defgroup ikplugin ikplugin
+ *  \ingroup blender
+ */
+
+/** \defgroup DNA sDNA
+ *  \ingroup blender data
+ */
+/** \defgroup RNA RNA
+ *  \ingroup blender data
+ */
+
+/** \defgroup blenloader .blend read and write functions
+ *  \ingroup blender data
+ *  \todo check if \ref blo and \ref blenloader groups can be
+ *   merged in docs.
+ */
+
+/** \defgroup quicktime quicktime
+ *  \ingroup blender
+
+/** \defgroup gui GUI */
+
+/** \defgroup wm windowmanager
+ *  \ingroup blender gui
+ */
+
+/* ================================ */
+
+/** \defgroup editors Editors
+ *  \ingroup blender
+ */
+
+/** \defgroup edanimation animation
+ *  \ingroup editors
+ */
+
+/** \defgroup edarmature armature
+ *  \ingroup editors
+ */
+
+/** \defgroup edcurve curve
+ *  \ingroup editors
+ */
+
+/** \defgroup eddatafiles datafiles
+ *  \ingroup editors
+ */
+
+/** \defgroup edgpencil gpencil
+ *  \ingroup editors
+ */
+
+/** \defgroup edinterface interface
+ *  \ingroup editors
+ */
+
+/** \defgroup edmesh mesh
+ *  \ingroup editors
+ */
+
+/** \defgroup edmeta metaball
+ *  \ingroup editors
+ */
+
+/** \defgroup edobj object
+ *  \ingroup editors
+ */
+
+/** \defgroup edphys physics
+ *  \ingroup editors
+ */
+
+/** \defgroup edrend render
+ *  \ingroup editors
+ */
+
+/** \defgroup edscr screen
+ *  \ingroup editors
+ */
+
+/** \defgroup edsculpt sculpt and paint
+ *  \ingroup editors
+ */
+
+/** \defgroup edsnd sound
+ *  \ingroup editors
+ */
+
+/** \defgroup spaction action space
+ *  \ingroup editors
+ */
+
+/** \defgroup spapi space API
+ *  \ingroup editors
+ */
+
+/** \defgroup spbuttons buttons space
+ *  \ingroup editors
+ */
+
+/** \defgroup spconsole console space
+ *  \ingroup editors
+ */
+
+/** \defgroup spfile fileselector
+ *  \ingroup editors
+ */
+
+/** \defgroup spgraph graph editor
+ *  \ingroup editors
+ */
+
+/** \defgroup spimage image and UV editor
+ *  \ingroup editors
+ */
+
+/** \defgroup spinfo info space
+ *  \ingroup editors
+ */
+
+/** \defgroup splogic game logic editor
+ *  \ingroup editors
+ */
+
+/** \defgroup spnla NLA editor
+ *  \ingroup editors
+ */
+
+/** \defgroup spnode node editor
+ *  \ingroup editors
+ */
+
+/** \defgroup spoutliner outliner space
+ *  \ingroup editors
+ */
+
+/** \defgroup spscript script space
+ *  \ingroup editors
+ */
+
+/** \defgroup spseq sequencer
+ *  \ingroup editors
+ */
+
+/** \defgroup spsnd sound space
+ *  \ingroup editors
+ */
+
+/** \defgroup sptext text editor
+ *  \ingroup editors
+ */
+
+/** \defgroup sptime time line
+ *  \ingroup editors
+ */
+
+/** \defgroup spuserpref user preferences
+ *  \ingroup editors
+ */
+
+/** \defgroup spview3d 3D view
+ *  \ingroup editors
+ */
+
+/** \defgroup edtransform transform
+ *  \ingroup editors
+ */
+
+/** \defgroup edutil editor utilities
+ *  \ingroup editors
+ */
+
+/** \defgroup spuv UV editing
+ *  \ingroup editors
+ */
+
+/* ================================ */
+
+/** \defgroup editorui Interface and Widgets
+ *  \ingroup gui
+ */
+
+/** \defgroup externformats external formats */
+
+/** \defgroup collada COLLADA
+ *  \ingroup externformats
+ */
+
+/** \defgroup avi AVI
+ *  \ingroup externformats
+ */
+
+/** \defgroup imbuf IMage Buffer
+ *  \ingroup blender
+ */
+
+/** \defgroup imbcineon Cineon
+ *  \ingroup imbuf
+ */
+
+/** \defgorup imbdds DDS
+ *  \ingroup imbuf
+ */
+
+/** \defgroup openexr OpenEXR
+ *  \ingroup imbuf
+ */
+
+/* ================================ */
+
+/** \defgroup undoc Undocumented
+ *  \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */

doc/doxygen/doxygen.source.h

@@ -1,357 +0,0 @@
-
-/** \defgroup blenderplayer Blender Player */
-
-/** \defgroup blc bad level calls
- *  \ingroup blenderplayer
- */
-
-/** \defgroup render Rendering
- *  \ingroup blender
- */
-/** \defgroup bmesh BMesh
- *  \ingroup blender
- */
-/** \defgroup compositor Compositing */
-
-/** \defgroup python Python
- *  \ingroup blender
- */
-
-/** \defgroup pygen Python Generic
- *  \ingroup python
- */
-
-/** \defgroup pymathutils Python Mathutils
- *  \ingroup python
- */
-
-/** \defgroup pythonintern Python RNA and Operators
- *  \ingroup python
- */
-
-/** \defgroup blpluginapi Blender pluginapi
- *  \ingroup blender
- *  \attention not in use currently
- */
-
-/* ================================ */
-
-/** \defgroup bge Game Engine */
-/** \defgroup gamelogic Game Logic
- *  \ingroup bge
- */
-/** \defgroup bgeconv Converter
- *  \ingroup bge
- */
-/** \defgroup blroutines Blender Routines
- *  \ingroup bge
- */
-/** \defgroup expressions Expressions
- *  \ingroup bge
- */
-/** \defgroup player Game Player
- *  \ingroup bge
- */
-/** \defgroup ketsji Ketsji
- *  \ingroup bge
- *  \todo check all headers and code files for proper licenses
- */
-/** \defgroup ketsjinet Ketsji Network
- *  \ingroup ketsji
- */
-/** \defgroup bgenet Network
- *  \ingroup bge
- */
-/** \defgroup bgenetlb Loopback Network
- *  \ingroup bgenet
- */
-/** \defgroup phys Physics
- *  \ingroup bge
- */
-/** \defgroup physbullet Bullet Physics
- *  \ingroup phys
- */
-/** \defgroup physdummy Dummy Physics (none)
- *  \ingroup phys
- */
-/** \defgroup bgerast Rasterizer
- *  \ingroup bge
- */
-/** \defgroup bgerastoglfilters OpenGL Filters
- *  \ingroup bgerast
- */
-/** \defgroup bgerastogl OpenGL Rasterizer
- *  \ingroup bgerast
- */
-/** \defgroup bgesg BGE SceneGraph
- *  \ingroup bge
- */
-/** \defgroup bgevideotex BGE Video Texture
- *  \ingroup bge
- */
-
-/* ================================ */
-
-/** \defgroup blender Blender */
-
-/** \defgroup blt BlenTranslation
- *  \ingroup blender
- */
-
-/** \defgroup blf BlenFont
- *  \ingroup blender
- */
-
-/** \defgroup bke BlenKernel
- *  \ingroup blender
- */
-
-/** \defgroup bli BlenLib
- *  \ingroup blender
- */
-
-/** \defgroup depsgraph Dependency Graph
- *  \ingroup blender
- */
-
-/** \defgroup bph Physics
- *  \ingroup blender
- */
-
-/** \defgroup nodes Nodes
- *  \ingroup blender
- */
-
-/** \defgroup cmpnodes Nodes (Compositor)
- *  \ingroup nodes
- */
-
-/** \defgroup shdnodes Nodes (Shader)
- *  \ingroup nodes
- */
-
-/** \defgroup texnodes Nodes (Texture)
- *  \ingroup nodes
- */
-/** \defgroup modifiers Object Modifiers
- *  \ingroup blender
- */
-
-/** \defgroup data DNA, RNA and .blend access*/
-
-/** \defgroup gpu GPU
- *  \ingroup blender
- */
-
-/** \defgroup ikplugin IK Plugin
- *  \ingroup blender
- */
-
-/** \defgroup DNA Struct DNA (File Format)
- *  \ingroup blender data
- */
-/** \defgroup RNA RNA (Data API)
- *  \ingroup blender data
- */
-
-/** \defgroup blenloader Blend file IO
- *  \ingroup blender data
- *  \todo check if \ref blo and \ref blenloader groups can be
- *   merged in docs.
- */
-
-/** \defgroup quicktime QuickTime
- *  \ingroup blender
-
-/** \defgroup gui GUI */
-
-/** \defgroup wm Window Manager
- *  \ingroup blender gui
- */
-
-/* ================================ */
-
-/** \defgroup editors Editors
- *  \ingroup blender
- */
-
-/** \defgroup edanimation animation
- *  \ingroup editors
- */
-
-/** \defgroup edarmature armature
- *  \ingroup editors
- */
-
-/** \defgroup edcurve curve
- *  \ingroup editors
- */
-
-/** \defgroup eddatafiles datafiles
- *  \ingroup editors
- */
-
-/** \defgroup edgpencil gpencil
- *  \ingroup editors
- */
-
-/** \defgroup edinterface interface
- *  \ingroup editors
- */
-
-/** \defgroup edmesh mesh
- *  \ingroup editors
- */
-
-/** \defgroup edmeta metaball
- *  \ingroup editors
- */
-
-/** \defgroup edobj object
- *  \ingroup editors
- */
-
-/** \defgroup edphys physics
- *  \ingroup editors
- */
-
-/** \defgroup edrend render
- *  \ingroup editors
- */
-
-/** \defgroup edscr screen
- *  \ingroup editors
- */
-
-/** \defgroup edsculpt sculpt and paint
- *  \ingroup editors
- */
-
-/** \defgroup edsnd sound
- *  \ingroup editors
- */
-
-/** \defgroup spaction action space
- *  \ingroup editors
- */
-
-/** \defgroup spapi space API
- *  \ingroup editors
- */
-
-/** \defgroup spbuttons buttons space
- *  \ingroup editors
- */
-
-/** \defgroup spconsole console space
- *  \ingroup editors
- */
-
-/** \defgroup spfile fileselector
- *  \ingroup editors
- */
-
-/** \defgroup spgraph graph editor
- *  \ingroup editors
- */
-
-/** \defgroup spimage image and UV editor
- *  \ingroup editors
- */
-
-/** \defgroup spinfo info space
- *  \ingroup editors
- */
-
-/** \defgroup splogic game logic editor
- *  \ingroup editors
- */
-
-/** \defgroup spnla NLA editor
- *  \ingroup editors
- */
-
-/** \defgroup spnode node editor
- *  \ingroup editors
- */
-
-/** \defgroup spoutliner outliner space
- *  \ingroup editors
- */
-
-/** \defgroup spscript script space
- *  \ingroup editors
- */
-
-/** \defgroup spseq sequencer
- *  \ingroup editors
- */
-
-/** \defgroup spsnd sound space
- *  \ingroup editors
- */
-
-/** \defgroup sptext text editor
- *  \ingroup editors
- */
-
-/** \defgroup sptime time line
- *  \ingroup editors
- */
-
-/** \defgroup spuserpref user preferences
- *  \ingroup editors
- */
-
-/** \defgroup spview3d 3D view
- *  \ingroup editors
- */
-
-/** \defgroup edtransform transform
- *  \ingroup editors
- */
-
-/** \defgroup edutil editor utilities
- *  \ingroup editors
- */
-
-/** \defgroup spuv UV editing
- *  \ingroup editors
- */
-
-/* ================================ */
-
-/** \defgroup editorui Interface and Widgets
- *  \ingroup gui
- */
-
-/** \defgroup externformats External Formats */
-
-/** \defgroup collada COLLADA
- *  \ingroup externformats
- */
-
-/** \defgroup avi AVI
- *  \ingroup externformats
- */
-
-/** \defgroup imbuf Image Buffer (ImBuf)
- *  \ingroup blender
- */
-
-/** \defgroup imbcineon Cineon
- *  \ingroup imbuf
- */
-
-/** \defgroup imbdds DDS
- *  \ingroup imbuf
- */
-
-/** \defgroup openexr OpenEXR
- *  \ingroup imbuf
- */
-
-/* ================================ */
-
-/** \defgroup undoc Undocumented
- *  \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */

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:
@@ -169,7 +173,7 @@ drawtype:
 	UI_EMBOSSN		2	/* Button with no border */
 	UI_EMBOSSF		3	/* Square embossed button (file select) */
 	UI_EMBOSSM		4	/* Colored, for pulldown menus */
-	UI_EMBOSSP		5	/* Simple borderless colored button (like blender sensors) */
+	UI_EMBOSSP		5	/* Simple borderless coloured button (like blender sensors) */
 
 font:
 	UI_HELV			0	/* normal font */
@@ -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>.