[Bf-committers] Patch for building blender with scons 0.98.1 or 0.98.2

[Jochen Schmitt]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

during building blender for the Fedora Project I have to find out,
that there is a issue on building
blender if scons-0.98.1 or scons-0.98.2 was installed. I have got the
following messages:

[?1034hscons: Reading SConscript files ...
ImportError: No module named BoolOption:
  File "/builddir/build/BUILD/blender-2.45/SConstruct", line 44:
    import tools.btools
  File "/builddir/build/BUILD/blender-2.45/tools/btools.py", line 4:
    import SCons.Options.BoolOption
error: Bad exit status from /var/tmp/rpm-tmp.52545 (%build)
RPM build errors:
    Bad exit status from /var/tmp/rpm-tmp.52545 (%build)
EXCEPTION: Command failed. See logs for output.
 # ['bash', '--login', '-c', 'rpmbuild -bb --target x86_64 --nodeps
builddir/build/SPECS/blender.spec']
Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/mock/trace_decorator.py",
line 70, in trace
    result = func(*args, **kw)
  File "/usr/lib/python2.4/site-packages/mock/util.py", line 315, in do
    raise mock.exception.Error, ("Command failed. See logs for
output.\n # %s" %
(command,), child.returncode)
Error: Command failed. See logs for output.
 # ['bash', '--login', '-c', 'rpmbuild -bb --target x86_64 --nodeps
builddir/build/SPECS/blender.spec']
LEAVE do --> EXCEPTION RAISED

After contacting the Fedora maintainer of scons I have develop the
following
patch:

diff -up blender-2.45/tools/btools.py.scons blender-2.45/tools/btools.py
- --- blender-2.45/tools/btools.py.scons  2007-09-18 07:00:48.000000000
+0200
+++ blender-2.45/tools/btools.py        2008-04-27 21:23:27.000000000
+0200
@@ -1,7 +1,10 @@
 import os
 import os.path
 import SCons.Options
- -import SCons.Options.BoolOption
+try:
+    import SCons.Options.BoolOption
+except ImportError:
+    pass
 try:
     import subprocess
 except ImportError:

Because I could see, that the svc version of blender doesn't contains
this patch, I want to publish
this patch for inclussion into the svn repository.

Best Regards:

Jochen Schmitt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFIFNVYT2AHK6txfgwRAm0JAKCQ7zrT36aDwCnU0DM0cyP+Noc4SwCgnqBW
AKvCS77Hs9H7qFBKrxXii/Y=
=2n0W
-----END PGP SIGNATURE-----