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

[brad at geodynamics.org]

Author: brad
Date: 2013-04-15 12:00:57 -0700 (Mon, 15 Apr 2013)
New Revision: 21871

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Switch from mercurial to git for petsc.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-04-13 23:33:13 UTC (rev 21870)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2013-04-15 19:00:57 UTC (rev 21871)
@@ -34,7 +34,7 @@
 
 PCRE_VER=8.12
 SWIG_VER=2.0.2
-MERCURIAL_VER=2.2.1
+GIT_VER=2.2.1
 
 NUMPY_VER=1.6.1-patched
 
@@ -645,23 +645,23 @@
 
 
 # ----------------------------------------------------------------------
-# mercurial
+# git
 # ----------------------------------------------------------------------
-mercurial: installed_python
-if INSTALL_MERCURIAL
-	$(FETCH_SCRIPT) "$(downloader)" mercurial-$(MERCURIAL_VER).tar.gz http://geodynamics.org/~buildbot/deps
-	$(TAR) -zxf mercurial-$(MERCURIAL_VER).tar.gz
-	cd mercurial-$(MERCURIAL_VER) && \
+git: installed_python
+if INSTALL_GIT
+	$(FETCH_SCRIPT) "$(downloader)" git-$(GIT_VER).tar.gz http://geodynamics.org/~buildbot/deps
+	$(TAR) -zxf git-$(GIT_VER).tar.gz
+	cd git-$(GIT_VER) && \
 		$(PYTHON) setup.py install --prefix=$(prefix) && \
-		touch ../installed_mercurial
+		touch ../installed_git
 
 else
 	@echo "$@ already installed. Skipping installation."
-	touch installed_mercurial
+	touch installed_git
 endif
 
-installed_mercurial:
-	$(MAKE) $(AM_MAKEFLAGS) mercurial
+installed_git:
+	$(MAKE) $(AM_MAKEFLAGS) git
 
 
 # ----------------------------------------------------------------------
@@ -686,7 +686,7 @@
 # ----------------------------------------------------------------------
 # petsc
 # ----------------------------------------------------------------------
-petsc: installed_mpi installed_hdf5 installed_mercurial installed_cmake
+petsc: installed_mpi installed_hdf5 installed_git installed_cmake
 if INSTALL_PETSC
 if WITH_HDF5
 petsc_options += --with-hdf5=1
@@ -703,9 +703,7 @@
 petsc_build_options = 
 endif
 if USE_PYLITH_SVN
-	hg clone https://bitbucket.org/petsc/petsc-dev
-	cd petsc-dev/config && \
-		hg clone https://bitbucket.org/petsc/buildsystem BuildSystem
+	git clone --depth 1 -b knepley/pylith https://bitbucket.org/petsc/petsc.git petsc-dev
 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

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-04-13 23:33:13 UTC (rev 21870)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2013-04-15 19:00:57 UTC (rev 21871)
@@ -184,13 +184,13 @@
 	[install_swig=no])
 AM_CONDITIONAL([INSTALL_SWIG], [test "$install_swig" = yes])
 
-# MERCURIAL
-AC_ARG_ENABLE([mercurial],
-    [AC_HELP_STRING([--enable-mercurial],
-        [install mercurial @<:@default=no@:>@])],
-	[if test "$enableval" = "yes" ; then install_mercurial=yes; else install_mercurial=no; fi],
-	[install_mercurial=no])
-AM_CONDITIONAL([INSTALL_MERCURIAL], [test "$install_mercurial" = yes])
+# GIT
+AC_ARG_ENABLE([git],
+    [AC_HELP_STRING([--enable-git],
+        [install git @<:@default=no@:>@])],
+	[if test "$enableval" = "yes" ; then install_git=yes; else install_git=no; fi],
+	[install_git=no])
+AM_CONDITIONAL([INSTALL_GIT], [test "$install_git" = yes])
 
 # PYTHIA
 install_pythia=no
@@ -348,7 +348,7 @@
 AC_SUBST(downloader)
 
 # svn/autoreconf
-petsc_hg=no
+petsc_git=no
 if test "$pylith_svn" != no ; then
   # SVN
   AC_PATH_PROG(SVN, svn)
@@ -360,19 +360,19 @@
   if test -z "$AUTORECONF" ; then
     AC_MSG_FAILURE([cannot find 'autoreconf' program.])
   fi
-  # HG
-  if test "$install_mercurial" = yes; then
+  # GIT
+  if test "$install_git" = yes; then
     echo "do nothing" >& /dev/null
   else
-    AC_PATH_PROG(HG, hg)
-    if test -z "$HG" ; then
-      AC_MSG_FAILURE([cannot find 'hg' program.])
+    AC_PATH_PROG(GIT, git)
+    if test -z "$GIT" ; then
+      AC_MSG_FAILURE([cannot find 'git' program.])
     fi
   fi
-  petsc_hg=yes
+  petsc_git=yes
 fi
 AM_CONDITIONAL([WITH_SWIG], [test "$pylith_svn" != no])
-AC_SUBST(petsc_hg)
+AC_SUBST(petsc_git)
 
 # ----------------------------------------------------------------------
 # CHECK COMPATIBILITY OF OPTIONS
@@ -605,7 +605,7 @@
   AC_ARG_VAR(PETSC_ARCH, [PETSc configuration])
   PETSC_DIR=$prefix
   AC_SUBST(PETSC_DIR)
-  PETSC_ARCH=pylith_petsc_opt
+  PETSC_ARCH=arch-pylith
   AC_SUBST(PETSC_ARCH)
 else
   CIT_PATH_PETSC([3.3.0])
@@ -789,7 +789,7 @@
 echo "  numpy: $install_numpy"
 echo "  fiat: $install_fiat"
 echo "  spatialdata: $install_spatialdata"
-echo "  mercurial: $install_mercurial"
+echo "  git: $install_git"
 echo "  cmake: $install_cmake"
 echo "  petsc: $install_petsc, options: $petsc_options"
 echo ""