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

Thu Jun 13 18:03:07 PDT 2013

Author: brad
Date: 2013-06-13 18:03:06 -0700 (Thu, 13 Jun 2013)
New Revision: 22266

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:
Updates for v2.0.0.

Modified: short/3D/PyLith/pylith_installer/trunk/INSTALL
===================================================================

--- short/3D/PyLith/pylith_installer/trunk/INSTALL	2013-06-14 01:02:41 UTC (rev 22265)
+++ short/3D/PyLith/pylith_installer/trunk/INSTALL	2013-06-14 01:03:06 UTC (rev 22266)
@@ -123,14 +123,14 @@
 
 Download the installer.
 
-  http://www.geodynamics.org/cig/software/pylith/pylith-installer-1.8.0-2.tgz
+  http://www.geodynamics.org/cig/software/pylith/pylith-installer-2.0.0-0.tgz
 
 Untar the source code for the installer:
 
   mkdir -p $HOME/src/pylith
   cd $HOME/src/pylith
-  mv $HOME/Downloads/pylith-installer-1.8.0-2.tgz
-  tar -zxf pylith-installer-1.8.0-2.tgz
+  mv $HOME/Downloads/pylith-installer-2.0.0-0.tgz
+  tar -zxf pylith-installer-2.0.0-0.tgz
 
 
 ----------------------------------------------------------------------
@@ -153,7 +153,7 @@
 
 Run configure with --help to see all of the command line arguments.
 
-  $HOME/src/pylith/pylith-installer-1.8.0-2/configure --help
+  $HOME/src/pylith/pylith-installer-2.0.0-0/configure --help
 
 -------
 DEFAULT
@@ -165,7 +165,7 @@
     * MPI
 
   mkdir -p $HOME/build/pylith
-  $HOME/src/pylith/pylith-installer-1.8.0-2/configure \
+  $HOME/src/pylith/pylith-installer-2.0.0-0/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.0-2/configure \
+  $HOME/src/pylith/pylith-installer-2.0.0-0/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.0-2/configure \
+  $HOME/src/pylith/pylith-installer-2.0.0-0/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.0-2/configure \
+  $HOME/src/pylith/pylith-installer-2.0.0-0/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.0-2/configure \
+  $HOME/src/pylith/pylith-installer-2.0.0-0/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.0-2/configure \
+  $HOME/src/pylith/pylith-installer-2.0.0-0/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.0-2/configure \
+  $HOME/src/pylith/pylith-installer-2.0.0-0/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-06-14 01:02:41 UTC (rev 22265)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-06-14 01:03:06 UTC (rev 22266)
@@ -30,7 +30,7 @@
 MPICH_VER=3.0.4
 OPENMPI_VER=1.4.5
 
-CPPUNIT_VER=1.12.1
+CPPUNIT_VER=1.12.1-patched
 
 PCRE_VER=8.12
 SWIG_VER=2.0.2
@@ -59,8 +59,8 @@
 SPATIALDATA_VER=dev
 PYLITH_VER=dev
 else
-SPATIALDATA_VER=1.9.1
-PYLITH_VER=1.8.0
+SPATIALDATA_VER=1.9.2
+PYLITH_VER=2.0.0
 endif
 
 
@@ -704,20 +704,18 @@
 petsc_build_options = 
 endif
 if USE_PYLITH_SVN
-	git clone --depth 1 -b knepley/pylith https://bitbucket.org/petsc/petsc.git petsc-dev
+	git clone --depth 1 -b knepley/pylith https://bitbucket.org/petsc/petsc.git petsc-pylith
 else
-	$(FETCH_SCRIPT) "$(downloader)" petsc-dev-pylith-$(PYLITH_VER).tgz http://www.geodynamics.org/cig/software/pylith
-	$(TAR) -zxf petsc-dev-pylith-$(PYLITH_VER).tgz
+	$(FETCH_SCRIPT) "$(downloader)" petsc-pylith-$(PYLITH_VER).tgz http://www.geodynamics.org/cig/software/pylith
+	$(TAR) -zxf petsc-pylith-$(PYLITH_VER).tgz
 endif
-	cd petsc-dev && \
+	cd petsc-pylith && \
 		./configure --prefix=$(prefix) \
 			--with-c2html=0 --with-x=0 \
-			--with-clanguage=C++ \
+			--with-clanguage=C \
 			--with-mpicompilers=1 \
 			--with-debugging=0 \
 			--with-shared-libraries=1 \
-			--with-sieve=1 \
-			--download-boost=1 \
 			$(petsc_options) $(env_flags) \
 			PETSC_DIR=$(abs_builddir) PETSC_ARCH=$(PETSC_ARCH) ; \
 		make $(petsc_build_options) PETSC_DIR=$(abs_builddir) PETSC_ARCH=$(PETSC_ARCH) && \

Modified: short/3D/PyLith/pylith_installer/trunk/README
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/README	2013-06-14 01:02:41 UTC (rev 22265)
+++ short/3D/PyLith/pylith_installer/trunk/README	2013-06-14 01:03:06 UTC (rev 22266)
@@ -1,4 +1,4 @@
-We are pleased to announce release of PyLith Installer version 1.8.0-2.
+We are pleased to announce release of PyLith Installer version 2.0.0-0.
 
 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-06-14 01:02:41 UTC (rev 22265)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-06-14 01:03:06 UTC (rev 22266)
@@ -9,7 +9,7 @@
 # This code was developed as part of the Computational Infrastructure
 # for Geodynamics (http://geodynamics.org).
 #
-# Copyright (c) 2010 University of California, Davis
+# Copyright (c) 2010-2013 University of California, Davis
 #
 # See COPYING for license information.
 #
@@ -17,7 +17,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PyLith Installer], [1.8.0-2], [cig-short at geodynamics.org])
+AC_INIT([PyLith Installer], [2.0.0-0], [cig-short at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
@@ -293,7 +293,7 @@
 	[pylith_svn=$withval],
 	[pylith_svn=no])
 if test "$pylith_svn" = yes ; then pylith_svn="trunk"; fi
-if test "$pylith_svn" = stable ; then pylith_svn="branches/v1.8-stable"; fi
+if test "$pylith_svn" = stable ; then pylith_svn="branches/v2.0-stable"; fi
 AC_SUBST(pylith_svn)
 AM_CONDITIONAL([USE_PYLITH_SVN], [test "$pylith_svn" != no])
 
@@ -611,10 +611,9 @@
   PETSC_ARCH=arch-pylith
   AC_SUBST(PETSC_ARCH)
 else
-  CIT_PATH_PETSC([3.3.0])
+  CIT_PATH_PETSC([3.4.0])
   CIT_HEADER_PETSC
   CIT_CHECK_LIB_PETSC
-  CIT_CHECK_LIB_PETSC_SIEVE
 fi
 
 # nemesis

