[cig-commits] r18537 - short/3D/PyLith/pylith_installer/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-06-03 15:47:27 -0700 (Fri, 03 Jun 2011)
New Revision: 18537

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Added manual installtion of pythia from tarball.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-06-03 21:59:50 UTC (rev 18536)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-06-03 22:47:27 UTC (rev 18537)
@@ -46,14 +46,15 @@
 SCIENTIFICPYTHON_VER=2.9.1
 FIAT_VER=0.9.9
 
+PYTHIA_VER=0.8.1.12
 NEMESIS_VER=1.0.2
 
 if USE_PYLITH_SVN
 SPATIALDATA_VER=dev
 PYLITH_VER=dev
 else
-SPATIALDATA_VER=0.6.0
-PYLITH_VER=1.5.2
+SPATIALDATA_VER=0.7.0
+PYLITH_VER=1.6.0
 endif
 
 
@@ -83,6 +84,7 @@
 	installed_netcdf \
 	installed_hdf5 \
 	installed_fiat \
+	installed_pythia \
 	installed_nemesis \
 	installed_spatialdata \
 	installed_petsc \
@@ -115,6 +117,7 @@
 	netcdf-$(NETCDF_VER) \
 	hdf5-$(HDF5_VER) \
 	spatialdata-$(SPATIALDATA_VER) \
+	pythia-$(PYTHIA_VER) \
 	nemesis-$(NEMESIS_VER) \
 	pylith-$(PYLITH_VER)
 
@@ -493,9 +496,27 @@
 
 
 # ----------------------------------------------------------------------
+# pythia
+# ----------------------------------------------------------------------
+pythia: installed_python
+if INSTALL_PYTHIA
+	$(FETCH_SCRIPT) "$(downloader)" pythia-$(PYTHIA_VER).tar.gz http://www.geodynamics.org/cig/software/pythia
+	$(TAR) -zxvf pythia-$(PYTHIA_VER).tar.gz
+	cd pythia-$(PYTHIA_VER) && $(PYTHON) setup.py install --prefix=$(prefix)
+
+else
+	@echo "$@ already installed. Skipping installation."
+endif
+
+installed_pythia:
+	$(MAKE) $(AM_MAKEFLAGS) pythia
+	touch $@
+
+
+# ----------------------------------------------------------------------
 # nemesis
 # ----------------------------------------------------------------------
-nemesis: installed_mpi installed_python
+nemesis: installed_mpi installed_python installed_pythia
 if INSTALL_NEMESIS
 	$(FETCH_SCRIPT) "$(downloader)" nemesis-$(NEMESIS_VER).tar.gz http://www.geodynamics.org/cig/software/pythia
 	$(TAR) -zxvf nemesis-$(NEMESIS_VER).tar.gz
@@ -518,7 +539,7 @@
 # ----------------------------------------------------------------------
 # spatialdata
 # ----------------------------------------------------------------------
-spatialdata: installed_numpy installed_proj4 installed_swig installed_cppunit
+spatialdata: installed_numpy installed_pythia installed_proj4 installed_swig installed_cppunit
 if INSTALL_SPATIALDATA
 spatialdata_options = 
 if WITH_TESTING

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-06-03 21:59:50 UTC (rev 18536)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-06-03 22:47:27 UTC (rev 18537)
@@ -162,6 +162,17 @@
 AM_CONDITIONAL([INSTALL_MERCURIAL], [test "$install_mercurial" = yes])
 
 
+# PYTHIA
+install_pythia=no
+if test "$install_nemesis" = yes; then
+  install_pythia=yes
+fi
+if test "$install_spatialdata" = yes; then
+  install_pythia=yes
+fi
+AM_CONDITIONAL([INSTALL_PYTHIA], [test "$install_pythia" = yes])
+
+
 # ----------------------------------------------------------------------
 # OPTIONS
 # ----------------------------------------------------------------------