svn merge ^/trunk/blender -r50156:50159

[blender.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index c68c8684687259ce83f0f75985eb2dfb461a2693..f48ac5c2e413647b338e149630c92907d63b518f 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,5 @@
 # -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
 # -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-

-# vim: tabstop=8
-# $Id$
+# vim: tabstop=4

 #
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
 #
 # ##### BEGIN GPL LICENSE BLOCK #####
 #


@@ -20,9 +19,9 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
 #
 # ##### 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:
 # eg:

-#   ../build/Linux_i386
+#   ../build_linux_i386

 # This is for users who like to configure & build blender with a single command.
 
 
 # This is for users who like to configure & build blender with a single command.
 
 


@@ -35,10 +34,13 @@ OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
 # Source and Build DIR's
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_TYPE:=Release
 # Source and Build DIR's
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_TYPE:=Release

-BUILD_CMAKE_ARGS:=
+
+ifndef BUILD_CMAKE_ARGS
+       BUILD_CMAKE_ARGS:=
+endif

 
 ifndef BUILD_DIR
 
 ifndef BUILD_DIR

-       BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+       BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)

 endif
 
 
 endif
 
 


@@ -90,15 +92,29 @@ CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
                      -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
 
 
                      -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
 
 

+# -----------------------------------------------------------------------------
+# Tool for 'make config'
+
+# X11 spesific
+ifdef DISPLAY
+       CMAKE_CONFIG_TOOL = cmake-gui
+else 
+       CMAKE_CONFIG_TOOL = ccmake
+endif
+
+

 # -----------------------------------------------------------------------------
 # Build Blender
 all:
        @echo
        @echo Configuring Blender ...
 
 # -----------------------------------------------------------------------------
 # Build Blender
 all:
        @echo
        @echo Configuring Blender ...
 

-       if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-               $(CMAKE_CONFIG); \
-       fi
+       # 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)

 
        @echo
        @echo Building Blender ...
 
        @echo
        @echo Building Blender ...


@@ -113,8 +129,15 @@ lite: all
 headless: all
 bpy: all
 
 headless: all
 bpy: all
 

+
+# -----------------------------------------------------------------------------
+# Configuration (save some cd'ing around)
+config:
+       $(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
+
+

 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------

-# Helo for build targets
+# Help for build targets

 help:
        @echo ""
        @echo "Convenience targets provided for building blender, (multiple at once can be used)"
 help:
        @echo ""
        @echo "Convenience targets provided for building blender, (multiple at once can be used)"


@@ -123,7 +146,10 @@ help:
        @echo "  * headless  - build without an interface (renderfarm or server automation)"
        @echo "  * bpy       - build as a python module which can be loaded from python directly"
        @echo ""
        @echo "  * headless  - build without an interface (renderfarm or server automation)"
        @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"
+       @echo ""

        @echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
        @echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."

+       @echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."

        @echo ""
        @echo ""
        @echo "Project Files for IDE's"
        @echo ""
        @echo ""
        @echo "Project Files for IDE's"


@@ -136,22 +162,23 @@ help:
        @echo "  * package_pacman  - build an arch linux pacmanpackage"
        @echo "  * package_archive - build an archive package"
        @echo ""
        @echo "  * package_pacman  - build an arch linux pacmanpackage"
        @echo "  * package_archive - build an archive package"
        @echo ""

-       @echo "Other Targets (not assosiated with building blender)"
-       @echo "  * translations  - update blenders translation files in po/"
-       @echo ""
-       @echo "Testing Targets (not assosiated with building blender)"
+       @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            - run ctest, currently tests import/export, operator execution and that python modules load"
        @echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
        @echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
        @echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"

+       @echo "  * test_style      - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"

        @echo ""
        @echo ""

-       @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 "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 ""
        @echo ""

-       @echo "Documentation Targets (not assosiated with building blender)"
+       @echo "Documentation Targets (not associated with building blender)"

        @echo "  * doc_py   - generate sphinx python api docs"
        @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 "  * doc_dna  - generate blender file format reference"
        @echo "  * doc_man  - generate manpage"
        @echo ""


@@ -170,16 +197,6 @@ package_archive:
        @echo archive in "$(BUILD_DIR)/release"
 
 
        @echo archive in "$(BUILD_DIR)/release"
 
 

-# -----------------------------------------------------------------------------
-# Other Targets
-#
-translations:
-       $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/update_msg.py
-       python3 po/update_pot.py
-       python3 po/update_po.py
-       python3 po/update_mo.py
-
-

 # -----------------------------------------------------------------------------
 # Tests
 #
 # -----------------------------------------------------------------------------
 # Tests
 #


@@ -188,28 +205,31 @@ test:
 
 # run pep8 check check on scripts we distribute.
 test_pep8:
 
 # run pep8 check check on scripts we distribute.
 test_pep8:

-       python3 source/tests/pep8.py > test_pep8.log 2>&1
+       python3.2 source/tests/pep8.py > test_pep8.log 2>&1

        @echo "written: test_pep8.log"
 
 # run some checks on our cmakefiles.
 test_cmake:
        @echo "written: test_pep8.log"
 
 # run some checks on our cmakefiles.
 test_cmake:

-       python3 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+       python3.2 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1

        @echo "written: test_cmake_consistency.log"
 
 # run deprecation tests, see if we have anything to remove.
 test_deprecated:
        @echo "written: test_cmake_consistency.log"
 
 # run deprecation tests, see if we have anything to remove.
 test_deprecated:

-       python3 source/tests/check_deprecated.py
+       python3.2 source/tests/check_deprecated.py

 
 

+test_style:
+       # 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

 
 # -----------------------------------------------------------------------------
 # Project Files
 #
 
 project_qtcreator:
 
 # -----------------------------------------------------------------------------
 # Project Files
 #
 
 project_qtcreator:

-       python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+       python3.2 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)

 
 project_netbeans:
 
 project_netbeans:

-       python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+       python3.2 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)

 
 project_eclipse:
        cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
 
 project_eclipse:
        cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)


@@ -221,16 +241,21 @@ project_eclipse:
 
 check_cppcheck:
        $(CMAKE_CONFIG)
 
 check_cppcheck:
        $(CMAKE_CONFIG)

-       cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+       cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py

 
 check_splint:
        $(CMAKE_CONFIG)
 
 check_splint:
        $(CMAKE_CONFIG)

-       cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+       cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py

 
 check_sparse:
        $(CMAKE_CONFIG)
 
 check_sparse:
        $(CMAKE_CONFIG)

-       cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+       cd $(BUILD_DIR) ; python3.2 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py

 
 

+check_spelling_py:
+       cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/spell_check_source.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

 
 # -----------------------------------------------------------------------------
 # Documentation
 
 # -----------------------------------------------------------------------------
 # Documentation


@@ -239,15 +264,19 @@ check_sparse:
 # 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
 # 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

-       cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+       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'"
 
        @echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 

+doc_doxy:
+       cd doc/doxygen; doxygen Doxyfile
+       @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
        @echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man:
 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:

-       python3 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
+       python3.2 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender

 
 
 clean:
 
 
 clean: