Fix for own error with updating view2d for NDOF
[blender.git] / GNUmakefile
index 1f1de3f6b99a14cea1d33499158e41194b58984d..8ae2efbe53c9566ccab544e04e275c8fba3b9eca 100644 (file)
@@ -40,7 +40,7 @@ ifndef BUILD_CMAKE_ARGS
 endif
 
 ifndef BUILD_DIR
-       BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
+       BUILD_DIR:=$(shell dirname "$(BLENDER_DIR)")/build_$(OS_NCASE)
 endif
 
 
@@ -54,15 +54,19 @@ ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
 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
+       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"
 endif
 ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
        BUILD_DIR:=$(BUILD_DIR)_bpy
-       BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
+       BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake"
 endif
 ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
        BUILD_DIR:=$(BUILD_DIR)_bpy
-       BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake
+       BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake"
 endif
 
 
@@ -87,8 +91,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)
 
 
@@ -118,7 +122,7 @@ all:
 
        @echo
        @echo Building Blender ...
-       $(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
+       $(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
        @echo
        @echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
        @echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
@@ -126,6 +130,7 @@ all:
 
 debug: all
 lite: all
+cycles: all
 headless: all
 bpy: all
 
@@ -133,7 +138,7 @@ bpy: all
 # -----------------------------------------------------------------------------
 # Configuration (save some cd'ing around)
 config:
-       $(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
+       $(CMAKE_CONFIG_TOOL) "$(BUILD_DIR)"
 
 
 # -----------------------------------------------------------------------------
@@ -144,6 +149,7 @@ help:
        @echo "  * debug     - build a debug binary"
        @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"
@@ -163,18 +169,30 @@ help:
        @echo "  * package_archive - build an archive package"
        @echo ""
        @echo "Testing Targets (not associated with building blender)"
-       @echo "  * test            - run ctest, currently tests import/export, operator execution and that python modules load"
-       @echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
-       @echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
-       @echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
-       @echo "  * test_style      - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+       @echo "  * test               - run ctest, currently tests import/export, operator execution and that python modules load"
+       @echo "  * test_cmake         - runs our own cmake file checker which detects errors in the cmake file list definitions"
+       @echo "  * test_pep8          - checks all python script are pep8 which are tagged to use the stricter formatting"
+       @echo "  * test_deprecated    - checks for deprecation tags in our code which may need to be removed"
+       @echo "  * test_style_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 ""
        @echo "Static Source Code Checking (not associated 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 "  * check_spelling_c  - check for spelling errors (C/C++ only)"
-       @echo "  * check_spelling_py - check for spelling errors (Python only)"
+       @echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
+       @echo "  * check_clang_array    - run blender source through clang array checking script (C & C++)"
+       @echo "  * check_splint         - run blenders source through splint (C only)"
+       @echo "  * check_sparse         - run blenders source through sparse (C only)"
+       @echo "  * check_smatch         - run blenders source through smatch (C only)"
+       @echo "  * check_spelling_c     - check for spelling errors (C/C++ only)"
+       @echo "  * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
+       @echo "  * check_spelling_osl   - check for spelling errors (OSL only)"
+       @echo "  * check_spelling_py    - check for spelling errors (Python only)"
+       @echo "  * check_descriptions   - check for duplicate/invalid descriptions"
+       @echo ""
+       @echo "Utilities (not associated with building blender)"
+       @echo "  * icons    - updates PNG icons from SVG files."
+       @echo "  * tbz      - create a compressed svn export 'blender_archive.tar.bz2'"
        @echo ""
        @echo "Documentation Targets (not associated with building blender)"
        @echo "  * doc_py   - generate sphinx python api docs"
@@ -193,7 +211,7 @@ package_pacman:
        cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
 package_archive:
-       make -C $(BUILD_DIR) -s package_archive
+       make -C "$(BUILD_DIR)" -s package_archive
        @echo archive in "$(BUILD_DIR)/release"
 
 
@@ -205,34 +223,54 @@ test:
 
 # run pep8 check check on scripts we distribute.
 test_pep8:
-       python3.2 source/tests/pep8.py > test_pep8.log 2>&1
+       python3 source/tests/pep8.py > test_pep8.log 2>&1
        @echo "written: test_pep8.log"
 
 # run some checks on our cmakefiles.
 test_cmake:
-       python3.2 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+       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:
-       python3.2 source/tests/check_deprecated.py
+       python3 source/tests/check_deprecated.py
+
+test_style_c:
+       # run our own checks on C/C++ style
+       PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/source/blender" "$(BLENDER_DIR)/source/creator" --no-length-check
 
-test_style:
+test_style_c_qtc:
        # run our own checks on C/C++ style
-       PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
+       USE_QTC_TASK=1 \
+       PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/source/blender" "$(BLENDER_DIR)/source/creator" --no-length-check > \
+       test_style.tasks
+       @echo "written: test_style.tasks"
+
+
+test_style_osl:
+       # run our own checks on C/C++ style
+       PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/intern/cycles/kernel/shaders" "$(BLENDER_DIR)/release/scripts/templates_osl"
+
+
+test_style_osl_qtc:
+       # run our own checks on C/C++ style
+       USE_QTC_TASK=1 \
+       PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_style_c.py" "$(BLENDER_DIR)/intern/cycles/kernel/shaders" "$(BLENDER_DIR)/release/scripts/templates_osl" > \
+       test_style.tasks
+       @echo "written: test_style.tasks"
 
 # -----------------------------------------------------------------------------
 # Project Files
 #
 
 project_qtcreator:
-       python3.2 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+       python3 build_files/cmake/cmake_qtcreator_project.py "$(BUILD_DIR)"
 
 project_netbeans:
-       python3.2 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+       python3 build_files/cmake/cmake_netbeans_project.py "$(BUILD_DIR)"
 
 project_eclipse:
-       cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
+       cmake -G"Eclipse CDT4 - Unix Makefiles" -H"$(BLENDER_DIR)" -B"$(BUILD_DIR)"
 
 
 # -----------------------------------------------------------------------------
@@ -241,25 +279,64 @@ project_eclipse:
 
 check_cppcheck:
        $(CMAKE_CONFIG)
-       cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+       cd "$(BUILD_DIR)" ; \
+       python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
+       "$(BLENDER_DIR)/check_cppcheck.txt"
+       @echo "written: check_cppcheck.txt"
+
+check_clang_array:
+       $(CMAKE_CONFIG)
+       cd "$(BUILD_DIR)" ; \
+       python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py"
 
 check_splint:
        $(CMAKE_CONFIG)
-       cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+       cd "$(BUILD_DIR)" ; \
+       python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py"
 
 check_sparse:
        $(CMAKE_CONFIG)
-       cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+       cd "$(BUILD_DIR)" ; \
+       python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py"
 
 check_smatch:
        $(CMAKE_CONFIG)
-       cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py
+       cd "$(BUILD_DIR)" ; \
+       python3 "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_smatch.py"
 
 check_spelling_py:
-       cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/release/scripts
+       cd "$(BUILD_DIR)" ; \
+       PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" "$(BLENDER_DIR)/release/scripts"
 
 check_spelling_c:
-       cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/source
+       cd "$(BUILD_DIR)" ; \
+       PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" "$(BLENDER_DIR)/source"
+
+check_spelling_c_qtc:
+       cd "$(BUILD_DIR)" ; USE_QTC_TASK=1 \
+       PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" "$(BLENDER_DIR)/source" > \
+       "$(BLENDER_DIR)/check_spelling_c.tasks"
+
+check_spelling_osl:
+       cd "$(BUILD_DIR)" ; PYTHONIOENCODING=utf_8 python3 "$(BLENDER_DIR)/source/tools/check_source/check_spelling.py" "$(BLENDER_DIR)/intern/cycles/kernel/shaders"
+
+check_descriptions:
+       "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"
+
+# -----------------------------------------------------------------------------
+# Utilities
+#
+
+tbz:
+       svn export . blender_archive
+       tar cjf blender_archive.tar.bz2 blender_archive/
+       rm -rf blender_archive/
+       @echo "blender_archive.tar.bz2 written"
+
+icons:
+       "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
+       "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
+
 
 # -----------------------------------------------------------------------------
 # Documentation
@@ -267,7 +344,7 @@ check_spelling_c:
 
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py:
-       $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
+       "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
        cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
        @echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
@@ -276,14 +353,14 @@ doc_doxy:
        @echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna:
-       $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
+       "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
        @echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man:
-       python3.2 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
+       python3 doc/manpage/blender.1.py "$(BUILD_DIR)/bin/blender"
 
 
 clean:
-       $(MAKE) -C $(BUILD_DIR) clean
+       $(MAKE) -C "$(BUILD_DIR)" clean
 
 .PHONY: all