[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30329] trunk/blender/SConstruct: Make SConstruct look in build_files/scons/tools and import from there, so no more 'import tools.Blender'.
Nathan Letwory
nathan at letworyinteractive.com
Wed Jul 14 18:38:09 CEST 2010
Revision: 30329
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30329
Author: jesterking
Date: 2010-07-14 18:38:09 +0200 (Wed, 14 Jul 2010)
Log Message:
-----------
Make SConstruct look in build_files/scons/tools and import from there, so no more 'import tools.Blender'.
This fixes problem after change to this new location, but with .pyc files still lingering in old tools/
directory that still got imported due to syspath form.
Modified Paths:
--------------
trunk/blender/SConstruct
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2010-07-14 15:17:59 UTC (rev 30328)
+++ trunk/blender/SConstruct 2010-07-14 16:38:09 UTC (rev 30329)
@@ -47,19 +47,18 @@
from tempfile import mkdtemp
# needed for importing tools
-sys.path.append(os.path.join(".", "build_files", "scons"))
+sys.path.append(os.path.join(".", "build_files", "scons", "tools"))
-import tools.Blender
-import tools.btools
-import tools.bcolors
+import Blender
+import btools
+import bcolors
EnsureSConsVersion(1,0,0)
-BlenderEnvironment = tools.Blender.BlenderEnvironment
-btools = tools.btools
-B = tools.Blender
+BlenderEnvironment = Blender.BlenderEnvironment
+B = Blender
-VERSION = tools.btools.VERSION # This is used in creating the local config directories
+VERSION = btools.VERSION # This is used in creating the local config directories
### globals ###
platform = sys.platform
More information about the Bf-blender-cvs
mailing list