[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22994] branches/blender2.5/blender/tools/ Blender.py: == SCons ==

[Nathan Letwory]

Revision: 22994
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22994
Author:   jesterking
Date:     2009-09-04 17:54:06 +0200 (Fri, 04 Sep 2009)

Log Message:
-----------
== SCons ==
* apply a patch from b333rt. I modified to test for relative/absolute paths before doing mods by b333rt. Fixes troubles with using absolute paths in BF_BUILDDIR

Modified Paths:
--------------
    branches/blender2.5/blender/tools/Blender.py

Modified: branches/blender2.5/blender/tools/Blender.py
===================================================================
--- branches/blender2.5/blender/tools/Blender.py	2009-09-04 14:14:39 UTC (rev 22993)
+++ branches/blender2.5/blender/tools/Blender.py	2009-09-04 15:54:06 UTC (rev 22994)
@@ -101,7 +101,10 @@
 		sortlist.sort()
 		for sk in sortlist:
 			v = curlib[sk]
-			target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+			if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+				target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
+			else:
+				target = os.path.abspath(root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
 			lst.append(target)
 
 	return lst
@@ -465,7 +468,11 @@
 		
 		print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
 		lenv = self.Clone()
-		res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
+		if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'):
+			res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
+		else:
+			res = lenv.RES(root_build_dir+'lib/'+libname, source)
+
 		
 		SConsEnvironment.Default(self, res)
 		resources.append(res)