[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.2,1.3 cSimData.i,1.6,1.7

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

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

Modified Files:
	SConscript cSimData.i 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SConscript	6 Aug 2003 06:36:25 -0000	1.2
--- SConscript	1 Nov 2003 16:08:40 -0000	1.3
***************
*** 23,32 ****
  
  import os.path
  
! Import('env', 'construct', 'Package')
  
! headers = construct.Prefix("#/Include/SimData",
  	"""
  	BaseType.h
  	Conversions.h
  	DataArchive.h
--- 23,35 ----
  
  import os.path
+ from build_support import *
  
! Import('env')
  
! headers = Prefix("#/Include/SimData",
  	"""
+ 	Archive.h
  	BaseType.h
+ 	Composite.h
  	Conversions.h
  	DataArchive.h
***************
*** 39,43 ****
  	FileUtility.h
  	GeoPos.h
- 	GlibCsp.h
  	hash_map.h
  	HashUtility.h
--- 42,45 ----
***************
*** 58,62 ****
  	ObjectInterface.h
  	osg.h
- 	Pack.h
  	Path.h
  	PTS.h
--- 60,63 ----
***************
*** 65,79 ****
  	Real.h
  	Ref.h
  	String.h
  	TypeAdapter.h
  	Types.h
  	Vector3.h
- 	Vector3.inl
  	Version.h
  	""")
  
! interfaces = construct.Prefix("#/Include/SimData",
  	"""
  	cSimData.i
  	BaseType.i
  	Conversions.i
--- 66,87 ----
  	Real.h
  	Ref.h
+ 	Singleton.h
  	String.h
+ 	Trace.h
  	TypeAdapter.h
  	Types.h
+ 	Uniform.h
  	Vector3.h
  	Version.h
  	""")
  
! top_interfaces = Prefix("#/Source/",
  	"""
  	cSimData.i
+ 	""")
+ 
+ sub_interfaces = Prefix("#/Include/SimData",
+ 	"""
+ 	Archive.i
  	BaseType.i
  	Conversions.i
***************
*** 94,102 ****
  	Log.i
  	LUT.i
- 	Math.i
  	Matrix3.i
  	Noise.i
  	Object.i
- 	Pack.i
  	Path.i
  	Quat.i
--- 102,108 ----
***************
*** 131,135 ****
  	Noise.cpp
  	Object.cpp
- 	Pack.cpp
  	Path.cpp
  	Quat.cpp
--- 137,140 ----
***************
*** 141,145 ****
  	""".split()
  
! package = construct.Prefix("#/SimData", 
  	"""
  	__init__.py
--- 146,150 ----
  	""".split()
  
! package_files = Prefix("#/SimData", 
  	"""
  	__init__.py
***************
*** 150,154 ****
  	""")
  
! extra = construct.Prefix("#",
  	"""
  	README
--- 155,159 ----
  	""")
  
! extra_files = Prefix("#",
  	"""
  	README
***************
*** 162,186 ****
  	""")
  
! # swig module
! 
! env.SwigBuild(['cSimData_wrap.cpp', 'cSimData.py'], 'cSimData')
  wrapper = env.CopyFile('#/SimData/cSimData.py', 'cSimData.py')
- sources.append('cSimData_wrap.cpp')
  
  # main libraries
  
- shared_library = env.SharedLibrary('#/SimData/_cSimData', sources, SHLIBPREFIX = '', LIBS = env["SWLIBS"])
  static_library = env.StaticLibrary('#/SimData/libSimData', sources)
  libraries = [shared_library, static_library]
  
  # installation
! 
! Package.installTarget(package + libraries, headers + interfaces)
! Package.add(sources, 'source')
! Package.add(libraries, 'binary')
! Package.add(package + headers + interfaces + extra, 'both')
  
  # default target(s)
! 
! Default(shared_library, wrapper)
  
--- 167,192 ----
  	""")
  
! # swig wrappers
  wrapper = env.CopyFile('#/SimData/cSimData.py', 'cSimData.py')
  
  # main libraries
+ shared_library = env.SharedLibrary('#/SimData/_cSimData', 
+                                    sources + top_interfaces, 
+ 				   SHLIBPREFIX = '', 
+ 				   LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
  
  static_library = env.StaticLibrary('#/SimData/libSimData', sources)
+ 
  libraries = [shared_library, static_library]
+ package_targets = libraries + [wrapper]
  
  # installation
! package = env['PACKAGE']
! package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(sources, 'source')
! package.add(libraries, 'binary')
! package.add(package_files + headers + sub_interfaces + extra_files, 'both')
  
  # default target(s)
! Default(package_targets)
  

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cSimData.i	20 Mar 2003 17:53:44 -0000	1.6
--- cSimData.i	1 Nov 2003 16:08:40 -0000	1.7
***************
*** 3,4 ****
--- 3,5 ----
  %include "SimData/cSimData.i"
  
+