[cig-commits] [commit] baagaard/maint-1.9.0: Update URLs for new geodynamics.org and GitHub setup. (ef1bd09)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/pylith_installer

On branch  : baagaard/maint-1.9.0
Link       : https://github.com/geodynamics/pylith_installer/compare/e33d59eca0ccbcb1d07125bf7e8567c111ceaaa1...d6d0751f5621d01c3794df36a7034224e60c1fcd

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

commit ef1bd09fad7a461e6ee8adc51b01702500c12fff
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon May 5 15:03:06 2014 -0700

    Update URLs for new geodynamics.org and GitHub setup.
    
    Use files uploaded for GitHub releases when possible.


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

ef1bd09fad7a461e6ee8adc51b01702500c12fff
 Makefile.am  | 16 ++++++++--------
 configure.ac |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3641eb2..c620f87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,12 +59,12 @@ if USE_PYLITH_GIT
 SPATIALDATA_VER=master
 PYLITH_VER=$(pylith_git)
 if PETSC_TARBALL
-PETSC_VER=2.0.0
+PETSC_VER=1.9.0
 endif
 else
-SPATIALDATA_VER=1.9.3
-PYLITH_VER=2.0.0
-PETSC_VER=2.0.0
+SPATIALDATA_VER=1.9.2
+PYLITH_VER=1.9.0
+PETSC_VER=1.9.0
 endif
 
 # ----------------------------------------------------------------------
@@ -625,8 +625,8 @@ spatialdata_options += --enable-swig
 	$(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).tar.gz https://github.com/geodynamics/spatialdata/releases/download/v$(SPATIALDATA_VER)
-	$(TAR) -zxvf spatialdata-$(SPATIALDATA_VER).tar.gz
+	$(FETCH_SCRIPT) "$(downloader)" spatialdata-$(SPATIALDATA_VER).tgz http://geodynamics.org/archive/software/pylith
+	$(TAR) -zxvf spatialdata-$(SPATIALDATA_VER).tgz
 endif
 	$(MKDIR_P) spatialdata-build
 	cd spatialdata-build && \
@@ -707,7 +707,7 @@ else
 petsc_build_options = 
 endif
 if PETSC_TARBALL
-	$(FETCH_SCRIPT) "$(downloader)" petsc-pylith-$(PETSC_VER).tgz https://github.com/geodynamics/pylith/releases/download/v$(PETSC_VER)rc1
+	$(FETCH_SCRIPT) "$(downloader)" petsc-pylith-$(PETSC_VER).tgz http://geodynamics.org/cig/software/pylith
 	$(TAR) -zxf petsc-pylith-$(PETSC_VER).tgz
 else
 	git clone --depth 1 -b knepley/pylith https://bitbucket.org/petsc/petsc.git petsc-pylith
@@ -758,7 +758,7 @@ pylith_options += --enable-swig
 	$(GIT) clone --recursive --depth 1 -b $(pylith_git) https://github.com/geodynamics/pylith.git pylith-$(PYLITH_VER)
 	cd pylith-$(PYLITH_VER) && $(AUTORECONF) -if
 else
-	$(FETCH_SCRIPT) "$(downloader)" pylith-$(PYLITH_VER).tgz https://github.com/geodynamics/pylith/releases/download/v$(PYLITH_VER)rc1
+	$(FETCH_SCRIPT) "$(downloader)" pylith-$(PYLITH_VER).tgz https://github.com/geodynamics/pylith/releases/download/v$(PYLITH_VER)
 	$(TAR) -zxvf pylith-$(PYLITH_VER).tgz
 endif
 	$(MKDIR_P) pylith-build
diff --git a/configure.ac b/configure.ac
index 1aac178..65d378c 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], [2.0.0-0], [cig-short at geodynamics.org])
+AC_INIT([PyLith Installer], [1.9.0-2], [cig-short at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])