[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.7,1.8

[<de...@us...>]

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

Modified Files:
	SConscript 
Log Message:
see CHANGES.current

Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SConscript	19 Mar 2004 08:57:14 -0000	1.7
--- SConscript	30 Mar 2004 10:13:04 -0000	1.8
***************
*** 28,182 ****
  
  headers = Prefix("#/Include/SimData",
! 	"""
! 	Archive.h
! 	BaseType.h
! 	Composite.h
! 	Conversions.h
! 	DataArchive.h
! 	DataManager.h
! 	Date.h
! 	Enum.h
! 	Exception.h
! 	Export.h
! 	External.h
! 	FileUtility.h
! 	GeoPos.h
! 	hash_map.h
! 	HashUtility.h
! 	Integer.h
! 	InterfaceRegistry.h
! 	Interpolate.h
! 	Key.h
! 	Link.h
! 	List.h
! 	LUT.h
! 	Log.h
! 	LogStream.h
! 	Math.h
! 	Matrix3.h
! 	Noise.h
! 	Namespace.h
! 	Object.h
! 	ObjectInterface.h
! 	osg.h
! 	Path.h
! 	PTS.h
! 	Quat.h
! 	Random.h
! 	Real.h
! 	Ref.h
! 	Singleton.h
! 	String.h
! 	Trace.h
! 	TypeAdapter.h
! 	Types.h
! 	Uniform.h
! 	Vector3.h
! 	Version.h
! 	""")
  
  sub_interfaces = Prefix("#/Include/SimData",
! 	"""
! 	Archive.i
! 	BaseType.i
! 	Conversions.i
! 	cSimData.i
! 	DataArchive.i
! 	DataManager.i
! 	Date.i
! 	Enum.i
! 	Exception.i
! 	External.i
! 	filemap.i
! 	GeoPos.i
! 	HashUtility.i
! 	InterfaceRegistry.i
! 	Interpolate.i
! 	Key.i
! 	Link.i
! 	List.i
! 	Log.i
! 	LUT.i
! 	Matrix3.i
! 	Noise.i
! 	Object.i
! 	Path.i
! 	Quat.i
! 	Random.i
! 	Real.i
! 	String.i
! 	Types.i
! 	vector.i
! 	Vector3.i
! 	""")
  
  sources = """
! 	BaseType.cpp
! 	DataArchive.cpp
! 	DataManager.cpp
! 	Date.cpp
! 	Enum.cpp
! 	Exception.cpp
! 	External.cpp
! 	FileUtility.cpp
! 	GeoPos.cpp
! 	HashUtility.cpp
! 	InterfaceRegistry.cpp
! 	Interpolate.cpp
! 	Key.cpp
! 	Link.cpp
! 	List.cpp
! 	LogStream.cpp
! 	LUT.cpp
! 	Math.cpp
! 	Matrix3.cpp
! 	Noise.cpp
! 	Object.cpp
! 	Path.cpp
! 	Quat.cpp
! 	Random.cpp
! 	Real.cpp
! 	TypeAdapter.cpp
! 	Vector3.cpp
! 	Version.cpp
! 	""".split()
  
  package_files = Prefix("#/SimData",
! 	"""
! 	__init__.py
! 	Parse.py
! 	Compile.py
! 	Debug.py
! 	cSimData.py
! 	""")
  
  extra_files = Prefix("#",
! 	"""
! 	README
! 	COPYING
! 	TODO
! 	SConstruct
! 	build_support.py
! 	build_config.py
! 	setup.py
! 	Source/SConscript
! 	""")
  
  doc_files = Prefix("#/Doc",
! 	"""
! 	Doxyfile
! 	SConscript
! 	footer.html
! 	""")
  
  deb_files = Prefix("#/debian",
! 	"""
! 	control
! 	rules
! 	copyright
! 	changelog
! 	docs
! 	files
! 	""")
  
  # extension module
--- 28,182 ----
  
  headers = Prefix("#/Include/SimData",
!     """
!     Archive.h
!     BaseType.h
!     Composite.h
!     Conversions.h
!     DataArchive.h
!     DataManager.h
!     Date.h
!     Enum.h
!     ExceptionBase.h
!     Export.h
!     External.h
!     FileUtility.h
!     GeoPos.h
!     hash_map.h
!     HashUtility.h
!     Integer.h
!     InterfaceRegistry.h
!     Interpolate.h
!     Key.h
!     Link.h
!     List.h
!     LUT.h
!     Log.h
!     LogStream.h
!     Math.h
!     Matrix3.h
!     Noise.h
!     Namespace.h
!     Object.h
!     ObjectInterface.h
!     osg.h
!     Path.h
!     PTS.h
!     Quat.h
!     Random.h
!     Real.h
!     Ref.h
!     Singleton.h
!     String.h
!     Trace.h
!     TypeAdapter.h
!     Types.h
!     Uniform.h
!     Vector3.h
!     Version.h
!     """)
  
  sub_interfaces = Prefix("#/Include/SimData",
!     """
!     Archive.i
!     BaseType.i
!     Conversions.i
!     cSimData.i
!     DataArchive.i
!     DataManager.i
!     Date.i
!     Enum.i
!     ExceptionBase.i
!     External.i
!     filemap.i
!     GeoPos.i
!     HashUtility.i
!     InterfaceRegistry.i
!     Interpolate.i
!     Key.i
!     Link.i
!     List.i
!     Log.i
!     LUT.i
!     Matrix3.i
!     Noise.i
!     Object.i
!     Path.i
!     Quat.i
!     Random.i
!     Real.i
!     String.i
!     Types.i
!     vector.i
!     Vector3.i
!     """)
  
  sources = """
!     BaseType.cpp
!     DataArchive.cpp
!     DataManager.cpp
!     Date.cpp
!     Enum.cpp
!     ExceptionBase.cpp
!     External.cpp
!     FileUtility.cpp
!     GeoPos.cpp
!     HashUtility.cpp
!     InterfaceRegistry.cpp
!     Interpolate.cpp
!     Key.cpp
!     Link.cpp
!     List.cpp
!     LogStream.cpp
!     LUT.cpp
!     Math.cpp
!     Matrix3.cpp
!     Noise.cpp
!     Object.cpp
!     Path.cpp
!     Quat.cpp
!     Random.cpp
!     Real.cpp
!     TypeAdapter.cpp
!     Vector3.cpp
!     Version.cpp
!     """.split()
  
  package_files = Prefix("#/SimData",
!     """
!     __init__.py
!     Parse.py
!     Compile.py
!     Debug.py
!     cSimData.py
!     """)
  
  extra_files = Prefix("#",
!     """
!     README
!     COPYING
!     TODO
!     SConstruct
!     build_support.py
!     build_config.py
!     setup.py
!     Source/SConscript
!     """)
  
  doc_files = Prefix("#/Doc",
!     """
!     Doxyfile
!     SConscript
!     footer.html
!     """)
  
  deb_files = Prefix("#/debian",
!     """
!     control
!     rules
!     copyright
!     changelog
!     docs
!     files
!     """)
  
  # extension module
***************
*** 195,213 ****
  ExpandList(libraries, shared_library)
  
  if env['PLATFORM'] != 'win32':
    static_library = env.StaticLibrary('#/SimData/libSimData', sources)
    ExpandList(libraries, 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')
! 
--- 195,221 ----
  ExpandList(libraries, shared_library)
  
+ 
+ # XXX
+ #static_library = env.StaticLibrary('#/SimData/libSimData', sources)
+ 
+ #libraries = [shared_library, static_library]
+ #libraries = [shared_library]
+ 
  if env['PLATFORM'] != 'win32':
    static_library = env.StaticLibrary('#/SimData/libSimData', sources)
    ExpandList(libraries, static_library)
  
+ 
  package_targets = libraries + [package_module]
  
  # installation
  package = env['PACKAGE']
+ # XXX
  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')