[cig-commits] r7978 - in short/3D/lithomop/trunk: . lithomop3d
lithomop3d/applications lithomop3d/module
leif at geodynamics.org
leif at geodynamics.org
Mon Sep 17 13:39:19 PDT 2007
Author: leif
Date: 2007-09-17 13:39:19 -0700 (Mon, 17 Sep 2007)
New Revision: 7978
Added:
short/3D/lithomop/trunk/setup.py
Modified:
short/3D/lithomop/trunk/
short/3D/lithomop/trunk/Makefile.am
short/3D/lithomop/trunk/configure.ac
short/3D/lithomop/trunk/lithomop3d/Makefile.am
short/3D/lithomop/trunk/lithomop3d/applications/lithomop3dapp.py
short/3D/lithomop/trunk/lithomop3d/module/Makefile.am
Log:
Updated the build system.
Property changes on: short/3D/lithomop/trunk
___________________________________________________________________
Name: svn:externals
- m4 http://geodynamics.org/svn/cig/cs/autoconf/trunk
+ m4 http://geodynamics.org/svn/cig/cs/autoconf/trunk
archimedes http://geodynamics.org/svn/cig/cs/merlin/branches/v1/merlin/archimedes
Modified: short/3D/lithomop/trunk/Makefile.am
===================================================================
--- short/3D/lithomop/trunk/Makefile.am 2007-09-17 20:31:07 UTC (rev 7977)
+++ short/3D/lithomop/trunk/Makefile.am 2007-09-17 20:39:19 UTC (rev 7978)
@@ -5,4 +5,14 @@
SUBDIRS = lithomop3d
+EXTRA_DIST = \
+ setup.py \
+ archimedes/__init__.py
+
+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)
+
## end of Makefile.am
Modified: short/3D/lithomop/trunk/configure.ac
===================================================================
--- short/3D/lithomop/trunk/configure.ac 2007-09-17 20:31:07 UTC (rev 7977)
+++ short/3D/lithomop/trunk/configure.ac 2007-09-17 20:39:19 UTC (rev 7978)
@@ -3,7 +3,7 @@
# $Id: configure.ac,v 1.1 2005/08/24 22:45:51 leif Exp $
AC_PREREQ(2.59)
-AC_INIT([Lithomop3d], [0.7.2], [cig-short at geodynamics.org])
+AC_INIT([Lithomop3d], [0.7.3], [cig-short at geodynamics.org])
AC_CONFIG_AUX_DIR([./aux-config])
AC_CONFIG_SRCDIR([lithomop3d/applications/lithomop3dapp.py])
AC_CONFIG_HEADER([portinfo])
@@ -20,20 +20,27 @@
[want_embedding=yes])
AM_CONDITIONAL([COND_EMBEDDING], [test "$want_embedding" = yes])
-# Checks for programs.
+# Check for Python.
AM_PATH_PYTHON([2.3])
CIT_PYTHON_SYSCONFIG
-CIT_PATH_PETSC([2.3])
+
+# Check for Python modules and packages.
+CIT_PYTHON_EGG_SETUP
+
+# Check for PETSc.
+CIT_PATH_PETSC([2.3.3])
CC=$PETSC_CC
-AC_PROG_CXX
if test -z "$FC"; then
- AC_CHECK_PROG(FC, $PETSC_FC, $PETSC_FC)
+ AC_PATH_PROG(FC, $PETSC_FC, $PETSC_FC)
test -z "$FC" && AC_MSG_FAILURE([Fortran compiler $PETSC_FC (used to configure PETSc) not found in \$PATH])
else
want_FC=$FC; unset FC
- AC_CHECK_PROG(FC, $want_FC, $want_FC)
+ AC_PATH_PROG(FC, $want_FC, $want_FC)
test -z "$FC" && AC_MSG_FAILURE([Fortran compiler $want_FC not found in \$PATH])
fi
+
+# Checks for programs.
+AC_PROG_CXX
AC_PROG_FC
F77=$FC
FFLAGS=$FCFLAGS
@@ -41,11 +48,6 @@
AC_FC_WRAPPERS
AC_PROG_LIBTOOL
-# Checks for Python modules and packages.
-CIT_PATH_PYTHIA([0.8])
-PYTHONPATH="${pyexecdir}${PYTHONPATH:+:${PYTHONPATH}}"; export PYTHONPATH
-AC_SUBST([PYTHONPATH])
-
# Set the language for the PETSc tests.
AC_LANG(C++)
Modified: short/3D/lithomop/trunk/lithomop3d/Makefile.am
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/Makefile.am 2007-09-17 20:31:07 UTC (rev 7977)
+++ short/3D/lithomop/trunk/lithomop3d/Makefile.am 2007-09-17 20:39:19 UTC (rev 7978)
@@ -37,9 +37,9 @@
$(CXXLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
$(pylithomop3d_LDFLAGS) $(pylithomop3d_OBJECTS) $(pylithomop3d_LDADD) \
$(PYTHON_BLDLIBRARY) \
+ $(PYTHON_EGG_LDFLAGS) \
$(PETSC_FORTRAN_LIB) $(PETSC_LIB) $(PETSC_CXX_LIB) \
$(FCLIBS) \
- -ljournal \
$(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
$(LIBS) \
$(PYTHON_LDLAST)
Modified: short/3D/lithomop/trunk/lithomop3d/applications/lithomop3dapp.py
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/applications/lithomop3dapp.py 2007-09-17 20:31:07 UTC (rev 7977)
+++ short/3D/lithomop/trunk/lithomop3d/applications/lithomop3dapp.py 2007-09-17 20:39:19 UTC (rev 7978)
@@ -35,12 +35,14 @@
if __name__ == "__main__":
# re-create the PYTHONPATH at 'configure' time
- import sys
+ import os.path, sys, site
path = '@PYTHONPATH@'.split(':')
path.reverse()
- for dir in path:
- if dir:
- sys.path.insert(1, dir)
+ for directory in path:
+ if directory:
+ directory = os.path.abspath(directory)
+ sys.path.insert(1, directory)
+ site.addsitedir(directory)
# if we are embedding, insert the extension module in the
# 'lithomop3d' package
Modified: short/3D/lithomop/trunk/lithomop3d/module/Makefile.am
===================================================================
--- short/3D/lithomop/trunk/lithomop3d/module/Makefile.am 2007-09-17 20:31:07 UTC (rev 7977)
+++ short/3D/lithomop/trunk/lithomop3d/module/Makefile.am 2007-09-17 20:39:19 UTC (rev 7978)
@@ -21,6 +21,7 @@
lithomop3dmodule_la_LDFLAGS = -module
lithomop3dmodule_la_LIBADD = \
$(top_builddir)/lithomop3d/liblithomop3d/liblithomop3d.la \
+ $(PYTHON_EGG_LDFLAGS) \
$(PETSC_FORTRAN_LIB) \
$(PETSC_LIB) \
$(PETSC_CXX_LIB) \
@@ -28,6 +29,8 @@
-ljournal
INCLUDES = $(PETSC_INCLUDE) $(PETSC_CXX_INCLUDE) -I$(PYTHON_INCDIR)
+AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS)
+
sources = \
array.cc \
array.h \
Added: short/3D/lithomop/trunk/setup.py
===================================================================
--- short/3D/lithomop/trunk/setup.py 2007-09-17 20:31:07 UTC (rev 7977)
+++ short/3D/lithomop/trunk/setup.py 2007-09-17 20:39:19 UTC (rev 7978)
@@ -0,0 +1,26 @@
+
+from archimedes import use_merlin
+use_merlin()
+
+from merlin import setup, find_packages
+
+setup(
+
+ name = 'lithomop',
+ version = '0.7.3',
+
+ zip_safe = False,
+ package_dir = { "":"lithomop3d" },
+ packages = find_packages("lithomop3d"),
+
+ install_requires = [
+ 'pythia[mpi] >= 0.8.1.3, < 0.8.2a',
+ ],
+
+ author = 'Charles A. Williams',
+ author_email = 'cig-short at geodynamics.org',
+ description = """A finite element code for the solution of visco-elastic/plastic deformation that was designed for lithospheric modeling problems.""",
+ license = 'other',
+ url = 'http://www.geodynamics.org/cig/software/packages/short/lithomop/',
+
+)
More information about the cig-commits
mailing list