[cig-commits] r5954 - in cs/spatialdata-0.1/trunk: libsrc libsrc/geocoords libsrc/spatialdb libsrc/utils modulesrc/geocoords modulesrc/spatialdb modulesrc/spatialdb/generator modulesrc/utils spatialdata/geocoords spatialdata/spatialdb spatialdata/utils tests/libtests/geocoords tests/libtests/spatialdb tests/libtests/utils

Fri Feb 2 13:21:04 PST 2007

Author: brad
Date: 2007-02-02 13:21:04 -0800 (Fri, 02 Feb 2007)
New Revision: 5954

Modified:
   cs/spatialdata-0.1/trunk/libsrc/Makefile.am
   cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am
   cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/spatialdb/generator/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
   cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py
   cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py
   cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py
   cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py
   cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py
   cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am
   cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am
Log:
Combined libraries into one library. Updated Python tests to use pythia egg.

Modified: cs/spatialdata-0.1/trunk/libsrc/Makefile.am
===================================================================

--- cs/spatialdata-0.1/trunk/libsrc/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/libsrc/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -15,7 +15,34 @@
 	spatialdb \
 	utils
 
-# version
-# $Id$
+lib_LTLIBRARIES = libspatialdata.la
 
+libspatialdata_la_SOURCES = \
+	utils/PointsStream.cc \
+	geocoords/Converter.cc \
+	geocoords/CoordSys.cc \
+	geocoords/CSCart.cc \
+	geocoords/CSGeo.cc \
+	geocoords/CSGeoLocalCart.cc \
+	geocoords/CSGeoProj.cc \
+	geocoords/CSPicklerAscii.cc \
+	geocoords/Geoid.cc \
+	geocoords/Projector.cc \
+	spatialdb/SimpleDB.cc \
+	spatialdb/SpatialDB.cc \
+	spatialdb/SimpleDBQuery.cc \
+	spatialdb/SimpleIO.cc \
+	spatialdb/SimpleIOAscii.cc \
+	spatialdb/cspatialdb.cc	
+
+libspatialdata_la_LDFLAGS =
+
+CPPFLAGS += -DDATADIR="$(pkgdatadir)/geocoords"
+
+INCLUDES = -I$(top_builddir)/include
+
+libspatialdata_la_LIBADD = \
+	-lproj
+
+
 # End of file 

Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -15,28 +15,6 @@
 
 SUBDIRS = data
 
-lib_LTLIBRARIES = libspatialdatageocoords.la
-
-libspatialdatageocoords_la_SOURCES = \
-	Converter.cc \
-	CoordSys.cc \
-	CSCart.cc \
-	CSGeo.cc \
-	CSGeoLocalCart.cc \
-	CSGeoProj.cc \
-	CSPicklerAscii.cc \
-	Geoid.cc \
-	Projector.cc
-
-libspatialdatageocoords_la_LDFLAGS =
-
-INCLUDES +=
-
-CPPFLAGS += -DDATADIR="$(subpkgdatadir)"
-
-libspatialdatageocoords_la_LIBADD = \
-	-lproj
-
 subpkginclude_HEADERS = \
 	Converter.hh \
 	CoordSys.hh \
@@ -63,7 +41,4 @@
 BUILT_SOURCES = export-subpkgincludeHEADERS
 CLEANFILES = export-subpkgincludeHEADERS
 
-# version
-# $Id$
-
 # End of file 

Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,23 +13,6 @@
 subpackage = spatialdb
 include $(top_srcdir)/subpackage.am
 
-lib_LTLIBRARIES = libspatialdataspatialdb.la
-
-libspatialdataspatialdb_la_SOURCES = \
-	SimpleDB.cc \
-	SpatialDB.cc \
-	SimpleDBQuery.cc \
-	SimpleIO.cc \
-	SimpleIOAscii.cc \
-	cspatialdb.cc
-
-libspatialdataspatialdb_la_LDFLAGS =
-
-INCLUDES +=
-
-libspatialdataspatialdb_la_LIBADD = \
-	$(top_builddir)/libsrc/geocoords/libspatialdatageocoords.la
-
 subpkginclude_HEADERS = \
 	Exception.hh \
 	Exception.icc \
@@ -53,7 +36,5 @@
 BUILT_SOURCES = export-subpkgincludeHEADERS
 CLEANFILES = export-subpkgincludeHEADERS
 
-# version
-# $Id$
 
 # End of file 

Modified: cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,13 +13,6 @@
 subpackage = utils
 include $(top_srcdir)/subpackage.am
 
