[Bf-committers] Building with scons-Getting files I don't want.

[matd]

On Mon, 14 Dec 2009 16:56:46 +0100, Thomas Dinges <dingto at gmx.de> wrote:

> Am 14.12.2009 16:41, schrieb Martin Poirier:
>> --- On Mon, 12/14/09, Thomas Dinges<dingto at gmx.de>  wrote:
>>
>>
>>> All fine. But what I also get (and that is really strange)
>>> is:
>>>
>>> trunk/bmake
>>> trunk/makefile
>>> trunk/sequence/makefile
>>> trunk/texture/makefile
>>>
>> Don't you mean trunk/plugins/...? (this is where those files are for  
>> me).
>>
>> Those files as well as the c files that should be in plugins/sequence  
>> and plugins/texture are examples of texture and sequence plugins.
>>
> No, i get them outside of plugins as extra folders. This is one strange
> thing too.
>> It's a straight copy of (source)/release/plugins, if I'm not mistaken.
>>
>> Release zips also contain those files, so I don't see why it's an issue  
>> to have them on a graphicall build.
>>
> Release Builds should not have these make files either. ;-)
>
> Some months ago i got it nicely like you inside plugins/textures and
> plugins/sequence and no weird make files. So I consider that a bug in
> the build system.
> At least on windows.
>> Martin
>>
>>
>>        __________________________________________________________________
>> Yahoo! Canada Toolbar: Search from anywhere on the web, and bookmark  
>> your favourite sites. Download it now
>> http://ca.toolbar.yahoo.com.
>> _______________________________________________
>> Bf-committers mailing list
>> Bf-committers at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-committers
>>
>>
>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers

Here is a patch:


Index: SConstruct
===================================================================
--- SConstruct  (revision 25328)
+++ SConstruct  (working copy)
@@ -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 "
+
+