[cig-commits] r21320 - in cs/batlab/trunk: . CitcomS PyLith SPECFEM3D_GLOBE support

ericheien at geodynamics.org ericheien at geodynamics.org
Fri Feb 1 13:42:12 PST 2013


Author: ericheien
Date: 2013-02-01 13:42:12 -0800 (Fri, 01 Feb 2013)
New Revision: 21320

Added:
   cs/batlab/trunk/PyLith/
   cs/batlab/trunk/PyLith/build.sh
   cs/batlab/trunk/PyLith/build_files.scp
   cs/batlab/trunk/PyLith/dist_check.run-spec
   cs/batlab/trunk/PyLith/dist_files.scp
   cs/batlab/trunk/PyLith/dist_files.url
   cs/batlab/trunk/PyLith/repo_checkout.svn
   cs/batlab/trunk/support/build_common.sh
   cs/batlab/trunk/support/build_nemesis-1.0.2.sh
   cs/batlab/trunk/support/build_numpy-1.7.0rc1.sh
   cs/batlab/trunk/support/build_openmpi-1.6.3.sh
   cs/batlab/trunk/support/build_petsc-dev-pylith-1.8.0.sh
   cs/batlab/trunk/support/build_spatialdata-1.9.0.sh
   cs/batlab/trunk/support/nemesis-1.0.2.scp
   cs/batlab/trunk/support/numpy-1.7.0rc1.scp
   cs/batlab/trunk/support/petsc-dev-pylith-1.8.0.scp
   cs/batlab/trunk/support/spatialdata-1.9.0.scp
Removed:
   cs/batlab/trunk/PyLith/build_files.scp
   cs/batlab/trunk/PyLith/dist_check.run-spec
   cs/batlab/trunk/PyLith/dist_files.scp
   cs/batlab/trunk/PyLith/dist_files.url
   cs/batlab/trunk/PyLith/fftw-3.3.3.scp
   cs/batlab/trunk/PyLith/gmt-4.5.8.scp
   cs/batlab/trunk/PyLith/netcdf.scp
   cs/batlab/trunk/PyLith/proj-4.8.0.scp
   cs/batlab/trunk/PyLith/repo_checkout.hg
   cs/batlab/trunk/support/build_openmpi.sh
Modified:
   cs/batlab/trunk/CitcomS/dist_check.run-spec
   cs/batlab/trunk/CitcomS/repo_check.run-spec
   cs/batlab/trunk/SPECFEM3D_GLOBE/dist_check.run-spec
   cs/batlab/trunk/SPECFEM3D_GLOBE/repo_check.run-spec
   cs/batlab/trunk/setup_debug.sh
   cs/batlab/trunk/support/build_fftw-3.3.3.sh
   cs/batlab/trunk/support/build_gmt-4.5.8.sh
   cs/batlab/trunk/support/build_numdiff-5.6.1.sh
   cs/batlab/trunk/support/build_proj-4.8.0.sh
Log:
Work on supporting PyLith testing on BaTLab framework, added support libraries


Modified: cs/batlab/trunk/CitcomS/dist_check.run-spec
===================================================================
--- cs/batlab/trunk/CitcomS/dist_check.run-spec	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/CitcomS/dist_check.run-spec	2013-02-01 21:42:12 UTC (rev 21320)
@@ -7,17 +7,17 @@
 inputs = dist_files.scp, build_files.scp, ../support/openmpi-1.6.3.scp, ../support/lib_scripts.scp
 
 remote_pre = build_support.sh
-x86_64_Fedora16_remote_pre_args = build_openmpi.sh
-x86_64_Fedora17_remote_pre_args = build_openmpi.sh
-x86_64_MacOSX7_remote_pre_args = build_openmpi.sh
-x86_64_RedHat5_remote_pre_args = build_openmpi.sh
-x86_64_RedHat6_remote_pre_args = build_openmpi.sh
-x86_64_SL6_remote_pre_args = build_openmpi.sh
-x86_64_Solaris11_remote_pre_args = build_openmpi.sh
-x86_64_macos_10.7_remote_pre_args = build_openmpi.sh
-x86_RedHat5_remote_pre_args = build_openmpi.sh
-x86_RedHat6_remote_pre_args = build_openmpi.sh
-x86_SL5_remote_pre_args = build_openmpi.sh
+x86_64_Fedora16_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Fedora17_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_MacOSX7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_SL6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Solaris11_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_macos_10.7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_SL5_remote_pre_args = build_openmpi-1.6.3.sh
 
 remote_task = build.sh
 remote_task_args = dist

