csp-commits

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

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

Modified Files:
	README TODO setup.py 
Log Message:


Index: README
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README	21 Mar 2003 18:23:16 -0000	1.5
--- README	26 Jul 2003 19:44:26 -0000	1.6
***************
*** 1,5 ****
  SimData - A library for efficient use of data XML in simulations.
  
! Release 0.4.0
  
  Copyright (C) 2002, 2003 Mark Rose <mr...@st...>
--- 1,5 ----
  SimData - A library for efficient use of data XML in simulations.
  
! Release 0.3.2
  
  Copyright (C) 2002, 2003 Mark Rose <mr...@st...>
***************
*** 22,29 ****
  
  SimData was initially developed under Linux using GCC 2.95 and 3.0.
! Current development occurs mainly under GCC 3.2. The library also
! receives routine testing under MS VC6 and now .NET as part of the Combat
! Simulator Project. If you encounter problems, please report them (with
! patches if possible) to the CSP developer's forum at
  http://csp.sourceforge.net/forum.
  
--- 22,30 ----
  
  SimData was initially developed under Linux using GCC 2.95 and 3.0.
! Current development occurs mainly under GCC 3.2. GCC 3.3 has also been
! tested and will soon become the primary development platform. The
! library also receives routine testing under MS VC6 and now .NET as part
! of the Combat Simulator Project. If you encounter problems, please
! report them (with patches if possible) to the CSP developer's forum at
  http://csp.sourceforge.net/forum.
  
***************
*** 45,122 ****
  If you are using MS VC6 you will also need have at least SP5 installed
  and a functional STL implementation, such as STLport (version 4.5.3 or
! newer).
  
  
  BUILDING: ANNOUNCEMENT
  
! The build process is currently depends on Makefiles (Linux) and VC
! project files (Windows), but will likely transition to Python's
! DistUtils soon.  Stay tuned....
  
  
  BUILDING: LINUX
  
! On Linux, edit the top level Makefile to customize any settings to your
! particular system. The path to the Python headers is an example of a
! parameter you might want to check.
  
  Next, just run make in the top-level directory. If all goes well this
! will create cSimData.py, _cSimData.so, and libSimData.a in the Source
! directory.
  
  
  BUILDING: VC6/.NET
  
! Load SimDataMSVC.dsw and build it in release mode. In the process, it
! should create a new file called cSimData_wrap.cpp (this file name should
! already be in project/Source) from cSimData.i which is parsed by SWIG.
  
  
  TESTING
  
! As a quick test, change to the Source directory and run Python.  
  Try typing "import SimData".  You should see a line similar to 
  "loaded @ 0x4883012".  If not, something went wrong... post to 
  the CSP developer's forum and we can try to find the problem.
  
  
- USING SIMDATA WITH CSPSIM
- 
- The new CSP application called CSPSim relies on SimData in
- two ways.  First, libSimData.a is statically linked to make
- the CSPSim executable.  Second, the simulation data for CSPSim
- needs to be compiled from XML source files to a binary data 
- archive using the data compiler application included with
- SimData.  This Python program is found in the directory
- Tools/DataCompiler.  Once you have built your CSPSim executable,
- go to Tools/DataCompiler and run Compiler.py (from a command
- prompt on windows you would probably need to type something like
- "python Compiler.py").  If the Compiler can't find CSPSim
- initially, it will prompt you to enter a path to CSPSim.  This
- path is saved in a file named .csp_path so you shouldn't have
- to do this more than once.  The Compiler will then print a
- usage message and exit.  To compile the data for CSPSim, you
- must specify the top level data directory to archive, and the
- name of the output archive.  Given the standard location of
- the files in CVS, you would type:
- 
- ./Compiler.py ../../../CSPSim/Data/Sim ../../../CSPSim/Data/Sim.dar
- 
- This will parse all the XML files under CSPSim/Data/Sim and create
- the binary archive (named Sim.dar) needed to run CSPSim.  A
- script named "make_simdar" that runs the above command is provided 
- for your convienience.  This must be rerun whenever you modify
- the XML data files to incorporate the changes into Sim.dar.
- 
- 
- BUILDING on Windows with msvc++6(sp5), stlport-4.5.3 (hints)
- 
- 1) Install python2.2 and swig 1.3.17
- 2) Add python path to your global path
- 3) Load SimDataMSVC.dsw
- 4) Build it in release mode; in process, it should create a new file
- called cSimData_wrap.cpp (this file name should already be in
- project/Source) from cSimData.i which is parsed by swig.
- 5) Testing procedure is same as above:
  As a quick test, change to the Source directory and run Python. Try
  typing "import SimData". You should see a line similar to "loaded @
--- 46,109 ----
  If you are using MS VC6 you will also need have at least SP5 installed
  and a functional STL implementation, such as STLport (version 4.5.3 or
! newer).  Some newer features, such as the LUT lookup table classes
! rely on advanced template constructs that aren't correctly supported
! by VC6, VC7, and older versions of GCC (<3.2).  SimData functions 
! correctly with these compilers as long as the templates are not 
! instantiated.  All current features work with GCC 3.2 and higher, and
! may work with MSVS 2003 (which reportedly comes much closer to the ISO
! C++ standard).
  
  
  BUILDING: ANNOUNCEMENT
  
