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

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

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

Modified Files:
	SConscript cSimData.i 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SConscript	1 Feb 2004 12:06:44 -0000	1.5
--- SConscript	14 Mar 2004 04:19:23 -0000	1.6
***************
*** 76,84 ****
  	""")
  
- top_interfaces = Prefix("#/Source/",
- 	"""
- 	cSimData.i
- 	""")
- 
  sub_interfaces = Prefix("#/Include/SimData",
  	"""
--- 76,79 ----
***************
*** 161,165 ****
  	COPYING
  	TODO
- 	Makefile
  	SConstruct
  	build_support.py
--- 156,159 ----
***************
*** 174,186 ****
  	SConscript
  	footer.html
- 	Makefile
  	""")
  
! # 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',[]))
--- 168,191 ----
  	SConscript
  	footer.html
  	""")
  
! deb_files = Prefix("#/debian",
! 	"""
! 	control
! 	rules
! 	copyright
! 	changelog
! 	docs
! 	files
! 	""")
! 
! # extension module
! extension_interface = "#/Source/cSimData.i"
! extension_wrapper, extension_module = env.Swig([], extension_interface)
! package_module = env.CopyFile('#/SimData/cSimData.py', extension_module)
  
  # main libraries
  shared_library = env.SharedLibrary('#/SimData/_cSimData', 
!                                    sources + [extension_wrapper],
  				   SHLIBPREFIX = '', 
  				   LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
***************
*** 189,207 ****
  
  libraries = [shared_library, static_library]
! package_targets = libraries + [wrapper]
  
  # installation
  package = env['PACKAGE']
  package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(Prefix('#/Source', sources) + top_interfaces, 'source')
! package.add(top_interfaces, 'source')
  package.add(libraries, 'binary')
  package.add(package_files + headers + sub_interfaces + extra_files + doc_files, 'both')
! 
! # default target(s)
! Default(package_targets)
! 
! # unittests
! env.Depends('unittests', package_targets)
! env.Alias('test', env.Command('unittests', '', './runtests.py'))
  
--- 194,208 ----
  
  libraries = [shared_library, static_library]
! package_targets = libraries + [package_module]
  
  # installation
  package = env['PACKAGE']
  package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(Prefix('#/Source', sources), 'source')
! package.add(extension_interface, 'source')
! package.add(deb_files, 'source')
  package.add(libraries, 'binary')
  package.add(package_files + headers + sub_interfaces + extra_files + doc_files, 'both')
! package.setTargets(package_targets)
! package.unitTests('./runtests.py')
  

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cSimData.i	1 Nov 2003 16:08:40 -0000	1.7
--- cSimData.i	14 Mar 2004 04:19:23 -0000	1.8
***************
*** 3,5 ****
  %include "SimData/cSimData.i"
  
- 
--- 3,4 ----