Modified: cs/batlab/trunk/CitcomS/repo_check.run-spec
===================================================================
--- cs/batlab/trunk/CitcomS/repo_check.run-spec	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/CitcomS/repo_check.run-spec	2013-02-01 21:42:12 UTC (rev 21320)
@@ -7,17 +7,17 @@
 inputs = repo_checkout.svn, build_files.scp, ../support/openmpi-1.6.3.scp, ../support/lib_scripts.scp
 
 remote_pre = build_support.sh
-x86_64_Fedora16_remote_pre_args = build_openmpi.sh
-x86_64_Fedora17_remote_pre_args = build_openmpi.sh
-x86_64_MacOSX7_remote_pre_args = build_openmpi.sh
-x86_64_RedHat5_remote_pre_args = build_openmpi.sh
-x86_64_RedHat6_remote_pre_args = build_openmpi.sh
-x86_64_SL6_remote_pre_args = build_openmpi.sh
-x86_64_Solaris11_remote_pre_args = build_openmpi.sh
-x86_64_macos_10.7_remote_pre_args = build_openmpi.sh
-x86_RedHat5_remote_pre_args = build_openmpi.sh
-x86_RedHat6_remote_pre_args = build_openmpi.sh
-x86_SL5_remote_pre_args = build_openmpi.sh
+x86_64_Fedora16_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Fedora17_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_MacOSX7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_SL6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Solaris11_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_macos_10.7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_SL5_remote_pre_args = build_openmpi-1.6.3.sh
 
 remote_task = build.sh
 remote_task_args = repo

Copied: cs/batlab/trunk/PyLith (from rev 21292, cs/batlab/trunk/RELAX)

Copied: cs/batlab/trunk/PyLith/build.sh (from rev 21292, cs/batlab/trunk/RELAX/build_files/build_dist.sh)
===================================================================
--- cs/batlab/trunk/PyLith/build.sh	                        (rev 0)
+++ cs/batlab/trunk/PyLith/build.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $Id$
+
+# set location of netcdf headers for GMT
+export NETCDF_INC=`pwd`/../local/include/
+export NETCDF_LIB=`pwd`/../local/lib/
+
+# build and test program
+cd PyLith*
+./waf configure --use-ctfft --proj-dir=`pwd`/../local --gmt-dir=`pwd`/../local --fftw-dir=`pwd`/../local \
+    && ./waf
+
+exit $?
+

