[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38430] trunk/blender/SConstruct: fix for scons from my last commit, this broke with relative paths ( starting with a #)

Campbell Barton ideasman42 at gmail.com
Sat Jul 16 09:58:53 CEST 2011


Revision: 38430
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38430
Author:   campbellbarton
Date:     2011-07-16 07:58:52 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
fix for scons from my last commit, this broke with relative paths (starting with a #)

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-07-16 07:14:47 UTC (rev 38429)
+++ trunk/blender/SConstruct	2011-07-16 07:58:52 UTC (rev 38430)
@@ -366,13 +366,16 @@
 # with _any_ library but since we used a fixed python version this tends to
 # be most problematic.
 if env['WITH_BF_PYTHON']:
-	if not os.path.exists(os.path.join(env.subst('${BF_PYTHON_INC}'), "Python.h")):
+	py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h")
+
+	if not os.path.exists(py_h):
 		print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n"
 			  "  Set 'BF_PYTHON_INC' to point "
 			  "to a valid python include path.\n  Containing "
 			  "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
 
 		Exit()
+	del py_h
 
 
 if not os.path.isdir ( B.root_build_dir):




More information about the Bf-blender-cvs mailing list