[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.11,1.12 Makefile,1.8,1.9 setup.py,1.9,1.10

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

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

Modified Files:
	CHANGES.current Makefile setup.py 
Log Message:
see CHANGES.current

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CHANGES.current	22 Mar 2003 15:20:44 -0000	1.11
--- CHANGES.current	26 Mar 2003 05:08:01 -0000	1.12
***************
*** 2,5 ****
--- 2,21 ----
  ===========================
  
+             *** ANY MSVC USERS: PLEASE UPDATE THE PROJECT FILE TO INCLUDE ***
+ 	    *** NOISE.CPP                                                 ***
+ 
+ 2003-03-25: onsight
+             Changed #define types for InterpolatedData to class typedefs.
+ 	    
+ 	    Made several methods const, and added a const iterator typedef.
+ 
+ 	    Preliminary implementation of a one-dimensional perlin noise
+ 	    class.
+ 
+ 	    Added some basic unit connversion functions.
+ 
+ 	    More documentation of date classes, and a couple bug fixes in
+ 	    Zulu.
+ 
  2003-03-22: delta
  	    Minor changes to setup.py under make_install_win

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	22 Mar 2003 13:00:49 -0000	1.8
--- Makefile	26 Mar 2003 05:08:01 -0000	1.9
***************
*** 1,8 ****
  SUBDIRS = Source 
  
! export PYTHON_INCLUDE := -I$(shell python setup.py python_include_path)
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2 $(PYTHON_INCLUDE)# -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -noexcept
--- 1,8 ----
  SUBDIRS = Source 
  
! export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2# -march=athlon-tbird
  export GLDOPTS = -shared -lswigpy -ldl
  export GSWOPTS = -c -c++ -python -noexcept

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** setup.py	22 Mar 2003 15:20:44 -0000	1.9
--- setup.py	26 Mar 2003 05:08:01 -0000	1.10
***************
*** 26,33 ****
--- 26,39 ----
  
  
+ 
+ 
  import sys
  
  min_python_version = "2.2.0"
  
+ # this is the default path used by make_install under linux to install the 
+ # shared and static libraries.  it can be changed with --prefix=XYZ
+ default_libpath = "/usr/local/lib"
+ 
  if len(sys.argv) == 2:
  	command = sys.argv[1]
***************
*** 67,71 ****
              copy_file(src_name, dst_name)
  
! def make_install(win):
  	lib = sysconfig.get_python_lib()
  	inc = sysconfig.get_python_inc()
--- 73,77 ----
              copy_file(src_name, dst_name)
  
! def make_install(win, args):
  	lib = sysconfig.get_python_lib()
  	inc = sysconfig.get_python_inc()
***************
*** 73,76 ****
--- 79,86 ----
  	incpath = os.path.join(inc, "SimData")
  	localinc = os.path.normpath("Include/SimData")
+ 	libpath = default_libpath
+ 	for arg in args:
+ 		if arg.startswith("--prefix="):
+ 			libpath = arg[9:]
  	package_files = ['__init__.py', 'Debug.py', 'Parse.py', 'Compile.py']
  	if win:
***************
*** 88,91 ****
--- 98,109 ----
  		copy_dir(localinc, incpath, headers)
  		copy_dir(localinc, incpath, interfaces)
+ 		if not win:
+ 			print "Installing SimData libraries to", libpath
+ 			copy_dir("SimData", libpath, ['_cSimData.so', 'libSimData.a'])
+ 		print "Byte compiling the Python modules..."
+ 		import py_compile
+ 		for file in package_files:
+ 			if file.endswith(".py"):
+ 				py_compile.compile(os.path.join(modpath, file))	
  	except Exception, e:
  		print e
***************
*** 194,197 ****
--- 212,216 ----
  	"Matrix3",
  	"Object",
+ 	"Noise",
  	"Pack",
  	"Path",
***************
*** 206,209 ****
--- 225,229 ----
  headers = [
  	"BaseType.h",
+ 	"Conversions.h",
  	"DataArchive.h",
  	"Date.h",
***************
*** 224,227 ****
--- 244,248 ----
  	"Math.h",
  	"Matrix3.h",
+ 	"Noise.h",
  	"ns-simdata.h",
  	"Object.h",
***************
*** 244,271 ****
  	"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",
  ]
  
--- 265,292 ----
  	"cSimData.i",
  	"BaseType.i",
! 	"Conversions.i",
  	"DataArchive.i",
  	"Date.i",
  	"Enum.i",
  	"Exception.i",
  	"External.i",
! 	"filemap.i",
  	"GeoPos.i",
+ 	"HashUtility.i",
+ 	"InterfaceRegistry.i",
+ 	"Interpolate.i",
+ 	"List.i",
+ 	"Log.i",
+ 	"Math.i",
  	"Matrix3.i",
+ 	"Object.i",
+ 	"Pack.i",
+ 	"Path.i",
+ 	"Random.i",
+ 	"Spread.i",
+ 	"String.i",
  	"Types.i",
+ 	"vector.i",
+ 	"Vector3.i",
  ]
  
***************
*** 288,295 ****
  
  
! if len(sys.argv)==2:
  	command = sys.argv[1]
  	if command.startswith("make_install"):
! 		make_install(command.endswith("win"))
  	if command == "python_include_path":
  		print sysconfig.get_python_inc()
--- 309,316 ----
  
  
! if len(sys.argv)>=2:
  	command = sys.argv[1]
  	if command.startswith("make_install"):
! 		make_install(command.endswith("win"), sys.argv[2:])
  	if command == "python_include_path":
  		print sysconfig.get_python_inc()