[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25375] trunk/blender/SConstruct: Scons:

[Thomas Dinges]

Revision: 25375
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25375
Author:   dingto
Date:     2009-12-14 18:40:12 +0100 (Mon, 14 Dec 2009)

Log Message:
-----------
Scons:
* Sequencer and textures dir (and the makefiles for that) go into the /plugins folder again, as it should be. 
* Don't generate a "doc" dir, when building them is disabled. 

Patch by Matt. D. Thanks a lot! 

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2009-12-14 17:08:02 UTC (rev 25374)
+++ trunk/blender/SConstruct	2009-12-14 17:40:12 UTC (rev 25375)
@@ -378,7 +378,7 @@
 	os.makedirs ( B.root_build_dir + 'extern' )
 	os.makedirs ( B.root_build_dir + 'lib' )
 	os.makedirs ( B.root_build_dir + 'bin' )
-if not os.path.isdir(B.doc_build_dir):
+if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
 	os.makedirs ( B.doc_build_dir )
 
 Help(opts.GenerateHelpText(env))
@@ -535,7 +535,7 @@
 		tn.remove('.svn')
 	for f in tf:
 		pluglist.append(os.path.join(tp, f))
-		plugtargetlist.append( os.path.join(*([BLENDERPATH] + tp.split(os.sep)[1:] + [f])) )
+		plugtargetlist.append( os.path.join(*([BLENDERPATH, 'plugins'] + tp.split(os.sep)[1:] + [f])) )
 
 
 # header files for plugins
@@ -648,12 +648,14 @@
 
 #------------ EPYDOC
 if env['WITH_BF_DOCS']:
-	try:		import epydoc
-	except:	epydoc = None
-	
-	if epydoc:
-		SConscript('source/gameengine/PyDoc/SConscript')
-	else:
-		print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
-	
+    try:
+        import epydoc
+    except ImportError:
+        epydoc = None
 
+    if epydoc:
+        SConscript('source/gameengine/PyDoc/SConscript')
+    else:
+        print "No epydoc install detected, Python API and Gameengine API Docs will not be generated "
+
+