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

[brad at geodynamics.org]

Author: brad
Date: 2013-02-25 16:26:54 -0800 (Mon, 25 Feb 2013)
New Revision: 21395

Modified:
   short/3D/PyLith/pylith_installer/trunk/INSTALL
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/README
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Added more consistency checks for Python.

Modified: short/3D/PyLith/pylith_installer/trunk/INSTALL
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/INSTALL	2013-02-26 00:21:10 UTC (rev 21394)
+++ short/3D/PyLith/pylith_installer/trunk/INSTALL	2013-02-26 00:26:54 UTC (rev 21395)
@@ -123,14 +123,14 @@
 
 Download the installer.
 
-  http://www.geodynamics.org/cig/software/pylith/pylith-installer-1.8.1-0.tgz
+  http://www.geodynamics.org/cig/software/pylith/pylith-installer-1.8.0-2.tgz
 
 Untar the source code for the installer:
 
   mkdir -p $HOME/src/pylith
   cd $HOME/src/pylith
-  mv $HOME/Downloads/pylith-installer-1.8.1-0.tgz
-  tar -zxf pylith-installer-1.8.1-0.tgz
+  mv $HOME/Downloads/pylith-installer-1.8.0-2.tgz
+  tar -zxf pylith-installer-1.8.0-2.tgz
 
 
 ----------------------------------------------------------------------
@@ -153,7 +153,7 @@
 
 Run configure with --help to see all of the command line arguments.
 
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure --help
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure --help
 
 -------
 DEFAULT
@@ -165,7 +165,7 @@
     * MPI
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure \
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
     --with-make-threads=2 \
     --prefix=$HOME/pylith
 
@@ -179,7 +179,7 @@
     * MPI
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure \
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
     --with-fortran=no \
     --with-make-threads=2 \
     --petsc_options="--download-chaco=1 --download-c-blas-lapack=1" \
@@ -203,7 +203,7 @@
     * cppunit
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure \
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
     --disable-cppunit \
     --disable-numpy \
     --disable-proj4 \
@@ -223,7 +223,7 @@
     * C, C++, Fortran compilers
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure \
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
     --enable-python \
     --enable-mpi=openmpi \
     --with-make-threads=2 \
@@ -248,7 +248,7 @@
     * C/C++ compilers
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure \
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
     --enable-gcc=fortran \
     --enable-python \
     --enable-mpi=openmpi \
@@ -268,7 +268,7 @@
     * MPI
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure \
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
     --enable-python \
     --with-make-threads=2 \
     --prefix=$HOME/pylith
@@ -294,7 +294,7 @@
     * Mercurial
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.1-0/configure \
+  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
     --with-pylith-svn=stable \
     --with-make-threads=2 \
     --prefix=$HOME/pylith

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-02-26 00:21:10 UTC (rev 21394)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-02-26 00:26:54 UTC (rev 21395)
@@ -59,7 +59,7 @@
 PYLITH_VER=dev
 else
 SPATIALDATA_VER=1.9.1
-PYLITH_VER=1.8.1
+PYLITH_VER=1.8.0
 endif
 
 

Modified: short/3D/PyLith/pylith_installer/trunk/README
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/README	2013-02-26 00:21:10 UTC (rev 21394)
+++ short/3D/PyLith/pylith_installer/trunk/README	2013-02-26 00:26:54 UTC (rev 21395)
@@ -1,4 +1,4 @@
-We are pleased to announce release of PyLith Installer version 1.8.1-0.
+We are pleased to announce release of PyLith Installer version 1.8.0-2.
 
 Please submit bug reports via the World Wide Web at:
     http://geodynamics.org/roundup    

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-02-26 00:21:10 UTC (rev 21394)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-02-26 00:26:54 UTC (rev 21395)
@@ -17,7 +17,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PyLith Installer], [1.8.1-0], [cig-short at geodynamics.org])
+AC_INIT([PyLith Installer], [1.8.0-2], [cig-short at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
@@ -404,6 +404,23 @@
                 AC_MSG_ERROR([Header file 'zlib.h' not found; maybe you don't have the zlib development package, e.g. 'zlib-dev', installed?])
                 ])
 
+  if test "$install_numpy" != yes ; then
+    AC_MSG_WARN([Incompatible configure options. Building Python requires building numpy as well. Adding installation of numpy.])
+  fi
+  install_numpy=yes
+  if test "$install_fiat" != yes ; then
+    AC_MSG_WARN([Incompatible configure options. Building Python requires building FIAT as well. Adding installation of FIAT.])
+  fi
+  install_fiat=yes
+  if test "$install_nemesis" != yes ; then
+    AC_MSG_WARN([Incompatible configure options. Building Python requires building nemesis as well. Adding installation of nemesis.])
+  fi
+  install_pythia=yes
+  install_nemesis=yes
+  if test "$install_spatialdata" != yes ; then
+    AC_MSG_WARN([Incompatible configure options. Building Python requires building spatialdata as well. Adding installation of spatialdata.])
+  fi
+  install_spatialdata=yes
 else
   AM_PATH_PYTHON([2.4])
   CIT_PYTHON_SYSCONFIG
@@ -419,7 +436,7 @@
 # MPI
 if test "$install_mpi" != no ; then
   if test "$install_python" != yes ; then
-    AC_MSG_FAILURE([Incompatible configure options. System Python with installer-built MPI is error prone. Please use --enable-python or use system MPI.])
+    AC_MSG_WARN([Potentially incompatible configure options. System Python with installer-built MPI is error prone. If build fails you should try reconfiguring with --enable-python or use system MPI.])
   fi
   AC_PATH_PROG(existing_mpi, mpirun)
   AC_SUBST(existing_mpi)