[Csp-commits] APPLICATIONS/SimData build_support.py,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24181

Modified Files:
	build_support.py 
Log Message:


Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build_support.py	14 Mar 2004 04:19:23 -0000	1.3
--- build_support.py	19 Mar 2004 07:56:02 -0000	1.4
***************
*** 94,99 ****
  	"""Install specified files in the given directory."""
  	import SCons.Node
! 	sources = SCons.Node.arg2nodes(source, env.fs.File)
! 	dnodes = SCons.Node.arg2nodes(dir, env.fs.Dir)
  	tgt = []
  	for dnode in dnodes:
--- 94,101 ----
  	"""Install specified files in the given directory."""
  	import SCons.Node
! 	sources = env.arg2nodes(source, env.fs.File)
! 	dnodes = env.arg2nodes(dir, env.fs.Dir)
! 	#sources = SCons.Node.arg2nodes(source, env.fs.File)
! 	#dnodes = SCons.Node.arg2nodes(dir, env.fs.Dir)
  	tgt = []
  	for dnode in dnodes:
***************
*** 185,190 ****
  	ok = 0
  	context.Message("Checking for swig...")
! 	#swig_in, swig_out, swig_err = os.popen3('%s -version' % SWIG, 't', 1024)
! 	swig_err = os.popen('%s -version 2>&1' % SWIG, 'rt', 1024)
  	if swig_err is not None:
  		output = swig_err.readlines()
--- 187,191 ----
  	ok = 0
  	context.Message("Checking for swig...")
! 	swig_in, swig_out, swig_err = os.popen3('%s -version' % SWIG, 't')
  	if swig_err is not None:
  		output = swig_err.readlines()
***************
*** 367,371 ****
  
  	def add(self, content, type='both'):
! 		content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content.extend(content)
--- 368,373 ----
  
  	def add(self, content, type='both'):
! 		content = self.env.arg2nodes(content, self.env.fs.File)
! 		#content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content.extend(content)
***************
*** 377,381 ****
  
  	def remove(self, content, type='both'):
! 		content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content = self._filter_content(self.source_content, content)
--- 379,384 ----
  
  	def remove(self, content, type='both'):
! 		content = self.env.arg2nodes(content, self.env.fs.File)
! 		#content = SCons.Node.arg2nodes(content, self.env.fs.File)
  		if type == 'source' or type == 'both':
  			self.source_content = self._filter_content(self.source_content, content)
***************
*** 438,443 ****
  		src = map(str, content)
  		dst = map(lambda x: os.path.join(dist, x), src)
! 		src = SCons.Node.arg2nodes(src, env.fs.File)
! 		dst = SCons.Node.arg2nodes(dst, env.fs.File)
  		ret = []
  		for source, target in map(lambda x, y: (x,y), src, dst):
--- 441,448 ----
  		src = map(str, content)
  		dst = map(lambda x: os.path.join(dist, x), src)
! 		src = self.env.arg2nodes(src, env.fs.File)
! 		dst = self.env.arg2nodes(dst, env.fs.File)
! 		#src = SCons.Node.arg2nodes(src, env.fs.File)
! 		#dst = SCons.Node.arg2nodes(dst, env.fs.File)
  		ret = []
  		for source, target in map(lambda x, y: (x,y), src, dst):