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!
This commit is contained in:
10
SConstruct
10
SConstruct
@@ -378,7 +378,7 @@ if not os.path.isdir ( B.root_build_dir):
|
|||||||
os.makedirs ( B.root_build_dir + 'extern' )
|
os.makedirs ( B.root_build_dir + 'extern' )
|
||||||
os.makedirs ( B.root_build_dir + 'lib' )
|
os.makedirs ( B.root_build_dir + 'lib' )
|
||||||
os.makedirs ( B.root_build_dir + 'bin' )
|
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 )
|
os.makedirs ( B.doc_build_dir )
|
||||||
|
|
||||||
Help(opts.GenerateHelpText(env))
|
Help(opts.GenerateHelpText(env))
|
||||||
@@ -535,7 +535,7 @@ for tp, tn, tf in os.walk('release/plugins'):
|
|||||||
tn.remove('.svn')
|
tn.remove('.svn')
|
||||||
for f in tf:
|
for f in tf:
|
||||||
pluglist.append(os.path.join(tp, f))
|
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
|
# header files for plugins
|
||||||
@@ -648,8 +648,10 @@ if not env['WITHOUT_BF_INSTALL']:
|
|||||||
|
|
||||||
#------------ EPYDOC
|
#------------ EPYDOC
|
||||||
if env['WITH_BF_DOCS']:
|
if env['WITH_BF_DOCS']:
|
||||||
try: import epydoc
|
try:
|
||||||
except: epydoc = None
|
import epydoc
|
||||||
|
except ImportError:
|
||||||
|
epydoc = None
|
||||||
|
|
||||||
if epydoc:
|
if epydoc:
|
||||||
SConscript('source/gameengine/PyDoc/SConscript')
|
SConscript('source/gameengine/PyDoc/SConscript')
|
||||||
|
Reference in New Issue
Block a user