From 18c82ce390f017baff8fd3020a189512e980c7a9 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 14 Jul 2010 16:38:09 +0000 Subject: [PATCH] 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. --- SConstruct | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 09ada7d7f70..b11df1b4c67 100644 --- a/SConstruct +++ b/SConstruct @@ -47,19 +47,18 @@ import re 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