[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.5,1.6 setup.py,1.2,1.3

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

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv17571

Modified Files:
	CHANGES.current setup.py 
Log Message:
See CHANGES.current

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CHANGES.current	20 Mar 2003 00:24:47 -0000	1.5
--- CHANGES.current	20 Mar 2003 17:53:37 -0000	1.6
***************
*** 1,4 ****
--- 1,15 ----
  Version 0.3.1 (in progress)
  ===========================
+ 2003-03-20: onsight
+             Fixed const cast in matrix * vector routines.  Why doesn't
+ 	    gcc 3.2.1 -Wall catch this? (!)
+ 
+ 	    Changed cSimData.i in Source to include the main version in
+ 	    Include/SimData.  These differ in their %module directive.
+ 	    The main one uses SimData.cSimData, which is needed for 3rd
+ 	    party apps than import the SimData interface for SWIG.  The
+ 	    version used to build SimData (in Source) uses just
+ 	    %module SimData.
+ 
  2003-03-19: onsight
              Changed Enumeration implementation to use std::map<> instead

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.py	20 Mar 2003 00:24:47 -0000	1.2
--- setup.py	20 Mar 2003 17:53:39 -0000	1.3
***************
*** 63,66 ****
--- 63,67 ----
  		print "Installing SimData headers to", incpath
  		copy_dir("Include/SimData", incpath, headers)
+ 		copy_dir("Include/SimData", incpath, interfaces)
  	except Exception, e:
  		print e
***************
*** 217,228 ****
  
  interfaces = [
! 	"cSimData"
  ]
  
  def fullpath(path, ext, list):
  	return map(lambda x: path+x+ext, list)
  
  sources = fullpath("Source/", ".cpp", sources)
! interfaces = fullpath("Source/", ".i", interfaces)
  headers_fullpath = fullpath("Include/SimData/", "", headers)
  
--- 218,258 ----
  
  interfaces = [
! 	"cSimData.i",
! 	"BaseType.i",
! 	"HashUtility.i",
! 	"Object.i",
! 	"Vector3.i",
! 	"DataArchive.i",
! 	"InterfaceRegistry.i",
! 	"Pack.i",
! 	"cSimData.i",
! 	"Date.i",
! 	"Interpolate.i",
! 	"Path.i",
! 	"filemap.i",
! 	"Enum.i",
! 	"List.i",
! 	"Random.i",
! 	"vector.i",
! 	"Exception.i",
! 	"Log.i",
! 	"Spread.i",
! 	"External.i",
! 	"Math.i",
! 	"String.i",
! 	"GeoPos.i",
! 	"Matrix3.i",
! 	"Types.i",
  ]
  
+ 
  def fullpath(path, ext, list):
  	return map(lambda x: path+x+ext, list)
  
+ main_interface = ["cSimData.i"]
+ 
  sources = fullpath("Source/", ".cpp", sources)
! main_interface_fullpath = fullpath("Source/", "", main_interface)
! interfaces_fullpath = fullpath("Include/SimData/", "", interfaces)
  headers_fullpath = fullpath("Include/SimData/", "", headers)
  
***************
*** 238,242 ****
  
  cSimData = Extension("SimData._cSimData", 
!                      sources + interfaces, 
  					 include_dirs = includes,
  					 define_macros = defines,
--- 268,272 ----
  
  cSimData = Extension("SimData._cSimData", 
!                      sources + main_interface_fullpath, 
  					 include_dirs = includes,
  					 define_macros = defines,
***************
*** 252,256 ****
        url="http://csp.sourceforge.net/wiki/",
        packages=['SimData'],
! 	  headers = headers_fullpath,
  	  ext_modules = [cSimData],
  	  )
--- 282,286 ----
        url="http://csp.sourceforge.net/wiki/",
        packages=['SimData'],
! 	  headers = headers_fullpath + interfaces_fullpath + main_interface_fullpath,
  	  ext_modules = [cSimData],
  	  )