Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 09:22:59 +0000 (19:22 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 09:25:49 +0000 (19:25 +1000)
1  2 
GNUmakefile

diff --combined GNUmakefile
index ad2c265f3a9b1bee525ec504625a43ce5689c774,2599cb19e3e32874bea58317dfb3c886c33b25b4..6485e90ea749aeb30e036a955b127e65227b1e51
@@@ -89,6 -89,16 +89,16 @@@ ifneq "$(findstring bpy, $(MAKECMDGOALS
  endif
  
  
+ # -----------------------------------------------------------------------------
+ # Blender binary path
+ ifeq ($(OS), darwin)
+       BLENDER_BIN="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender"
+ else
+       BLENDER_BIN="$(BUILD_DIR)/bin/blender"
+ endif
  # -----------------------------------------------------------------------------
  # Get the number of cores for threaded build
  ifndef NPROCS
@@@ -140,7 -150,7 +150,7 @@@ all: .FORC
        $(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 successfully built, run from: $(BLENDER_BIN)
        @echo
  
  debug: all
@@@ -216,12 -226,12 +226,12 @@@ help: .FORC
        @echo "                         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:"
 -      @echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 +      @echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
        @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:"
 -      @echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 +      @echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
        @echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
 -      @echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 +      @echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
        @echo ""
        @echo "Static Source Code Checking (not associated with building blender)"
        @echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
        @echo "  * icons    - Updates PNG icons from SVG files."
        @echo "               Set environment variables 'BLENDER_BIN' and 'INKSCAPE_BIN'"
        @echo "               to define your own commands."
 -      @echo "  * tgz      - create a compressed archive of the source code."
 -      @echo "  * update   - updates git and all submodules"
 +      @echo "  * icons_geom - Updates Geometry icons from BLEND file."
 +      @echo "                 Set environment variable 'BLENDER_BIN'"
 +      @echo "                 to define your own command."
 +      @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."
@@@ -414,7 -421,7 +424,7 @@@ check_spelling_osl: .FORC
            "$(BLENDER_DIR)/intern/cycles/kernel/shaders"
  
  check_descriptions: .FORCE
-       "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python \
+       $(BLENDER_BIN) --background -noaudio --factory-startup --python \
            "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"
  
  # -----------------------------------------------------------------------------
@@@ -428,10 -435,6 +438,10 @@@ icons: .FORC
        "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
        "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
  
-       BLENDER_BIN="$(BUILD_DIR)/bin/blender" \
 +icons_geom: .FORCE
++      BLENDER_BIN=$(BLENDER_BIN) \
 +          "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"
 +
  update: .FORCE
        if [ "$(OS_NCASE)" = "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
                svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/$(OS_NCASE) ../lib/$(OS_NCASE) ; \
  
  # 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 \
+       $(BLENDER_BIN) --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'"
 +      @echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
  
  doc_doxy: .FORCE
        cd doc/doxygen; doxygen Doxyfile
        @echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
  
  doc_dna: .FORCE
-       "$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
+       $(BLENDER_BIN) --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"
+       $(PYTHON) doc/manpage/blender.1.py $(BLENDER_BIN) blender.1
  
  help_features: .FORCE
        @$(PYTHON) -c \