[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41048] trunk/blender: convenience targets for make doc_py, doc_dna, doc_man

[Campbell Barton]

Revision: 41048
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41048
Author:   campbellbarton
Date:     2011-10-16 11:09:15 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
convenience targets for make doc_py, doc_dna, doc_man

Modified Paths:
--------------
    trunk/blender/GNUmakefile
    trunk/blender/doc/manpage/blender.1.py

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-10-16 10:29:21 UTC (rev 41047)
+++ trunk/blender/GNUmakefile	2011-10-16 11:09:15 UTC (rev 41048)
@@ -147,6 +147,8 @@
 	@echo ""
 	@echo "Documentation Targets"
 	@echo "  * doc_py   - generate sphinx python api docs"
+	@echo "  * doc_dna  - generate blender file format reference"
+	@echo "  * doc_man  - generate manpage"
 	@echo ""
 
 # -----------------------------------------------------------------------------
@@ -235,7 +237,14 @@
 	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
+	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
+doc_man:
+	python3 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
+
+
 clean:
 	$(MAKE) -C $(BUILD_DIR) clean
 

Modified: trunk/blender/doc/manpage/blender.1.py
===================================================================
--- trunk/blender/doc/manpage/blender.1.py	2011-10-16 10:29:21 UTC (rev 41047)
+++ trunk/blender/doc/manpage/blender.1.py	2011-10-16 11:09:15 UTC (rev 41048)
@@ -22,6 +22,7 @@
 
 import subprocess
 import os
+import sys
 
 import time
 import datetime
@@ -43,11 +44,16 @@
 
     return data
 
+# allow passing blender as argument
+if sys.argv[-1].endswith(os.sep + "blender"):
+    blender_bin = sys.argv[-1]
+else:
+    blender_bin = os.path.join(os.path.dirname(__file__), "../../blender.bin")
 
-blender_bin = os.path.join(os.path.dirname(__file__), "../../blender.bin")
+cmd = [blender_bin, "--help"]
+print("  executing:", " ".join(cmd))
+blender_help = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0].decode()
 
-blender_help = subprocess.Popen([blender_bin, "--help"], stdout=subprocess.PIPE).communicate()[0].decode()
-
 blender_version = subprocess.Popen([blender_bin, "--version"], stdout=subprocess.PIPE).communicate()[0].decode().strip()
 blender_version = blender_version.split("Build")[0]