Deleted: cs/batlab/trunk/PyLith/build_files.scp
===================================================================
--- cs/batlab/trunk/RELAX/build_files.scp	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/build_files.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,5 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/RELAX/build_files/*
-

Copied: cs/batlab/trunk/PyLith/build_files.scp (from rev 21295, cs/batlab/trunk/RELAX/build_files.scp)
===================================================================
--- cs/batlab/trunk/PyLith/build_files.scp	                        (rev 0)
+++ cs/batlab/trunk/PyLith/build_files.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,5 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/PyLith/build*
+

Deleted: cs/batlab/trunk/PyLith/dist_check.run-spec
===================================================================
--- cs/batlab/trunk/RELAX/dist_check.run-spec	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/dist_check.run-spec	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,17 +0,0 @@
-# $Id
-
-project = CIG
-component = RELAX
-run_type = build
-inputs = build_files.scp, dist_files.scp, fftw-3.3.3.scp, gmt-4.5.8.scp, netcdf.scp, proj-4.8.0.scp
-remote_pre = build_libraries.sh
-remote_task = build_dist.sh
-# These platforms have been confirmed to work
-#platforms = x86_64_Ubuntu10
-#platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6
-# These platforms fail for various reasons (mostly a lack of MPI libraries)
-#platforms = x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_Windows7, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5, x86_WindowsXP
-#
-platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6, x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_Windows7, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5, x86_WindowsXP
-
-notify = emheien at geodynamics.org

Copied: cs/batlab/trunk/PyLith/dist_check.run-spec (from rev 21295, cs/batlab/trunk/RELAX/dist_check.run-spec)
===================================================================
--- cs/batlab/trunk/PyLith/dist_check.run-spec	                        (rev 0)
+++ cs/batlab/trunk/PyLith/dist_check.run-spec	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,18 @@
+# $Id$
+
+project = CIG
+component = PyLith
+run_type = build
+inputs = build_files.scp, dist_files.scp, ../support/lib_scripts.scp, ../support/proj-4.8.0.scp, ../support/nemesis-1.0.2.scp, ../support/numpy-1.7.0rc1.scp, ../support/spatialdata-1.9.0.scp ../support/petsc-dev-pylith-1.8.0.scp
+remote_pre = build_support.sh
+remote_pre_args = build_proj-4.8.0.sh build_nemesis-1.0.2.sh build_numpy-1.7.0rc1.sh build_spatialdata-1.9.0.sh build_petsc-dev-pylith-1.8.0.sh
+remote_task = build.sh
+# No platforms have been confirmed to work yet
+platforms = x86_64_Ubuntu10
+#platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6
+# These platforms fail for various reasons (mostly a lack of MPI libraries)
+#platforms = x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_Windows7, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5, x86_WindowsXP
+#
+#platforms = x86_64_Debian5, x86_64_Debian6, x86_64_Ubuntu10, x86_64_Ubuntu12, x86_Debian6, x86_64_Fedora16, x86_64_Fedora17, x86_64_MacOSX7, x86_64_RedHat5, x86_64_RedHat6, x86_64_SL6, x86_64_Solaris11, x86_64_Windows7, x86_64_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5, x86_WindowsXP
+
+notify = emheien at geodynamics.org

Deleted: cs/batlab/trunk/PyLith/dist_files.scp
===================================================================
--- cs/batlab/trunk/RELAX/dist_files.scp	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/dist_files.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/distributions/Relax-1_0_4.tgz
-untar = true
-

Copied: cs/batlab/trunk/PyLith/dist_files.scp (from rev 21295, cs/batlab/trunk/RELAX/dist_files.scp)
===================================================================
--- cs/batlab/trunk/PyLith/dist_files.scp	                        (rev 0)
+++ cs/batlab/trunk/PyLith/dist_files.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/distributions/pylith-1.8.0.tgz
+untar = true
+

Deleted: cs/batlab/trunk/PyLith/dist_files.url
===================================================================
--- cs/batlab/trunk/RELAX/dist_files.url	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/dist_files.url	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,6 +0,0 @@
-# $Id
-
-method = url
-url = http://www.geodynamics.org/cig/software/relax/Relax-1_0_4.tgz
-untar = true
-

Copied: cs/batlab/trunk/PyLith/dist_files.url (from rev 21295, cs/batlab/trunk/RELAX/dist_files.url)
===================================================================
--- cs/batlab/trunk/PyLith/dist_files.url	                        (rev 0)
+++ cs/batlab/trunk/PyLith/dist_files.url	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = url
+url = http://www.geodynamics.org/cig/software/pylith/pylith-1.8.0.tgz
+untar = true
+

Deleted: cs/batlab/trunk/PyLith/fftw-3.3.3.scp
===================================================================
--- cs/batlab/trunk/RELAX/fftw-3.3.3.scp	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/fftw-3.3.3.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/support/fftw-3.3.3.tar.gz
-untar = true
-

Deleted: cs/batlab/trunk/PyLith/gmt-4.5.8.scp
===================================================================
--- cs/batlab/trunk/RELAX/gmt-4.5.8.scp	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/gmt-4.5.8.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/support/gmt-4.5.8.tar.bz2
-untar = true
-

Deleted: cs/batlab/trunk/PyLith/netcdf.scp
===================================================================
--- cs/batlab/trunk/RELAX/netcdf.scp	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/netcdf.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/support/netcdf.tar.gz
-untar = true
-

Deleted: cs/batlab/trunk/PyLith/proj-4.8.0.scp
===================================================================
--- cs/batlab/trunk/RELAX/proj-4.8.0.scp	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/proj-4.8.0.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,6 +0,0 @@
-# $Id
-
-method = scp
-scp_file = ~/trunk/support/proj-4.8.0.tar.gz
-untar = true
-

Deleted: cs/batlab/trunk/PyLith/repo_checkout.hg
===================================================================
--- cs/batlab/trunk/RELAX/repo_checkout.hg	2013-01-25 07:26:09 UTC (rev 21292)
+++ cs/batlab/trunk/PyLith/repo_checkout.hg	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,6 +0,0 @@
-# $Id
-
-method = hg
-url = http://geodynamics.org/hg/short/3D/relax
-path = relax
-

Copied: cs/batlab/trunk/PyLith/repo_checkout.svn (from rev 21292, cs/batlab/trunk/RELAX/repo_checkout.hg)
===================================================================
--- cs/batlab/trunk/PyLith/repo_checkout.svn	                        (rev 0)
+++ cs/batlab/trunk/PyLith/repo_checkout.svn	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,5 @@
+# $Id$
+
+method = svn
+url = http://geodynamics.org/svn/cig/short/3D/PyLith/trunk/ pylith
+

Modified: cs/batlab/trunk/SPECFEM3D_GLOBE/dist_check.run-spec
===================================================================
--- cs/batlab/trunk/SPECFEM3D_GLOBE/dist_check.run-spec	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/SPECFEM3D_GLOBE/dist_check.run-spec	2013-02-01 21:42:12 UTC (rev 21320)
@@ -7,17 +7,17 @@
 inputs = build_files.scp, dist_files.scp, ../support/openmpi-1.6.3.scp, ../support/lib_scripts.scp
 
 remote_pre = build_support.sh
-x86_64_Fedora16_remote_pre_args = build_openmpi.sh
-x86_64_Fedora17_remote_pre_args = build_openmpi.sh
-x86_64_MacOSX7_remote_pre_args = build_openmpi.sh
-x86_64_RedHat5_remote_pre_args = build_openmpi.sh
-x86_64_RedHat6_remote_pre_args = build_openmpi.sh
-x86_64_SL6_remote_pre_args = build_openmpi.sh
-x86_64_Solaris11_remote_pre_args = build_openmpi.sh
-x86_64_macos_10.7_remote_pre_args = build_openmpi.sh
-x86_RedHat5_remote_pre_args = build_openmpi.sh
-x86_RedHat6_remote_pre_args = build_openmpi.sh
-x86_SL5_remote_pre_args = build_openmpi.sh
+x86_64_Fedora16_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Fedora17_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_MacOSX7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_SL6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Solaris11_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_macos_10.7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_SL5_remote_pre_args = build_openmpi-1.6.3.sh
 
 remote_task = build.sh
 

Modified: cs/batlab/trunk/SPECFEM3D_GLOBE/repo_check.run-spec
===================================================================
--- cs/batlab/trunk/SPECFEM3D_GLOBE/repo_check.run-spec	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/SPECFEM3D_GLOBE/repo_check.run-spec	2013-02-01 21:42:12 UTC (rev 21320)
@@ -7,17 +7,17 @@
 inputs = build_files.scp, repo_checkout.svn, ../support/openmpi-1.6.3.scp, ../support/lib_scripts.scp
 
 remote_pre = build_support.sh
-x86_64_Fedora16_remote_pre_args = build_openmpi.sh
-x86_64_Fedora17_remote_pre_args = build_openmpi.sh
-x86_64_MacOSX7_remote_pre_args = build_openmpi.sh
-x86_64_RedHat5_remote_pre_args = build_openmpi.sh
-x86_64_RedHat6_remote_pre_args = build_openmpi.sh
-x86_64_SL6_remote_pre_args = build_openmpi.sh
-x86_64_Solaris11_remote_pre_args = build_openmpi.sh
-x86_64_macos_10.7_remote_pre_args = build_openmpi.sh
-x86_RedHat5_remote_pre_args = build_openmpi.sh
-x86_RedHat6_remote_pre_args = build_openmpi.sh
-x86_SL5_remote_pre_args = build_openmpi.sh
+x86_64_Fedora16_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Fedora17_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_MacOSX7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_SL6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_Solaris11_remote_pre_args = build_openmpi-1.6.3.sh
+x86_64_macos_10.7_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat5_remote_pre_args = build_openmpi-1.6.3.sh
+x86_RedHat6_remote_pre_args = build_openmpi-1.6.3.sh
+x86_SL5_remote_pre_args = build_openmpi-1.6.3.sh
 
 remote_task = build.sh
 

Modified: cs/batlab/trunk/setup_debug.sh
===================================================================
--- cs/batlab/trunk/setup_debug.sh	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/setup_debug.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -21,6 +21,8 @@
 rm openmpi-1.6.3.tar.bz2 ; wget http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.3.tar.bz2
 rm spatialdata-1.9.0.tgz ; wget http://www.geodynamics.org/cig/software/pylith/spatialdata-1.9.0.tgz
 rm petsc-dev-pylith-1.8.0.tgz ; wget http://www.geodynamics.org/cig/software/pylith/petsc-dev-pylith-1.8.0.tgz
-rm numdiff-5.6.1.tar.gz ; wget http://gnu.mirrors.pair.com/savannah/savannah//numdiff/numdiff-5.6.1.tar.gz
+rm nemesis-1.0.2.tar.gz ; wget http://www.geodynamics.org/cig/software/pythia/nemesis-1.0.2.tar.gz
+rm numdiff-5.6.1.tar.gz ; wget http://gnu.mirrors.pair.com/savannah/savannah/numdiff/numdiff-5.6.1.tar.gz
+rm numpy-1.7.0rc1.tar.gz ; wget http://downloads.sourceforge.net/project/numpy/NumPy/1.7.0rc1/numpy-1.7.0rc1.tar.gz
 cd ..
 

Copied: cs/batlab/trunk/support/build_common.sh (from rev 21301, cs/batlab/trunk/support/build_openmpi.sh)
===================================================================
--- cs/batlab/trunk/support/build_common.sh	                        (rev 0)
+++ cs/batlab/trunk/support/build_common.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# $Id$
+
+# Set up common paths, flags needed for all builds
+export PATH=$PATH:$HOME/local/bin/ &&
+export LDFLAGS=-L$HOME/local/lib/ &&
+export CFLAGS=-I$HOME/local/include/ &&
+export CXXFLAGS=-I$HOME/local/include/ &&
+export LD_LIBRARY_PATH=$HOME/local/lib/ &&
+export PYTHONPATH=$HOME/local/lib/python2.6/site-packages/ &&
+export NETCDF_INC=$HOME/local/include/ &&
+export NETCDF_LIB=$HOME/local/lib/
+
+exit $?
+

Modified: cs/batlab/trunk/support/build_fftw-3.3.3.sh
===================================================================
--- cs/batlab/trunk/support/build_fftw-3.3.3.sh	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/support/build_fftw-3.3.3.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -2,7 +2,8 @@
 #
 # $Id$
 
-cd fftw-3.3.3 \
+./build_common.sh \
+    && cd fftw-3.3.3 \
     && ./configure --prefix=$HOME/local/ --enable-float --enable-threads \
     && make install
 

Modified: cs/batlab/trunk/support/build_gmt-4.5.8.sh
===================================================================
--- cs/batlab/trunk/support/build_gmt-4.5.8.sh	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/support/build_gmt-4.5.8.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -2,9 +2,8 @@
 #
 # $Id$
 
-cd GMT* \
-    && export NETCDF_INC=$HOME/local/include/ \
-    && export NETCDF_LIB=$HOME/local/lib/ \
+./build_common.sh \
+    && cd GMT* \
     && ./configure --without-x --prefix=$HOME/local/ \
     && make \
     && make install-gmt \

Copied: cs/batlab/trunk/support/build_nemesis-1.0.2.sh (from rev 21301, cs/batlab/trunk/support/build_openmpi.sh)
===================================================================
--- cs/batlab/trunk/support/build_nemesis-1.0.2.sh	                        (rev 0)
+++ cs/batlab/trunk/support/build_nemesis-1.0.2.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds and installs nemesis library
+./build_common.sh && cd nemesis-1.0.2 && ./configure --prefix=$HOME/local/ && make && make install
+
+exit $?
+

Modified: cs/batlab/trunk/support/build_numdiff-5.6.1.sh
===================================================================
--- cs/batlab/trunk/support/build_numdiff-5.6.1.sh	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/support/build_numdiff-5.6.1.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -2,8 +2,8 @@
 #
 # $Id$
 
-# Builds and installs OpenMPI to support platforms that don't already have it
-cd numdiff-5.6.1 && ./configure --prefix=$HOME/local/ && make && make install
+# Builds and installs numdiff utility to compare results
+./build_common.sh && cd numdiff-5.6.1 && ./configure --prefix=$HOME/local/ && make && make install
 
 exit $?
 

Copied: cs/batlab/trunk/support/build_numpy-1.7.0rc1.sh (from rev 21301, cs/batlab/trunk/support/build_numdiff-5.6.1.sh)
===================================================================
--- cs/batlab/trunk/support/build_numpy-1.7.0rc1.sh	                        (rev 0)
+++ cs/batlab/trunk/support/build_numpy-1.7.0rc1.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds and installs numpy for Python
+./build_common.sh && cd numpy-1.7.0rc1 && BLAS=None LAPACK=None ATLAS=None python setup.py build && python setup.py install --prefix=$HOME/local/
+
+exit $?
+

Copied: cs/batlab/trunk/support/build_openmpi-1.6.3.sh (from rev 21301, cs/batlab/trunk/support/build_openmpi.sh)
===================================================================
--- cs/batlab/trunk/support/build_openmpi-1.6.3.sh	                        (rev 0)
+++ cs/batlab/trunk/support/build_openmpi-1.6.3.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds and installs OpenMPI to support platforms that don't already have it
+./build_common.sh && cd openmpi-1.6.3 && ./configure --prefix=$HOME/local/ && make && make install
+
+exit $?
+

Deleted: cs/batlab/trunk/support/build_openmpi.sh
===================================================================
--- cs/batlab/trunk/support/build_openmpi.sh	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/support/build_openmpi.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -1,9 +0,0 @@
-#!/bin/bash
-#
-# $Id$
-
-# Builds and installs OpenMPI to support platforms that don't already have it
-cd openmpi-* && ./configure --prefix=$HOME/local/ && make && make install
-
-exit $?
-

Copied: cs/batlab/trunk/support/build_petsc-dev-pylith-1.8.0.sh (from rev 21301, cs/batlab/trunk/support/build_openmpi.sh)
===================================================================
--- cs/batlab/trunk/support/build_petsc-dev-pylith-1.8.0.sh	                        (rev 0)
+++ cs/batlab/trunk/support/build_petsc-dev-pylith-1.8.0.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds and installs PETSc library aimed at PyLith support
+./build_common.sh && cd petsc-dev && ./configure CFLAGS=$CFLAGS CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS --prefix=$HOME/local/ && make && make install
+
+exit $?
+

Modified: cs/batlab/trunk/support/build_proj-4.8.0.sh
===================================================================
--- cs/batlab/trunk/support/build_proj-4.8.0.sh	2013-02-01 20:06:48 UTC (rev 21319)
+++ cs/batlab/trunk/support/build_proj-4.8.0.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -2,7 +2,8 @@
 #
 # $Id$
 
-cd proj-4.8.0 \
+./build_common.sh \
+    && cd proj-4.8.0 \
     && ./configure --with-jni=no --prefix=$HOME/local/ \
     && make install
 

Copied: cs/batlab/trunk/support/build_spatialdata-1.9.0.sh (from rev 21301, cs/batlab/trunk/support/build_openmpi.sh)
===================================================================
--- cs/batlab/trunk/support/build_spatialdata-1.9.0.sh	                        (rev 0)
+++ cs/batlab/trunk/support/build_spatialdata-1.9.0.sh	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds and installs spatialdata library
+./build_common.sh && cd spatialdata-1.9.0 && ./configure --prefix=$HOME/local/ && make && make install
+
+exit $?
+

Copied: cs/batlab/trunk/support/nemesis-1.0.2.scp (from rev 21301, cs/batlab/trunk/support/netcdf.scp)
===================================================================
--- cs/batlab/trunk/support/nemesis-1.0.2.scp	                        (rev 0)
+++ cs/batlab/trunk/support/nemesis-1.0.2.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/support/nemesis-1.0.2.tar.gz
+untar = true
+

Copied: cs/batlab/trunk/support/numpy-1.7.0rc1.scp (from rev 21301, cs/batlab/trunk/support/openmpi-1.6.3.scp)
===================================================================
--- cs/batlab/trunk/support/numpy-1.7.0rc1.scp	                        (rev 0)
+++ cs/batlab/trunk/support/numpy-1.7.0rc1.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/support/numpy-1.7.0rc1.tar.gz
+untar = true
+

Copied: cs/batlab/trunk/support/petsc-dev-pylith-1.8.0.scp (from rev 21301, cs/batlab/trunk/support/openmpi-1.6.3.scp)
===================================================================
--- cs/batlab/trunk/support/petsc-dev-pylith-1.8.0.scp	                        (rev 0)
+++ cs/batlab/trunk/support/petsc-dev-pylith-1.8.0.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/support/petsc-dev-pylith-1.8.0.tgz
+untar = true
+

Copied: cs/batlab/trunk/support/spatialdata-1.9.0.scp (from rev 21301, cs/batlab/trunk/support/openmpi-1.6.3.scp)
===================================================================
--- cs/batlab/trunk/support/spatialdata-1.9.0.scp	                        (rev 0)
+++ cs/batlab/trunk/support/spatialdata-1.9.0.scp	2013-02-01 21:42:12 UTC (rev 21320)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/support/spatialdata-1.9.0.tgz
+untar = true
+



More information about the CIG-COMMITS mailing list