[cig-commits] [commit] baagaard/fix-svn-to-git: Add option to allow building PyLith from repo using PETSc tarball. (d3959eb)

Thu Sep 26 15:23:51 PDT 2013

Repository : ssh://geoshell/pylith_installer

On branch  : baagaard/fix-svn-to-git
Link       : https://github.com/geodynamics/pylith_installer/compare/c8878e05a8ef776d530f77e8dcedea1e48095abe...fb5a4c3307436de8882968b1368738c86f61d20b

>---------------------------------------------------------------

commit d3959eb3a2ea4616d2102f6deae0e4b0a37dd324
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Thu Sep 26 15:22:25 2013 -0700

    Add option to allow building PyLith from repo using PETSc tarball.


>---------------------------------------------------------------

d3959eb3a2ea4616d2102f6deae0e4b0a37dd324
 Makefile.am  | 30 +++++++++++++++++-------------
 configure.ac | 19 +++++++++++++++----
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 44605e0..d0a03d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 # This code was developed as part of the Computational Infrastructure
 # for Geodynamics (http://geodynamics.org).
 #
-# Copyright (c) 2010-2012 University of California, Davis
+# Copyright (c) 2010-2013 University of California, Davis
 #
 # See COPYING for license information.
 #
@@ -50,20 +50,24 @@ NETCDFPY_VER=1.0
 SCIENTIFICPYTHON_VER=2.9.1
 FIAT_VER=0.9.9
 
-PYTHIA_VER=0.8.1.15
-NEMESIS_VER=1.0.2
+PYTHIA_VER=0.8.1.16
+NEMESIS_VER=1.1.0
 
 CMAKE_VER=2.8.8
 
 if USE_PYLITH_GIT
 SPATIALDATA_VER=dev
 PYLITH_VER=dev
+if PETSC_TARBALL
+PETSC_VER=1.9.0
+else
+PETSC_VER=dev
+endif
 else
 SPATIALDATA_VER=1.9.2
 PYLITH_VER=1.9.0
 endif
 
-
 # ----------------------------------------------------------------------
 # Files
 # ----------------------------------------------------------------------
@@ -619,8 +623,8 @@ spatialdata_options += --enable-testing
 endif
 if USE_PYLITH_GIT
 spatialdata_options += --enable-swig
-	$(GIT) clone --depth 1 https://github.com/geodynamics/spatialdata.git spatialdata-$(SPATIALDATA_VER)
-	cd spatialdata-$(SPATIALDATA_VER) && $(GIT) submodule init && $(GIT) submodule update && $(AUTORECONF) -if
+	$(GIT) clone --recursive --depth 1 https://github.com/geodynamics/spatialdata.git spatialdata-$(SPATIALDATA_VER)
+	cd spatialdata-$(SPATIALDATA_VER) && $(AUTORECONF) -if
 else
 	$(FETCH_SCRIPT) "$(downloader)" spatialdata-$(SPATIALDATA_VER).tgz http://www.geodynamics.org/cig/software/pylith
 	$(TAR) -zxvf spatialdata-$(SPATIALDATA_VER).tgz
@@ -703,11 +707,11 @@ petsc_build_options = -j$(make_threads) -C $(PETSC_ARCH)
 else
 petsc_build_options = 
 endif
-if USE_PYLITH_GIT
-	git clone --depth 1 -b knepley/pylith https://bitbucket.org/petsc/petsc.git petsc-pylith
+if PETSC_TARBALL
+	$(FETCH_SCRIPT) "$(downloader)" petsc-pylith-$(PETSC_VER).tgz http://www.geodynamics.org/cig/software/pylith
+	$(TAR) -zxf petsc-pylith-$(PETSC_VER).tgz
 else
-	$(FETCH_SCRIPT) "$(downloader)" petsc-pylith-$(PYLITH_VER).tgz http://www.geodynamics.org/cig/software/pylith
-	$(TAR) -zxf petsc-pylith-$(PYLITH_VER).tgz
+	git clone --depth 1 -b knepley/pylith https://bitbucket.org/petsc/petsc.git petsc-pylith
 endif
 	cd petsc-pylith && \
 		./configure --prefix=$(prefix) \
@@ -752,15 +756,15 @@ pylith_options += --enable-cuda
 endif
 if USE_PYLITH_GIT
 pylith_options += --enable-swig
-	$(GIT) clone --depth 1 https://github.com/geodynamics/pylith.git pylith-$(PYLITH_VER)
-	cd pylith-$(PYLITH_VER) && $(GIT) submodule init && $(GIT) submodule update && $(AUTORECONF) -if
+	$(GIT) clone --recursive --depth 1 -b $(pylith_git) https://github.com/geodynamics/pylith.git pylith-$(pylith_git)
+	cd pylith-$(pylith_git) && $(AUTORECONF) -if
 else
 	$(FETCH_SCRIPT) "$(downloader)" pylith-$(PYLITH_VER).tgz http://www.geodynamics.org/cig/software/pylith
 	$(TAR) -zxvf pylith-$(PYLITH_VER).tgz
 endif
 	$(MKDIR_P) pylith-build
 	cd pylith-build && \
-		../pylith-$(PYLITH_VER)/configure \
+		../pylith-$(pylith_git)/configure \
 			--prefix=$(prefix) $(pylith_options) \
                         $(env_flags) $(env_mpicompilers) \
 			PETSC_DIR=$(PETSC_DIR) PETSC_ARCH=$(PETSC_ARCH) ; \
diff --git a/configure.ac b/configure.ac
index a6e549e..73d833e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PyLith Installer], [1.9.0-0], [cig-short at geodynamics.org])
+AC_INIT([PyLith Installer], [1.9.0-1], [cig-short at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
@@ -293,9 +293,16 @@ AC_ARG_WITH([pylith-git],
 	[pylith_git=$withval],
 	[pylith_git=no])
 if test "$pylith_git" = yes ; then pylith_git="master"; fi
-if test "$pylith_git" = maint ; then pylith_git="maint"; fi
 AC_SUBST(pylith_git)
 AM_CONDITIONAL([USE_PYLITH_GIT], [test "$pylith_git" != no])
+# FORCE USE OF PETSC TARBALL
+AC_ARG_WITH([petsc-tarball],
+    [AC_HELP_STRING([--with-petsc-tarball],
+        [Force use of PETSc tarball even if using PyLith from repository @<:@default=no@:>@])],
+	[force_petsc_tarball=$withval],
+	[force_petsc_tarball=no])
+AC_SUBST(force_petsc_tarball)
+AM_CONDITIONAL([PETSC_TARBALL], [test "$pylith_git" = no || test "$force_petsc_tarball" = yes])
 
 # fetch tool
 AC_ARG_WITH([fetch],
@@ -791,8 +798,12 @@ echo "  cmake: $install_cmake"
 echo "  petsc: $install_petsc, options: $petsc_options"
 echo ""
 if test "$pylith_git" != no ; then
-  echo "  Installing development version of PETSc from repository."
-  echo "  Installing spatialdata from CIG GitHub repository."
+  if test "$force_petsc_tarball" == yes ; then
+    echo "  Installing PETSc from tarball."
+  else
+    echo "  Installing PETSc from Bitbucket repository."
+  fi
+  echo "  Installing spatialdata and PyLith from CIG GitHub repository."
   echo "  Building PyLith branch '$pylith_git'."
 else
   echo "  Building PETSc, spatialdata, and PyLith from source tarballs."