! There are currently several options for building SimData:
! 
!    * standard Makefiles
!    * MSVS projects files
!    * Python's DistUtis
!    * SCons
! 
! The first two are the most standard ways to build SimData for Linux
! and Windows, respectively.  Distutils is used primarily for 
! installation on both platforms, and is called automatically by 
! make and MSVC.  Distutils can also be used to build the project,
! although this has received much less testing and probably suffers
! from improper dependency tracking.  
! 
! SCons is a brand new approach to the problem and promises to greatly
! simplify and unify the build process. So far the SCons scripts are very
! experimental, and should only be used for testing.  
! 
! Please report any problems building SimData to the forums at
! 
! 		http://csp.sourceforge.net/forum
  
  
  BUILDING: LINUX
  
! On Linux, (optionally) edit the top level Makefile to customize any
! settings to your particular system. In most cases the Makefile should
! set sane defaults.
  
  Next, just run make in the top-level directory. If all goes well this
! will create cSimData.py, _cSimData.so, and libSimData.a in the SimData
! package directory.
  
  
  BUILDING: VC6/.NET
  
! Load SimDataMSVC.dsw and build it in release mode. 
  
  
  TESTING
  
! As a quick test, run Python from the main SimData directory.  
  Try typing "import SimData".  You should see a line similar to 
  "loaded @ 0x4883012".  If not, something went wrong... post to 
  the CSP developer's forum and we can try to find the problem.
+ After you have installed SimData, the same test should work
+ from any starting directory.
  
  
  As a quick test, change to the Source directory and run Python. Try
  typing "import SimData". You should see a line similar to "loaded @
***************
*** 127,162 ****
  INSTALLING AND USING SIMDATA
  
- Note that installation under Windows is not yet supported.  This is
- being worked on, and information will be added here as soon as it is
- available.
- 
- ----------
- 
- 2003-03-20: Edited - work on progress. On windows, you have to
- do:
- 
- > python setup.py make_install_win
- 
- It will install files and folders in python directory (better to be 
- power user or admin for that on xp).
- 
- ----------
- 
- 
- Under Linux, depending on which method you used to build SimData, do
- either:
- 
- 
- $ make install
- 
- or 
- 
- $ python setup.py install
- 
- 
  SimData installs itself as a package in the Python site-packages
  directory. The C++ headers are placed under SimData in the same
  directory as Python.h.
  
  To use the SimData headers for development, just add the usual Python
  include path (e.g. /usr/local/include/python2.2) to your list of include
--- 114,128 ----
  INSTALLING AND USING SIMDATA
  
  SimData installs itself as a package in the Python site-packages
  directory. The C++ headers are placed under SimData in the same
  directory as Python.h.
  
+ Under Linux, run 'make install' as root.  Alternatively, you can
+ accomplish the same thing with 'python setup.py install'.
+ 
+ Under Windows, run 'python setup.py make_install_win'.  Under XP
+ you may need to have sufficient priviledges to write to the Python
+ directories.
+ 
  To use the SimData headers for development, just add the usual Python
  include path (e.g. /usr/local/include/python2.2) to your list of include
***************
*** 164,165 ****
--- 130,132 ----
  
  #include <SimData/Types.h>
+ 

Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TODO	23 Apr 2003 09:14:19 -0000	1.4
--- TODO	26 Jul 2003 19:44:26 -0000	1.5
***************
*** 63,68 ****
        this feature for the time being.
        
-     * More cleanup of the Link<> base classes.
  
-     * Add an OSG Math adapter header.
  
--- 63,66 ----

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** setup.py	22 Jul 2003 18:41:29 -0000	1.25
--- setup.py	26 Jul 2003 19:44:26 -0000	1.26
***************
*** 50,54 ****
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
! VERSION = "\"0.3.2\""
  
  def copy_dir(src, dst, files, verbose=0):
--- 50,54 ----
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
! VERSION = "0.3.2"
  
  def copy_dir(src, dst, files, verbose=0):
***************
*** 349,353 ****
  build_swig_ext.options = "-IInclude -noexcept"
  includes = ["Include"]
! defines = [("SIMDATA_VERSION", VERSION)]
  libraries = ["swigpy", "dl"]
  cflags = []
--- 349,353 ----
  build_swig_ext.options = "-IInclude -noexcept"
  includes = ["Include"]
! defines = [("SIMDATA_VERSION", '"%s"' % VERSION)]
  libraries = ["swigpy", "dl"]
  cflags = []
***************
*** 375,379 ****
        author="Mark Rose",
        author_email="mr...@st...",
!       url="http://csp.sourceforge.net/wiki/",
        packages=['SimData'],
        headers = headers_fullpath + interfaces_fullpath + main_interface_fullpath,
--- 375,380 ----
        author="Mark Rose",
        author_email="mr...@st...",
!       url="http://csp.sourceforge.net/wiki/SimData",
! 	  license="GNU General Public License, version 2 or later.",
        packages=['SimData'],
        headers = headers_fullpath + interfaces_fullpath + main_interface_fullpath,