[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/waf/wafadmin
From:       Thomas Nagy <tnagyemail-mail () yahoo ! fr>
Date:       2006-05-04 22:10:43
Message-ID: 1146780643.864734.28329.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 537493 by tnagy:

--blddir does not make an infinite loop


 M  +6 -0      Build.py  
 M  +3 -3      Options.py  
 M  +1 -2      Scripting.py  


--- trunk/playground/devtools/waf/wafadmin/Build.py #537492:537493
@@ -83,6 +83,12 @@
 
 	def set_bdir(self, path):
 		trace("set_builddir")
+		if path[0]=="/":
+			print "path is absolute"
+			lst = path.split('/')
+			truc = lst[len(lst)-1]
+			Params.g_excludes.append(truc)
+
 		p = os.path.abspath(path)
 		if sys.platform=='win32': p=p[2:]
 		node = self.m_tree.ensure_directory(p)
--- trunk/playground/devtools/waf/wafadmin/Options.py #537492:537493
@@ -48,14 +48,14 @@
 		dest = 'verbose')
 
 	if 'configure' in sys.argv:
-		p('-b', '--builddir',
-			action = 'store_true',
+		p('-b', '--blddir',
+			action = 'store',
 			default='',
 			help='build dir for the project (configuration)',
 			dest = 'blddir')
 
 		p('-s', '--srcdir',
-			action = 'store_true',
+			action = 'store',
 			default='',
 			help='src dir for the project (configuration)',
 			dest = 'srcdir')
--- trunk/playground/devtools/waf/wafadmin/Scripting.py #537492:537493
@@ -68,8 +68,7 @@
 			cachedir = Utils.g_module.cachedir
 			bld.set_dirs(Utils.g_module.srcdir, Utils.g_module.blddir)
 		except AttributeError:
-			msg = "The attributes srcdir or builddir are missing from wscript\n[%s]\n * make \
                sure such a function is defined\n * run configure from the root of \
                the project"
-			raise
+			msg = "The attributes srcdir or blddir are missing from wscript\n[%s]\n * make \
sure such a function is defined\n * run configure from the root of the project\n * \
use waf configure --srcdir=xxx --blddir=yyy"  fatal(msg % os.path.abspath('.'))
 		except OSError:
 			pass


[prev in list] [next in list] [prev in thread] [next in thread]