[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41122] trunk/blender: pass -noaudio when running blender for various utilities - doc-gen and tests .
Campbell Barton
ideasman42 at gmail.com
Wed Oct 19 23:55:29 CEST 2011
Revision: 41122
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41122
Author: campbellbarton
Date: 2011-10-19 21:55:27 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
pass -noaudio when running blender for various utilities - doc-gen and tests.
Modified Paths:
--------------
trunk/blender/GNUmakefile
trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
trunk/blender/doc/blender_file_format/README
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/doc/python_api/sphinx_doc_gen.sh
trunk/blender/intern/tools/dump_rna2xml.py
trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
trunk/blender/source/blender/makesrna/rna_cleanup/rna_update.sh
trunk/blender/source/tests/CMakeLists.txt
trunk/blender/source/tests/rna_info_dump.py
trunk/blender/source/tools/CTS/FBlender.py
trunk/blender/source/tools/compile_scripts.py
Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/GNUmakefile 2011-10-19 21:55:27 UTC (rev 41122)
@@ -174,7 +174,7 @@
# Other Targets
#
translations:
- $(BUILD_DIR)/bin/blender --background --factory-startup --python po/update_msg.py
+ $(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
@@ -238,12 +238,12 @@
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py:
- $(BUILD_DIR)/bin/blender --background --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 -n -b html sphinx-in sphinx-out
@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
doc_dna:
- $(BUILD_DIR)/bin/blender --background --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:
Modified: trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
===================================================================
--- trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/doc/blender_file_format/BlendFileDnaExporter_25.py 2011-10-19 21:55:27 UTC (rev 41122)
@@ -379,15 +379,15 @@
def usage():
- print("\nUsage: \n\tblender2.5 -b -P BlendFileDnaExporter_25.py [-- [options]]")
+ print("\nUsage: \n\tblender2.5 --background -noaudio --python BlendFileDnaExporter_25.py [-- [options]]")
print("Options:")
print("\t--dna-keep-blend: doesn't delete the produced blend file DNA export to html")
print("\t--dna-debug: sets the logging level to DEBUG (lots of additional info)")
print("\t--dna-versioned saves version informations in the html and blend filenames")
print("\t--dna-overwrite-css overwrite dna.css, useful when modifying css in the script")
print("Examples:")
- print("\tdefault: % blender2.5 -b -P BlendFileDnaExporter_25.py")
- print("\twith options: % blender2.5 -b -P BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug\n")
+ print("\tdefault: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py")
+ print("\twith options: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug\n")
######################################################
Modified: trunk/blender/doc/blender_file_format/README
===================================================================
--- trunk/blender/doc/blender_file_format/README 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/doc/blender_file_format/README 2011-10-19 21:55:27 UTC (rev 41122)
@@ -16,14 +16,14 @@
Usage:
- blender2.5 -b -P BlendFileDnaExporter_25.py [-- [options]]
+ blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py [-- [options]]
Options:
--dna-keep-blend: doesn't delete the produced blend file DNA export to html
--dna-debug: sets the logging level to DEBUG (lots of additional info)
--dna-versioned saves version informations in the html and blend filenames
--dna-overwrite-css overwrite dna.css, useful when modifying css in the script
Examples:
- default: % blender2.5 -b -P BlendFileDnaExporter_25.py
- with options: % blender2.5 -b -P BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug
+ default: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py
+ with options: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-10-19 21:55:27 UTC (rev 41122)
@@ -27,7 +27,7 @@
-------------------
- Run this script from blenders root path once you have compiled blender
- ./blender.bin --background --python doc/python_api/sphinx_doc_gen.py
+ ./blender.bin --background -noaudio --python doc/python_api/sphinx_doc_gen.py
This will generate python files in doc/python_api/sphinx-in/
providing ./blender.bin is or links to the blender executable
@@ -94,7 +94,7 @@
# for quick rebuilds
"""
rm -rf /b/doc/python_api/sphinx-* && \
-./blender.bin --background --factory-startup --python doc/python_api/sphinx_doc_gen.py && \
+./blender.bin --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py && \
sphinx-build doc/python_api/sphinx-in doc/python_api/sphinx-out
"""
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.sh
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.sh 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.sh 2011-10-19 21:55:27 UTC (rev 41122)
@@ -48,7 +48,7 @@
if $DO_EXE_BLENDER ; then
# dont delete existing docs, now partial updates are used for quick builds.
- $BLENDER --background --factory-startup --python $SPHINXBASE/sphinx_doc_gen.py
+ $BLENDER --background -noaudio --factory-startup --python $SPHINXBASE/sphinx_doc_gen.py
fi
Modified: trunk/blender/intern/tools/dump_rna2xml.py
===================================================================
--- trunk/blender/intern/tools/dump_rna2xml.py 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/intern/tools/dump_rna2xml.py 2011-10-19 21:55:27 UTC (rev 41122)
@@ -27,7 +27,7 @@
# useful for finding bugs in RNA api.
# Example usage
-# blender some.blend -b -P intern/tools/dump_rna2xml.py
+# blender some.blend --background -noaudio --python intern/tools/dump_rna2xml.py
import bpy
Modified: trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
===================================================================
--- trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py 2011-10-19 21:55:27 UTC (rev 41122)
@@ -8,7 +8,7 @@
[comment *] ToolSettings.snap_align_rotation -> use_snap_align_rotation: boolean [Align rotation with the snapping target]
Geterate output format from blender run this:
- ./blender.bin --background --python ./release/scripts/modules/rna_info.py 2> source/blender/makesrna/rna_cleanup/out.txt
+ ./blender.bin --background -noaudio --python ./release/scripts/modules/rna_info.py 2> source/blender/makesrna/rna_cleanup/out.txt
"""
Modified: trunk/blender/source/blender/makesrna/rna_cleanup/rna_update.sh
===================================================================
--- trunk/blender/source/blender/makesrna/rna_cleanup/rna_update.sh 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/source/blender/makesrna/rna_cleanup/rna_update.sh 2011-10-19 21:55:27 UTC (rev 41122)
@@ -1,5 +1,5 @@
cd ../../../../
-./blender.bin --background --python ./release/scripts/modules/rna_info.py 2> source/blender/makesrna/rna_cleanup/out.txt
+./blender.bin --background -noaudio --python ./release/scripts/modules/rna_info.py 2> source/blender/makesrna/rna_cleanup/out.txt
cd ./source/blender/makesrna/rna_cleanup/
./rna_cleaner.py out.txt
./rna_cleaner.py rna_properties.txt
Modified: trunk/blender/source/tests/CMakeLists.txt
===================================================================
--- trunk/blender/source/tests/CMakeLists.txt 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/source/tests/CMakeLists.txt 2011-10-19 21:55:27 UTC (rev 41122)
@@ -43,7 +43,7 @@
endif()
# for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no
-set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
+set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
# ------------------------------------------------------------------------------
Modified: trunk/blender/source/tests/rna_info_dump.py
===================================================================
--- trunk/blender/source/tests/rna_info_dump.py 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/source/tests/rna_info_dump.py 2011-10-19 21:55:27 UTC (rev 41122)
@@ -19,7 +19,7 @@
# <pep8 compliant>
# Used for generating API diff's between releases
-# ./blender.bin --background --python release/test/rna_info_dump.py
+# ./blender.bin --background -noaudio --python release/test/rna_info_dump.py
import bpy
Modified: trunk/blender/source/tools/CTS/FBlender.py
===================================================================
--- trunk/blender/source/tools/CTS/FBlender.py 2011-10-19 21:42:37 UTC (rev 41121)
+++ trunk/blender/source/tools/CTS/FBlender.py 2011-10-19 21:55:27 UTC (rev 41122)
@@ -157,7 +157,7 @@
"""
outputFormat = ".png"
- command = ("\"" + self.configDict["blenderPath"] + "\" -b \"" + self.configDict["blenderEmpty"] + "\" -o ")
+ command = ("\"" + self.configDict["blenderPath"] + "\" --background -noaudio \"" + self.configDict["blenderEmpty"] + "\" -o ")
baseName = FUtils.GetProperFilename(filename)
self.__currentImportProperName = baseName
@@ -165,7 +165,7 @@
self.__currentFilename = outputFilename
imageFilename = os.path.join(outputDir, "result" + outputFormat)
self.__currentImageName = imageFilename
- command = (command + "\"" + imageFilename + "\" -P \"" + self.__blenderScript.name + "\" -- \""+ self.configDict["blenderDefaultDae"] +"\" \"" + outputFilename + "\" \"" + imageFilename + "\" \"" + filename+"\"")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list