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

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

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

Modified Files:
	build_config.py build_support.py 
Log Message:


Index: build_config.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_config.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_config.py	19 Mar 2004 07:57:43 -0000	1.4
--- build_config.py	19 Mar 2004 08:57:14 -0000	1.5
***************
*** 11,24 ****
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = None
- 		self.configSwig(env)
- 	def configSwig(self, env):
- 		version = env['SWIG_VERSION']
- 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
- 		if compareVersions(version, '1.3.20') >= 0:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
- 		else:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
- 			self.SHLINKLIBS.append('swigpy')
- 
  
  class Config_msvc(Config):
--- 11,14 ----
***************
*** 34,69 ****
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = ['.zip']
- 		self.configSwig(env)
- 	def configSwig(self, env):
- 		version = env['SWIG_VERSION']
- 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
- 		if compareVersions(version, '1.3.20') >= 0:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
- 		else:
- 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
- 			self.SHLINKLIBS.append('swigpy')
- 		
  
  class Config_win32(Config):
  	def config(self, env):
! 		#wine = '' #wine --debugmsg -all -- '
! 		#self.CXX = wine + 'cl'
! 		#self.LINK = wine + 'link'
! 		#self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
! 		#self.CPPFLAGS = ''
! 		#self.CPPPATH = ['#/Include', self.PYTHON_INC]
! 		#self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		#self.SHLINKLIBS = []
! 		#self.CXXFILESUFFIX = '.cpp'
! 		#self.ARCHIVE_FORMATS = ['.zip']
! 		self.configSwig(env)
! 	def configSwig(self, env):
! 		version = env['SWIG_VERSION']
! 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
! 		if compareVersions(version, '1.3.20') >= 0:
! 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
! 		else:
! 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
! 			self.SHLINKLIBS.append('swigpy')
! 		
  
--- 24,36 ----
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = ['.zip']
  
  class Config_win32(Config):
  	def config(self, env):
! 		self.CXXFLAGS = '/nologo /DWIN32=1 /D_WIN32=1 /D_STLPORT=1 /DSIMDATA_EXPORTS=1 /GR /GX /W3'
! 		self.CPPFLAGS = ''
! 		self.CPPPATH = ['#/Include', self.PYTHON_INC]
! 		self.SHLINKFLAGS = ' /MACHINE:I386 /LIBPATH:%s /NODEFAULTLIB:LIBC' % self.PYTHON_LIB
! 		self.SHLINKLIBS = []
! 		self.CXXFILESUFFIX = '.cpp'
! 		self.ARCHIVE_FORMATS = ['.zip']
  

Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_support.py	19 Mar 2004 07:56:02 -0000	1.4
--- build_support.py	19 Mar 2004 08:57:14 -0000	1.5
***************
*** 35,39 ****
  Scanner = SCons.Scanner.Base
  
! import os, os.path, re, shutil, glob, sys
  
  # configure tests (defined below)
--- 35,39 ----
  Scanner = SCons.Scanner.Base
  
! import os, os.path, re, shutil, glob, sys, types
  
  # configure tests (defined below)
***************
*** 131,134 ****
--- 131,139 ----
  	return conf
  
+ def ExpandList(list, arg):
+ 	if type(arg) == types.ListType:
+ 		list.extend(arg)
+ 	else:
+ 		list.append(arg)
  
  ############################################################################
***************
*** 214,218 ****
  	ext = env['CXXFILESUFFIX']
  	for s in source:
! 		wrapper = os.path.splitext(str(s))[0]+'_wrap.'+ext
  		target.append(wrapper)
  		# XXX 
--- 219,223 ----
  	ext = env['CXXFILESUFFIX']
  	for s in source:
! 		wrapper = os.path.splitext(str(s))[0]+'_wrap'+ext
  		target.append(wrapper)
  		# XXX 
***************
*** 521,524 ****
--- 526,530 ----
  		self.__dict__['env'] = env.Dictionary()
  		self.config(env)
+ 		self.configSwig(env)
  	def __setattr__(self, attr, value):
  		dict = self.__dict__['env']
***************
*** 527,530 ****
--- 533,544 ----
  		dict = self.__dict__['env']
  		return dict.get(attr,None)
+ 	def configSwig(self, env):
+ 		version = env['SWIG_VERSION']
+ 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
+ 		if compareVersions(version, '1.3.20') >= 0:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
+ 		else:
+ 			self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
+ 			self.SHLINKLIBS.append('swigpy')