[cig-commits] r5939 - in short/3D/PyLith/trunk: . applications doc
unittests/pytests/feassemble
leif at geodynamics.org
leif at geodynamics.org
Tue Jan 30 16:44:34 PST 2007
Author: leif
Date: 2007-01-30 16:44:34 -0800 (Tue, 30 Jan 2007)
New Revision: 5939
Added:
short/3D/PyLith/trunk/applications/pylithic.py.in
short/3D/PyLith/trunk/setup.py
Removed:
short/3D/PyLith/trunk/applications/pylithic.py
short/3D/PyLith/trunk/doc/makefile
Modified:
short/3D/PyLith/trunk/
short/3D/PyLith/trunk/Makefile.am
short/3D/PyLith/trunk/applications/Makefile.am
short/3D/PyLith/trunk/configure.ac
short/3D/PyLith/trunk/doc/Makefile.am
short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
Log:
Transitioned PyLith/trunk to the egg-based "CIG Edition" of Pythia.
Also: fixed a build error relating to a .pyxe file; nuked
doc/makefile, because it was in the way.
Property changes on: short/3D/PyLith/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/PyLith/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/Makefile.am 2007-01-31 00:44:34 UTC (rev 5939)
@@ -26,6 +26,12 @@
SUBDIRS += doc
endif
+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: short/3D/PyLith/trunk/applications/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/applications/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/applications/Makefile.am 2007-01-31 00:44:34 UTC (rev 5939)
@@ -10,8 +10,13 @@
# ----------------------------------------------------------------------
#
-dist_bin_SCRIPTS = \
- pylithic.py
+bin_SCRIPTS = pylithic.py
+do_build = sed -e s%[@]PYTHONPATH[@]%$(PYTHONPATH)%g
+pylithic.py: $(srcdir)/pylithic.py.in Makefile
+ $(do_build) < $(srcdir)/pylithic.py.in > $@ || (rm -f $@ && exit 1)
+ chmod +x $@
+EXTRA_DIST = pylithic.py.in
+CLEANFILES = $(bin_SCRIPTS)
# version
# $Id$
Deleted: short/3D/PyLith/trunk/applications/pylithic.py
===================================================================
--- short/3D/PyLith/trunk/applications/pylithic.py 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/applications/pylithic.py 2007-01-31 00:44:34 UTC (rev 5939)
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file applications/pylith.py
-## @brief Python PyLith application driver
-
-from pylith.PyLithApp import PyLithApp
-
-if __name__ == "__main__":
-
- import journal
- journal.info('coordinates').activate()
-
- app = PyLithApp()
- app.run()
-
-
-# End of file
Copied: short/3D/PyLith/trunk/applications/pylithic.py.in (from rev 5938, short/3D/PyLith/trunk/applications/pylithic.py)
===================================================================
--- short/3D/PyLith/trunk/applications/pylithic.py 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/applications/pylithic.py.in 2007-01-31 00:44:34 UTC (rev 5939)
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# <LicenseText>
+#
+# ----------------------------------------------------------------------
+#
+
+## @file applications/pylith.py
+## @brief Python PyLith application driver
+
+__requires__ = "PyLith"
+
+if __name__ == "__main__":
+
+ # re-create the PYTHONPATH at 'configure' time
+ import os.path, sys, site
+ path = '@PYTHONPATH@'.split(':')
+ path.reverse()
+ for directory in path:
+ if directory:
+ directory = os.path.abspath(directory)
+ sys.path.insert(1, directory)
+ site.addsitedir(directory)
+
+ import journal
+ journal.info('coordinates').activate()
+
+ from pylith.PyLithApp import PyLithApp
+
+ app = PyLithApp()
+ app.run()
+
+
+# End of file
Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/configure.ac 2007-01-31 00:44:34 UTC (rev 5939)
@@ -67,10 +67,8 @@
CIT_CHECK_LIB_PETSC
CIT_CHECK_LIB_PETSC_SIEVE
-# Checks for Python modules and packages.
-CIT_PATH_PYTHIA([0.8], [mpi])
-PYTHONPATH="${pyexecdir}${PYTHONPATH:+:${PYTHONPATH}}"; export PYTHONPATH
-AC_SUBST([PYTHONPATH])
+# Check for Python modules and packages.
+CIT_PYTHON_EGG_SETUP
# PYREX/PYREXEMBED
AC_CHECK_PROG([have_pyrex],
Modified: short/3D/PyLith/trunk/doc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/doc/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/doc/Makefile.am 2007-01-31 00:44:34 UTC (rev 5939)
@@ -10,6 +10,17 @@
# ----------------------------------------------------------------------
#
+manual.pdf: manual.xml
+ docbook2pdf manual.xml
+
+view:
+ xpdf manual.pdf&
+
+clean:
+ -rm manual.pdf
+
+.PHONY: view clean
+
# version
# $Id$
Deleted: short/3D/PyLith/trunk/doc/makefile
===================================================================
--- short/3D/PyLith/trunk/doc/makefile 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/doc/makefile 2007-01-31 00:44:34 UTC (rev 5939)
@@ -1,10 +0,0 @@
-manual.pdf: manual.xml
- docbook2pdf manual.xml
-
-view:
- xpdf manual.pdf&
-
-clean:
- -rm manual.pdf
-
-.PHONY: view clean
Added: short/3D/PyLith/trunk/setup.py
===================================================================
--- short/3D/PyLith/trunk/setup.py 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/setup.py 2007-01-31 00:44:34 UTC (rev 5939)
@@ -0,0 +1,26 @@
+
+from archimedes import use_merlin
+use_merlin()
+
+from merlin import setup, find_packages
+
+setup(
+
+ name = 'PyLith',
+ version = '1.0',
+
+ zip_safe = False,
+ packages = find_packages(),
+
+ install_requires = [
+ 'spatialdata',
+ 'pythia[mpi] >= 0.8.1.0, < 0.8.2a',
+ ],
+
+ author = 'Charles A. Williams, Brad Aagaard, and Matt Knepley',
+ 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/pylith/',
+
+)
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am 2007-01-30 23:01:54 UTC (rev 5938)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am 2007-01-31 00:44:34 UTC (rev 5939)
@@ -38,7 +38,9 @@
INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
testfeassemble.pyx testfeassemble_embed.cpp testfeassemble_embed.h: testfeassemble.pyxe
- cp $< . && pyrexembed testfeassemble.pyxe && rm -f testfeassemble.pyxe
+ pyrexembed testfeassemble.pyxe
+testfeassemble.pyxe: $(srcdir)/testfeassemble.pyxe
+ cp $(srcdir)/testfeassemble.pyxe $@
testfeassemble_embed.cpp: testfeassemble_embed.h
testfeassemble_embed.h: testfeassemble.pyx
More information about the cig-commits
mailing list