-lib_LTLIBRARIES = libspatialdatautils.la
-
-libspatialdatautils_la_SOURCES = \
-	PointsStream.cc
-
-libspatialdatautils_la_LDFLAGS =
-
 subpkginclude_HEADERS = \
 	PointsStream.hh \
 	PointsStream.icc
@@ -31,7 +24,4 @@
 BUILT_SOURCES = export-subpkgincludeHEADERS
 CLEANFILES = export-subpkgincludeHEADERS
 
-# version
-# $Id$
-
 # End of file 

Modified: cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -23,7 +23,7 @@
 	geocoords.c geocoords_embed.cpp geocoords_embed.h
 
 geocoordsmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/geocoords/libspatialdatageocoords.la
+	$(top_builddir)/libsrc/libspatialdata.la
 
 INCLUDES += -I$(PYTHON_INCDIR)
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -25,7 +25,7 @@
 	spatialdb.c spatialdb_embed.cpp spatialdb_embed.h
 
 spatialdbmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/spatialdb/libspatialdataspatialdb.la
+	$(top_builddir)/libsrc/libspatialdata.la
 
 INCLUDES += -I$(PYTHON_INCDIR)
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/generator/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/generator/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/generator/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -23,7 +23,7 @@
 	generator.c generator_embed.cpp generator_embed.h
 
 generatormodule_la_LIBADD = \
-	$(top_builddir)/libsrc/spatialdb/libspatialdataspatialdb.la
+	$(top_builddir)/libsrc/libspatialdata.la
 
 INCLUDES += -I$(PYTHON_INCDIR)
 

Modified: cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -31,7 +31,7 @@
 nodist_utilsmodule_la_SOURCES = \
 	utils.c utils_embed.cpp utils_embed.h
 utilsmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/utils/libspatialdatautils.la
+	$(top_builddir)/libsrc/libspatialdata.la
 
 # simple array targets
 simplearray.pyx simplearray_embed.cpp  simplearray_embed.h: simplearray.pyxe

Modified: cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,6 +13,9 @@
 ## @file spatialdata/geocoords/CoordSys.py
 ## @brief Python manager for coordinate systems.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 # CoordSys class

Modified: cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,6 +13,9 @@
 ## @file spatialdata/geocoords/Projector.py
 ## @brief Python manager for projector.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 # Projector class

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,6 +13,9 @@
 ## @file spatialdata/spatialdb/SimpleIO.py
 ## @brief Python I/O manager for simple spatial database (SimpleDB).
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 # SimpleIO class

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,6 +13,9 @@
 ## @file spatialdata/spatialdb/SpatialDB.py
 ## @brief Python abstract base class for spatial database.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 import spatialdb as bindings

Modified: cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,6 +13,9 @@
 ## @file spatialdata/utils/ChangeCoordSys.py
 ## @brief Python object for changing coordinate system of points.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 # ChangeCoordSys class

Modified: cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py	2007-02-02 21:21:04 UTC (rev 5954)
@@ -21,6 +21,9 @@
 ## data, so data is private and object needs a constructor and
 ## destructor. Otherwise, object just has public data and no methods.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 import string

Modified: cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py	2007-02-02 21:21:04 UTC (rev 5954)
@@ -13,6 +13,9 @@
 ## @file spatialdata/utils/PointsStream.py
 ## @brief Python object for reading/writing points from stdin/stdout.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 # PointsStream class

Modified: cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -47,7 +47,7 @@
 testgeocoords_LDADD = \
 	-lcppunit -ldl \
 	-lproj \
-	$(top_builddir)/libsrc/geocoords/libspatialdatageocoords.la
+	$(top_builddir)/libsrc/libspatialdata.la
 
 # version
 # $Id$

Modified: cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -51,8 +51,7 @@
 
 testspatial_LDADD = \
 	-lcppunit -ldl \
-	$(top_builddir)/libsrc/spatialdb/libspatialdataspatialdb.la \
-	$(top_builddir)/libsrc/geocoords/libspatialdatageocoords.la
+	$(top_builddir)/libsrc/libspatialdata.la 
 
 
 # Source files associated with testing data

Modified: cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am	2007-02-02 20:32:09 UTC (rev 5953)
+++ cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
@@ -30,7 +30,7 @@
 
 testutils_LDADD = \
 	-lcppunit -ldl \
-	$(top_builddir)/libsrc/utils/libspatialdatautils.la
+	$(top_builddir)/libsrc/libspatialdata.la
 
 # version
 # $Id$

