[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19804] trunk/blender: Scons epydos changed options

[Campbell Barton]

Revision: 19804
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19804
Author:   campbellbarton
Date:     2009-04-20 00:02:48 +0200 (Mon, 20 Apr 2009)

Log Message:
-----------
Scons epydos changed options
- no source code since this is only useful if the epydocs contain code, ours are only docstrings.
- set inheritance to included so you dont have to search up the classes to find available functions.
- SConstruct, isolate the exception for importing epydoc.
- Added a print to the SConscript files otherwise it looks like nothings happening.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/source/blender/python/api2_2x/doc/SConscript
    trunk/blender/source/gameengine/PyDoc/SConscript

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2009-04-19 21:26:29 UTC (rev 19803)
+++ trunk/blender/SConstruct	2009-04-19 22:02:48 UTC (rev 19804)
@@ -616,11 +616,13 @@
 
 #------------ EPYDOC
 if env['WITH_BF_DOCS']:
-	try:
-		import epydoc
+	try:		import epydoc
+	except:	epydoc = None
+	
+	if epydoc:
 		SConscript('source/blender/python/api2_2x/doc/SConscript')
 		SConscript('source/gameengine/PyDoc/SConscript')
-	except ImportError:
+	else:
 		print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
 	
 

Modified: trunk/blender/source/blender/python/api2_2x/doc/SConscript
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/SConscript	2009-04-19 21:26:29 UTC (rev 19803)
+++ trunk/blender/source/blender/python/api2_2x/doc/SConscript	2009-04-19 22:02:48 UTC (rev 19804)
@@ -10,6 +10,10 @@
 docindex = build_doc_index(names)
 optvalues = cli.OPTION_DEFAULTS
 optvalues["verbose"] = 1
+optvalues["quiet"] = 0
+optvalues["include_source_code"] = 0
+optvalues["inheritance"] = "included"
+optvalues["show_private"] = 0
 optvalues["target"] = env["BF_DOCDIR"]+"/BPY_API/"
 optvalues["url"] = "http://www.blender.org"
 optvalues["top"] = "API_intro"
@@ -20,5 +24,6 @@
 optparser = OptionParser()
 optparser.set_defaults(**optvalues)
 (options, args) = optparser.parse_args([])
+print "Writing Blender Python epydocs to \"%s\"" % optvalues["target"]
 cli.write_html(docindex, options)
 

Modified: trunk/blender/source/gameengine/PyDoc/SConscript
===================================================================
--- trunk/blender/source/gameengine/PyDoc/SConscript	2009-04-19 21:26:29 UTC (rev 19803)
+++ trunk/blender/source/gameengine/PyDoc/SConscript	2009-04-19 22:02:48 UTC (rev 19804)
@@ -10,6 +10,10 @@
 docindex = build_doc_index(names)
 optvalues = cli.OPTION_DEFAULTS
 optvalues["verbose"] = 1
+optvalues["quiet"] = 0
+optvalues["include_source_code"] = 0
+optvalues["inheritance"] = "included"
+optvalues["show_private"] = 0
 optvalues["target"] = env["BF_DOCDIR"]+"/BGE_API/"
 optvalues["url"] = "http://www.blender.org"
 optvalues["top"] = "Game Engine API"
@@ -20,5 +24,6 @@
 optparser = OptionParser()
 optparser.set_defaults(**optvalues)
 (options, args) = optparser.parse_args([])
+print "Writing Game Engine epydocs to \"%s\"" % optvalues["target"]
 cli.write_html(docindex, options)