[cig-commits] r4622 - in mc/3D/CitcomS/trunk: . bin module
module/Exchanger
leif at geodynamics.org
leif at geodynamics.org
Mon Sep 25 18:09:16 PDT 2006
Author: leif
Date: 2006-09-25 18:09:16 -0700 (Mon, 25 Sep 2006)
New Revision: 4622
Added:
mc/3D/CitcomS/trunk/ez_setup.py
mc/3D/CitcomS/trunk/setup.py
Modified:
mc/3D/CitcomS/trunk/bin/Makefile.am
mc/3D/CitcomS/trunk/bin/pycitcoms.cc
mc/3D/CitcomS/trunk/configure.ac
mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am
mc/3D/CitcomS/trunk/module/Makefile.am
Log:
Made 'Exchanger' optional. Give "--with-exchanger=[yes|no]" as an argument
to 'configure' to manually specify whether you want Exchanger; the default
is "auto", which means to use Exchanger if it's installed (and on your
PYTHONPATH).
Egg-ified 'configure' checks for Python packages. This means that CitcomS now
requires the egg-ified CIG version of Pythia -- and (optionally) the egg-ified
Exchanger. Old Pythia/Exchanger installations will not work, as they lack the
egg-metadata ('configure' will act as if they are not installed).
Added 'setup.py', which will automatically download and install the egg
version of Pythia -- as well as the egg system itself ('setuptools'). If
you want Exchanger, you still must install it manually (the way C++ is used
prevents complete egg-ification of Exchanger). Note that 'setup.py' actually
checks-out the latest Pythia from the SVN repository. The release version of
CitcomS will download a packaged Pythia from the website instead.
Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am 2006-09-26 00:39:50 UTC (rev 4621)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am 2006-09-26 01:09:16 UTC (rev 4622)
@@ -28,6 +28,7 @@
bin_SCRIPTS =
abs_top_srcdir = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
abs_builddir = @abs_builddir@
if COND_PYRE
@@ -43,12 +44,22 @@
else
INTERPRETER = $(PYTHON)
noinstINTERPRETER = $(PYTHON)
- noinstPYTHONPATH = $(abs_top_srcdir):$(abs_top_srcdir)/module/.libs:$(abs_top_srcdir)/module/Exchanger/.libs
+ noinstPYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/module/.libs:$(abs_top_builddir)/module/Exchanger/.libs
libCitcomS = $(top_builddir)/lib/libCitcomS.la
endif
+if COND_EXCHANGER
+ MAYBE_EXCHANGER_CPPFLAGS = -DWITH_EXCHANGER
+ MAYBE_EXCHANGER_INCLUDES = -I$(top_srcdir)/module/Exchanger
+ MAYBE_EXCHANGER_LDADD = $(top_builddir)/module/Exchanger/libExchangerLibmodule.a
+else
+ MAYBE_EXCHANGER_CPPFLAGS =
+ MAYBE_EXCHANGER_INCLUDES =
+ MAYBE_EXCHANGER_LDADD =
endif
+endif
+
CC = $(MPICC)
CXX = $(MPICXX)
INCLUDES = \
@@ -58,7 +69,8 @@
if COND_PYRE
INCLUDES += \
-I$(top_srcdir)/module \
- -I$(top_srcdir)/module/Exchanger \
+ $(MAYBE_EXCHANGER_INCLUDES) \
+ $(PYTHON_EGG_CPPFLAGS) \
-I$(PYTHON_INCDIR)
endif
@@ -101,10 +113,11 @@
# pycitcoms (libCitcomS + CitcomSLibmodule + libExchanger +
# ExchangerLibmodule + embedded Python interpreter)
+pycitcoms_CPPFLAGS = $(MAYBE_EXCHANGER_CPPFLAGS)
pycitcoms_SOURCES = pycitcoms.cc
pycitcoms_LDADD = \
$(top_builddir)/module/libPyxMPImodule.a \
- $(top_builddir)/module/Exchanger/libExchangerLibmodule.a \
+ $(MAYBE_EXCHANGER_LDADD) \
$(top_builddir)/module/libCitcomSLibmodule.a \
$(libCitcomS) \
$(LIBHDF5) \
@@ -113,7 +126,7 @@
@rm -f pycitcoms$(EXEEXT)
$(CXXLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
$(pycitcoms_LDFLAGS) $(pycitcoms_OBJECTS) $(pycitcoms_LDADD) \
- -lExchanger -l_mpimodule -ljournal \
+ $(PYTHON_EGG_LDFLAGS) \
$(PYTHON_BLDLIBRARY) \
$(MPILIBS) \
$(FCLIBS) \
Modified: mc/3D/CitcomS/trunk/bin/pycitcoms.cc
===================================================================
--- mc/3D/CitcomS/trunk/bin/pycitcoms.cc 2006-09-26 00:39:50 UTC (rev 4621)
+++ mc/3D/CitcomS/trunk/bin/pycitcoms.cc 2006-09-26 01:09:16 UTC (rev 4622)
@@ -30,13 +30,17 @@
#include <stdio.h>
#include <mpi.h>
#include "CitcomSmodule.h"
+#ifdef WITH_EXCHANGER
#include "Exchangermodule.h"
+#endif
PyMODINIT_FUNC initPyxMPI(void);
struct _inittab inittab[] = {
{ "PyxMPI", initPyxMPI },
+#ifdef WITH_EXCHANGER
{ "ExchangerLib", initExchangerLib },
+#endif
{ "CitcomSLib", initCitcomSLib },
{ 0, 0 }
};
Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac 2006-09-26 00:39:50 UTC (rev 4621)
+++ mc/3D/CitcomS/trunk/configure.ac 2006-09-26 01:09:16 UTC (rev 4622)
@@ -35,11 +35,6 @@
# 'configure' options
AC_ARG_VAR(PYTHON, [Python interpreter])
AC_ARG_VAR(PYTHONPATH, [Python module search path])
-AC_ARG_VAR(MPIRUN, [command to run MPI programs])
-AC_ARG_VAR(BSUB, [command to submit LSF batch jobs])
-AC_ARG_VAR(QSUB, [command to submit PBS batch jobs])
-AC_ARG_VAR(GLOBUSRUN, [command to submit Globus batch jobs])
-AC_ARG_VAR(BATCHTYPE, [default batch system (lsf, pbs, or globus)])
AC_ARG_VAR(PHDF5_HOME, [home path to parallel HDF5 library])
AC_ARG_WITH([pyre],
[AC_HELP_STRING([--with-pyre],
@@ -47,6 +42,11 @@
[want_pyre="$withval"],
[want_pyre=yes])
AM_CONDITIONAL([COND_PYRE], [test "$want_pyre" = yes])
+AC_ARG_WITH([exchanger],
+ [AC_HELP_STRING([--with-exchanger],
+ [use Exchanger @<:@default=auto@:>@])],
+ [want_exchanger="$withval"],
+ [want_exchanger=auto])
AC_ARG_WITH([hdf5],
[AC_HELP_STRING([--with-hdf5],
[enable HDF5 output @<:@default=auto@:>@])],
@@ -59,48 +59,35 @@
[want_embedding=yes])
AM_CONDITIONAL([COND_EMBEDDING], [test "$want_embedding" = yes])
-# Checks for programs.
if test "$want_pyre" = yes; then
+ # Check for Python.
AM_PATH_PYTHON([2.3])
CIT_PYTHON_SYSCONFIG
- AC_PATH_PROG([MPIRUN], [mpirun])
- if test -z "$MPIRUN"; then
- AC_PATH_PROG([MPIRUN], [mpiexec])
- if test -z "$MPIRUN"; then
- AC_MSG_ERROR([program 'mpirun' not found])
- fi
+
+ # Checks for Python modules and packages.
+ CIT_CHECK_PYTHON_EGG([pythia >= 0.8-1.0dev-r4617, < 0.8-2.0a, == dev])
+ if test "$want_exchanger" != no; then
+ CIT_CHECK_PYTHON_EGG([Exchanger >= 1.0, < 2.0a],
+ [ # found
+ if test "$want_exchanger" = auto; then
+ want_exchanger=yes
+ fi
+ ], [ # not found
+ if test "$want_exchanger" = auto; then
+ want_exchanger=no
+ AC_MSG_WARN(['Exchanger' package not found; disabling Exchanger support])
+ else
+ AC_MSG_ERROR(['Exchanger' package not found])
+ fi
+ ])
fi
- AC_PATH_PROG([BSUB], [bsub])
- AC_PATH_PROG([QSUB], [qsub])
- AC_PATH_PROG([GLOBUSRUN], [globusrun])
- if test -z "$BATCHTYPE"; then
- if test -n "$BSUB"; then
- LAUNCHER="lsf"
- elif test -n "$QSUB"; then
- LAUNCHER="pbs"
- elif test -n "$GLOBUSRUN"; then
- LAUNCHER="globus"
- else
- if $MPIRUN --help 2>&1 | grep machinefile >/dev/null; then
- LAUNCHER="mpich"
- elif $MPIRUN --invalid 2>&1 | grep softness >/dev/null; then
- # MPICH2
- LAUNCHER="mpich"
- else
- LAUNCHER="lam-mpi"
- fi
- fi
- test -z "$BSUB" && BSUB="bsub"
- test -z "$QSUB" && QSUB="qsub"
- test -z "$GLOBUSRUN" && GLOBUSRUN="globusrun"
- else
- case "$BATCHTYPE" in
- lsf | pbs | globus) LAUNCHER=$BATCHTYPE ;;
- *) AC_MSG_ERROR([BATCHTYPE=$BATCHTYPE is invalid]) ;;
- esac
- fi
- AC_SUBST([LAUNCHER])
+ CIT_PYTHON_EGG_FLAGS
+else
+ want_exchanger=no
fi
+AM_CONDITIONAL([COND_EXCHANGER], [test "$want_exchanger" = yes])
+
+# Checks for programs.
CIT_PROG_MPICC
CIT_PROG_MPICXX
CC=$MPICC
@@ -111,14 +98,6 @@
fi
AC_PROG_LIBTOOL
-# Checks for Python modules and packages.
-if test "$want_pyre" = yes; then
- PYTHONPATH="${pythondir}:${pyexecdir}${PYTHONPATH:+:${PYTHONPATH}}"; export PYTHONPATH
- CIT_PATH_PYTHIA([0.8], [mpi])
- CIT_PATH_EXCHANGER([1.0])
- AC_SUBST([PYTHONPATH])
-fi
-
# Checks for libraries.
if test "$want_pyre" = yes; then
AC_LANG_PUSH(C++)
@@ -136,7 +115,7 @@
else
CIT_HEADER_MPI
fi
-if test "$want_hdf5" = yes -o "$want_hdf5" = auto; then
+if test "$want_hdf5" != no; then
if test "$PHDF5_HOME"; then
CPPFLAGS="-I$PHDF5_HOME/include $CPPFLAGS"
fi
@@ -144,7 +123,7 @@
if test "$HDF5NOTFOUND"; then
if test "$want_hdf5" = auto; then
want_hdf5=no
- echo Cannot find hdf5.h, disable HDF5 support
+ AC_MSG_WARN([Cannot find hdf5.h, disabling HDF5 support])
else
AC_MSG_ERROR([HDF5 header file "hdf5.h" not found!])
fi
@@ -167,7 +146,7 @@
fi
AC_SUBST(LIBM)
-if test "$want_hdf5" = yes -o "$want_hdf5" = auto; then
+if test "$want_hdf5" != no; then
if test "$PHDF5_HOME"; then
LDFLAGS="-L$PHDF5_HOME/lib $LDFLAGS"
fi
@@ -178,19 +157,19 @@
if test "$HDF5NOTFOUND"; then
if test "$want_hdf5" = auto; then
want_hdf5=no
- echo Cannot find find HDF5 library, disable HDF5 support
+ AC_MSG_WARN([Cannot find HDF5 library, disabling HDF5 support])
else
AC_MSG_ERROR([HDF5 library not found; try setting PHDF5_HOME])
fi
fi
fi
-if test "$want_hdf5" = yes -o "$want_hdf5" = auto; then
+if test "$want_hdf5" != no; then
# Checks for HDF5 parallel-IO function
AC_CHECK_LIB(hdf5, H5Pset_dxpl_mpio, [have_phdf5="yes"], [HDF5NOTFOUND=1])
if test "$HDF5NOTFOUND"; then
if test "$want_hdf5" = auto; then
want_hdf5=no
- echo Cannot find find parallel HDF5 library, disable HDF5 support
+ AC_MSG_WARN([Cannot find parallel HDF5 library, disabling HDF5 support])
else
AC_MSG_ERROR([Need Parallel HDF5; try compiling HDF5 with --enable-parallel])
fi
@@ -214,10 +193,6 @@
visual/Makefile
visual/OpenDXMacro/Makefile])
-if test "$want_pyre" = yes; then
- AC_CONFIG_SUBDIRS([pythia-0.8 Exchanger])
-fi
-
AC_OUTPUT
# report configuration summary
@@ -234,6 +209,7 @@
echo -e "\t LDFLAGS: " $LDFLAGS
echo -e "\t CXXFLAGS: " $CXXFLAGS
echo -e "\t with-pyre: " $want_pyre
+echo -e "\t with-exchanger: " $want_exchanger
echo -e "\t with-hdf5: " $want_hdf5
echo
Added: mc/3D/CitcomS/trunk/ez_setup.py
===================================================================
--- mc/3D/CitcomS/trunk/ez_setup.py 2006-09-26 00:39:50 UTC (rev 4621)
+++ mc/3D/CitcomS/trunk/ez_setup.py 2006-09-26 01:09:16 UTC (rev 4622)
@@ -0,0 +1,222 @@
+#!python
+"""Bootstrap setuptools installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+ from ez_setup import use_setuptools
+ use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import sys
+DEFAULT_VERSION = "0.6c3"
+DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+md5_data = {
+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+ 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+ 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+ 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+ 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+ 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+ 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+ 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+ 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+ 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+}
+
+import sys, os
+
+def _validate_md5(egg_name, data):
+ if egg_name in md5_data:
+ from md5 import md5
+ digest = md5(data).hexdigest()
+ if digest != md5_data[egg_name]:
+ print >>sys.stderr, (
+ "md5 validation of %s failed! (Possible download problem?)"
+ % egg_name
+ )
+ sys.exit(2)
+ return data
+
+
+def use_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ download_delay=15
+):
+ """Automatically find/download setuptools and make it available on sys.path
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end with
+ a '/'). `to_dir` is the directory where setuptools will be downloaded, if
+ it is not already available. If `download_delay` is specified, it should
+ be the number of seconds that will be paused before initiating a download,
+ should one be required. If an older version of setuptools is installed,
+ this routine will print a message to ``sys.stderr`` and raise SystemExit in
+ an attempt to abort the calling script.
+ """
+ try:
+ import setuptools
+ if setuptools.__version__ == '0.0.1':
+ print >>sys.stderr, (
+ "You have an obsolete version of setuptools installed. Please\n"
+ "remove it from your system entirely before rerunning this script."
+ )
+ sys.exit(2)
+ except ImportError:
+ egg = download_setuptools(version, download_base, to_dir, download_delay)
+ sys.path.insert(0, egg)
+ import setuptools; setuptools.bootstrap_install_from = egg
+
+ import pkg_resources
+ try:
+ pkg_resources.require("setuptools>="+version)
+
+ except pkg_resources.VersionConflict, e:
+ # XXX could we install in a subprocess here?
+ print >>sys.stderr, (
+ "The required version of setuptools (>=%s) is not available, and\n"
+ "can't be installed while this script is running. Please install\n"
+ " a more recent version first.\n\n(Currently using %r)"
+ ) % (version, e.args[0])
+ sys.exit(2)
+
+def download_setuptools(
+ version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+ delay = 15
+):
+ """Download setuptools from a specified location and return its filename
+
+ `version` should be a valid setuptools version number that is available
+ as an egg for download under the `download_base` URL (which should end
+ with a '/'). `to_dir` is the directory where the egg will be downloaded.
+ `delay` is the number of seconds to pause before an actual download attempt.
+ """
+ import urllib2, shutil
+ egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
+ url = download_base + egg_name
+ saveto = os.path.join(to_dir, egg_name)
+ src = dst = None
+ if not os.path.exists(saveto): # Avoid repeated downloads
+ try:
+ from distutils import log
+ if delay:
+ log.warn("""
+---------------------------------------------------------------------------
+This script requires setuptools version %s to run (even to display
+help). I will attempt to download it for you (from
+%s), but
+you may need to enable firewall access for this script first.
+I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+ %s
+
+and place it in this directory before rerunning this script.)
+---------------------------------------------------------------------------""",
+ version, download_base, delay, url
+ ); from time import sleep; sleep(delay)
+ log.warn("Downloading %s", url)
+ src = urllib2.urlopen(url)
+ # Read/write all in one block, so we don't create a corrupt file
+ # if the download is interrupted.
+ data = _validate_md5(egg_name, src.read())
+ dst = open(saveto,"wb"); dst.write(data)
+ finally:
+ if src: src.close()
+ if dst: dst.close()
+ return os.path.realpath(saveto)
+
+def main(argv, version=DEFAULT_VERSION):
+ """Install or upgrade setuptools and EasyInstall"""
+
+ try:
+ import setuptools
+ except ImportError:
+ egg = None
+ try:
+ egg = download_setuptools(version, delay=0)
+ sys.path.insert(0,egg)
+ from setuptools.command.easy_install import main
+ return main(list(argv)+[egg]) # we're done here
+ finally:
+ if egg and os.path.exists(egg):
+ os.unlink(egg)
+ else:
+ if setuptools.__version__ == '0.0.1':
+ # tell the user to uninstall obsolete version
+ use_setuptools(version)
+
+ req = "setuptools>="+version
+ import pkg_resources
+ try:
+ pkg_resources.require(req)
+ except pkg_resources.VersionConflict:
+ try:
+ from setuptools.command.easy_install import main
+ except ImportError:
+ from easy_install import main
+ main(list(argv)+[download_setuptools(delay=0)])
+ sys.exit(0) # try to force an exit
+ else:
+ if argv:
+ from setuptools.command.easy_install import main
+ main(argv)
+ else:
+ print "Setuptools version",version,"or greater has been installed."
+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+
+
+
+def update_md5(filenames):
+ """Update our built-in md5 registry"""
+
+ import re
+ from md5 import md5
+
+ for name in filenames:
+ base = os.path.basename(name)
+ f = open(name,'rb')
+ md5_data[base] = md5(f.read()).hexdigest()
+ f.close()
+
+ data = [" %r: %r,\n" % it for it in md5_data.items()]
+ data.sort()
+ repl = "".join(data)
+
+ import inspect
+ srcfile = inspect.getsourcefile(sys.modules[__name__])
+ f = open(srcfile, 'rb'); src = f.read(); f.close()
+
+ match = re.search("\nmd5_data = {\n([^}]+)}", src)
+ if not match:
+ print >>sys.stderr, "Internal error!"
+ sys.exit(2)
+
+ src = src[:match.start(1)] + repl + src[match.end(1):]
+ f = open(srcfile,'w')
+ f.write(src)
+ f.close()
+
+
+if __name__=='__main__':
+ if len(sys.argv)>2 and sys.argv[1]=='--md5update':
+ update_md5(sys.argv[2:])
+ else:
+ main(sys.argv[1:])
+
+
+
+
+
Modified: mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am 2006-09-26 00:39:50 UTC (rev 4621)
+++ mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am 2006-09-26 01:09:16 UTC (rev 4622)
@@ -42,14 +42,14 @@
ExchangerLibmodule_la_LDFLAGS = -module -release $(VERSION)
ExchangerLibmodule_la_LIBADD = \
$(top_builddir)/lib/libCitcomS.la \
- -lExchanger \
- -l_mpimodule -ljournal
+ $(PYTHON_EGG_LDFLAGS)
ExchangerLibmodule_la_SOURCES = $(sources)
CXX = $(MPICXX)
CXXLD = @CXX@
INCLUDES = \
-I$(top_srcdir)/lib \
+ $(PYTHON_EGG_CPPFLAGS) \
-I$(PYTHON_INCDIR) \
$(MPIINCLUDES)
Modified: mc/3D/CitcomS/trunk/module/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Makefile.am 2006-09-26 00:39:50 UTC (rev 4621)
+++ mc/3D/CitcomS/trunk/module/Makefile.am 2006-09-26 01:09:16 UTC (rev 4622)
@@ -23,7 +23,10 @@
# $Id$
-SUBDIRS = Exchanger
+if COND_EXCHANGER
+ MAYBE_EXCHANGER = Exchanger
+endif
+SUBDIRS = $(MAYBE_EXCHANGER)
noinst_LIBRARIES =
pyexec_LTLIBRARIES =
@@ -53,7 +56,8 @@
CitcomSLibmodule_la_LDFLAGS = -module -release $(VERSION)
CitcomSLibmodule_la_LIBADD = \
$(top_builddir)/lib/libCitcomS.la \
- -l_mpimodule -ljournal $(MPILIBS)
+ $(PYTHON_EGG_LDFLAGS) \
+ $(MPILIBS)
CitcomSLibmodule_la_SOURCES = $(sources)
PyxMPImodule_la_LDFLAGS = -module -release $(VERSION)
@@ -67,6 +71,7 @@
INCLUDES = \
-I$(top_srcdir)/module/Regional \
-I$(top_srcdir)/lib \
+ $(PYTHON_EGG_CPPFLAGS) \
-I$(PYTHON_INCDIR) \
$(MPIINCLUDES)
Added: mc/3D/CitcomS/trunk/setup.py
===================================================================
--- mc/3D/CitcomS/trunk/setup.py 2006-09-26 00:39:50 UTC (rev 4621)
+++ mc/3D/CitcomS/trunk/setup.py 2006-09-26 01:09:16 UTC (rev 4622)
@@ -0,0 +1,27 @@
+
+# This is not a normal 'setup.py' script; it is provided as a
+# convenience to install Python packages required by CitcomS. For
+# instructions on installing CitcomS itself, see the file INSTALL.
+
+from ez_setup import use_setuptools
+use_setuptools()
+
+import setuptools
+import sys
+
+requirements = []
+
+if setuptools.bootstrap_install_from:
+ requirements.append(setuptools.bootstrap_install_from)
+ setuptools.bootstrap_install_from = None
+
+requirements.append('pythia >= 0.8-1.0dev-r4617, < 0.8-2.0a, == dev')
+
+setuptools.setup(
+ script_args = (
+ ['easy_install',
+ '--find-links=svn://geodynamics.org/cig/cs/pythia/trunk#egg=pythia-dev'] +
+ sys.argv[1:] +
+ requirements
+ )
+)
More information about the cig-commits
mailing list