[cig-commits] r5938 - in cs/spatialdata-0.1/trunk: .
modulesrc/geocoords modulesrc/spatialdb
modulesrc/spatialdb/generator modulesrc/utils
leif at geodynamics.org
leif at geodynamics.org
Tue Jan 30 15:01:54 PST 2007
Author: leif
Date: 2007-01-30 15:01:54 -0800 (Tue, 30 Jan 2007)
New Revision: 5938
Added:
cs/spatialdata-0.1/trunk/setup.py
Modified:
cs/spatialdata-0.1/trunk/
cs/spatialdata-0.1/trunk/Makefile.am
cs/spatialdata-0.1/trunk/configure.ac
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
Log:
Transitioned spatialdata to the egg-based "CIG Edition" of Pythia.
Also fixed build errors relating to .pyxe files.
Property changes on: cs/spatialdata-0.1/trunk
___________________________________________________________________
Name: svn:externals
+ m4 http://geodynamics.org/svn/cig/cs/autoconf/trunk
archimedes http://geodynamics.org/svn/cig/cs/merlin/branches/v1/merlin/archimedes
Modified: cs/spatialdata-0.1/trunk/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/Makefile.am 2007-01-30 21:32:04 UTC (rev 5937)
+++ cs/spatialdata-0.1/trunk/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
@@ -10,6 +10,8 @@
# ----------------------------------------------------------------------
#
+ACLOCAL_AMFLAGS = -I ./m4
+
SUBDIRS = \
libsrc
@@ -32,6 +34,12 @@
CPPFLAGS="-I${PROJ4_INCDIR} -I${CPPUNIT_INCDIR} -I${PYTHIA_INCDIR} -I${CIG_INCDIR}" \
LDFLAGS="-L${PROJ4_LIBDIR} -L${CPPUNIT_LIBDIR} -L${CIG_LIBDIR}"
+install-data-hook:
+ top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
+ cd $(top_srcdir) && \
+ $(PYTHON) setup.py install_deps -H None -f $$top_builddir/deps --prefix=$(prefix) && \
+ $(PYTHON) setup.py egg_info -e $(pythondir)
+
# version
# $Id$
Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac 2007-01-30 21:32:04 UTC (rev 5937)
+++ cs/spatialdata-0.1/trunk/configure.ac 2007-01-30 23:01:54 UTC (rev 5938)
@@ -51,11 +51,7 @@
# ----------------------------------------------------------------------
# PYTHON
-AC_CACHE_CHECK([for $am_display_PYTHON include directory],
- [PYTHON_INCDIR],
- [PYTHON_INCDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null ||
- echo "$PYTHON_PREFIX/include/python$PYTHON_VERSION"`])
-AC_SUBST([PYTHON_INCDIR], [$PYTHON_INCDIR])
+CIT_PYTHON_INCDIR
# PROJ4
AC_CHECK_LIB(proj, pj_init_plus, [
@@ -89,20 +85,8 @@
if test "$enable_pythia" = "yes" ; then
AC_LANG(C++)
- # PYTHIA
- AC_CHECK_HEADER([journal/debug.h], [], [
- AC_MSG_ERROR([Journal header not found; try CPPFLAGS="-I<pythia include dir>"])
- ])
- AC_MSG_CHECKING([for journal::debug_t in -ljournal])
- AC_REQUIRE_CPP
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#include <journal/debug.h>]],
- [[journal::debug_t d("debug");]])],
- [AC_MSG_RESULT(yes)
- export CPPFLAGS="-DHAVE_PYTHIA $CPPFLAGS"],
- [AC_MSG_RESULT(no)
- AC_MSG_ERROR([Pythia library not found; try LDFLAGS="-L<pythia lib dir>"])
- ])
+ # Check for Python modules and packages.
+ CIT_PYTHON_EGG_SETUP
# PYREX/PYREXEMBED
AC_CHECK_PROG([have_pyrex],
Modified: cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am 2007-01-30 21:32:04 UTC (rev 5937)
+++ cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
@@ -28,7 +28,9 @@
INCLUDES += -I$(PYTHON_INCDIR)
geocoords.pyx geocoords_embed.cpp geocoords_embed.h: geocoords.pyxe
- cp $< . && pyrexembed geocoords.pyxe && rm -f geocoords.pyxe
+ pyrexembed geocoords.pyxe
+geocoords.pyxe: $(srcdir)/geocoords.pyxe
+ cp $(srcdir)/geocoords.pyxe $@
geocoords_embed.cpp: geocoords_embed.h
geocoords_embed.h: geocoords.pyx
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am 2007-01-30 21:32:04 UTC (rev 5937)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
@@ -30,7 +30,9 @@
INCLUDES += -I$(PYTHON_INCDIR)
spatialdb.pyx spatialdb_embed.cpp spatialdb_embed.h: spatialdb.pyxe
- cp $< . && pyrexembed spatialdb.pyxe && rm -f spatialdb.pyxe
+ pyrexembed spatialdb.pyxe
+spacialdb.pyxe: $(srcdir)/spacialdb.pyxe
+ cp $(srcdir)/spacialdb.pyxe $@
spatialdb_embed.cpp: spatialdb_embed.h
spatialdb_embed.h: spatialdb.pyx
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/generator/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/generator/Makefile.am 2007-01-30 21:32:04 UTC (rev 5937)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/generator/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
@@ -28,7 +28,9 @@
INCLUDES += -I$(PYTHON_INCDIR)
generator.pyx generator_embed.cpp generator_embed.h: generator.pyxe
- cp $< . && pyrexembed generator.pyxe && rm -f generator.pyxe
+ pyrexembed generator.pyxe
+generator.pyxe: $(srcdir)/generator.pyxe
+ cp $(srcdir)/generator.pyxe $@
generator_embed.cpp: generator_embed.h
generator_embed.h: generator.pyx
Modified: cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am 2007-01-30 21:32:04 UTC (rev 5937)
+++ cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
@@ -35,13 +35,17 @@
# simple array targets
simplearray.pyx simplearray_embed.cpp simplearray_embed.h: simplearray.pyxe
- cp $< . && pyrexembed simplearray.pyxe && rm -f simplearray.pyxe
+ pyrexembed simplearray.pyxe
+simplearray.pyxe: $(srcdir)/simplearray.pyxe
+ cp $(srcdir)/simplearray.pyxe $@
simplearray_embed.cpp: simplearray_embed.h
simplearray_embed.h: simplearray.pyx
# utils targets
utils.pyx utils_embed.cpp utils_embed.h: utils.pyxe
- cp $< . && pyrexembed utils.pyxe && rm -f utils.pyxe
+ pyrexembed utils.pyxe
+utils.pyxe: $(srcdir)/utils.pyxe
+ cp $(srcdir)/utils.pyxe $@
utils_embed.cpp: utils_embed.h
utils_embed.h: utils.pyx
Added: cs/spatialdata-0.1/trunk/setup.py
===================================================================
--- cs/spatialdata-0.1/trunk/setup.py 2007-01-30 21:32:04 UTC (rev 5937)
+++ cs/spatialdata-0.1/trunk/setup.py 2007-01-30 23:01:54 UTC (rev 5938)
@@ -0,0 +1,25 @@
+
+from archimedes import use_merlin
+use_merlin()
+
+from merlin import setup, find_packages
+
+setup(
+
+ name = 'spatialdata',
+ version = '0.3.0',
+
+ zip_safe = False,
+ packages = find_packages(),
+
+ install_requires = [
+ 'pythia[mpi] >= 0.8.1.0, < 0.8.2a',
+ ],
+
+ author = 'Brad T. Aagaard',
+ author_email = 'baagaard at usgs.gov',
+ description = """""",
+ license = 'other',
+ url = 'http://www.geodynamics.org/',
+
+)
More information about the cig-commits
mailing list