[cig-commits] r21340 - in cs/batlab/trunk: . CitcomS PyLith RELAX SELEN SPECFEM3D_GLOBE support
ericheien at geodynamics.org
ericheien at geodynamics.org
Wed Feb 6 23:36:37 PST 2013
Author: ericheien
Date: 2013-02-06 23:36:36 -0800 (Wed, 06 Feb 2013)
New Revision: 21340
Added:
cs/batlab/trunk/SELEN/
cs/batlab/trunk/SELEN/repo_check.run-spec
cs/batlab/trunk/SELEN/repo_checkout.git
cs/batlab/trunk/support/build_dealii_svn.sh
cs/batlab/trunk/support/build_trilinos-11.0.3.sh
cs/batlab/trunk/support/dealii.svn
cs/batlab/trunk/support/trilinos-11.0.3-Source.scp
Removed:
cs/batlab/trunk/SELEN/dist_check.run-spec
cs/batlab/trunk/SELEN/dist_files.scp
cs/batlab/trunk/SELEN/dist_files.url
cs/batlab/trunk/SELEN/repo_check.run-spec
cs/batlab/trunk/SELEN/repo_checkout.svn
Modified:
cs/batlab/trunk/CitcomS/build.sh
cs/batlab/trunk/PyLith/build.sh
cs/batlab/trunk/README
cs/batlab/trunk/RELAX/build.sh
cs/batlab/trunk/SELEN/build.sh
cs/batlab/trunk/SELEN/build_files.scp
cs/batlab/trunk/SPECFEM3D_GLOBE/build.sh
cs/batlab/trunk/setup_debug.sh
cs/batlab/trunk/support/build_common.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_nemesis-1.0.2.sh
cs/batlab/trunk/support/build_netcdf.sh
cs/batlab/trunk/support/build_numdiff-5.6.1.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_proj-4.8.0.sh
cs/batlab/trunk/support/build_spatialdata-1.9.0.sh
Log:
Fixed build script shells, added SELEN repository build tests (confirmed to work on 12 platforms), added support files for Aspect
Modified: cs/batlab/trunk/CitcomS/build.sh
===================================================================
--- cs/batlab/trunk/CitcomS/build.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/CitcomS/build.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,10 +3,7 @@
# $Id$
# Point to any additional installed libraries
-export PATH=$PATH:$HOME/local/bin/
-export LDFLAGS=-L$HOME/local/lib/
-export CFLAGS=-I$HOME/local/include/
-export LD_LIBRARY_PATH=$HOME/local/lib/
+source ./build_common.sh
# Builds CitcomS
cd CitcomS*
Modified: cs/batlab/trunk/PyLith/build.sh
===================================================================
--- cs/batlab/trunk/PyLith/build.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/PyLith/build.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -2,13 +2,10 @@
#
# $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 \
+# set location of netcdf headers for GMT, build and test program
+source ./build_common.sh \
+ && cd PyLith* \
+ && ./waf configure --use-ctfft --proj-dir=`pwd`/../local --gmt-dir=`pwd`/../local --fftw-dir=`pwd`/../local \
&& ./waf
exit $?
Modified: cs/batlab/trunk/README
===================================================================
--- cs/batlab/trunk/README 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/README 2013-02-07 07:36:36 UTC (rev 21340)
@@ -105,3 +105,22 @@
Mineos x86_64_Windows7 1/27/2013 FN FN
Mineos x86_WindowsXP 1/27/2013 FN FN
+SELEN x86_64_Debian5 2/06/2013 N BN
+SELEN x86_64_Debian6 2/06/2013 N BN
+SELEN x86_64_Fedora16 2/06/2013 N BN
+SELEN x86_64_Fedora17 2/06/2013 N BN
+SELEN x86_64_MacOSX7 2/06/2013 N BN
+SELEN x86_64_RedHat5 2/06/2013 N FN
+SELEN x86_64_RedHat6 2/06/2013 N BN
+SELEN x86_64_SL6 2/06/2013 N BN
+SELEN x86_64_Solaris11 2/06/2013 N FN
+SELEN x86_64_Ubuntu10 2/06/2013 N BN
+SELEN x86_64_Ubuntu12 2/06/2013 N BN
+SELEN x86_64_macos_10.7 2/06/2013 N BN
+SELEN x86_Debian6 2/06/2013 N BN
+SELEN x86_RedHat5 2/06/2013 N FN
+SELEN x86_RedHat6 2/06/2013 N BN
+SELEN x86_SL5 2/06/2013 N FN
+SELEN x86_64_Windows7 2/06/2013 N FN
+SELEN x86_WindowsXP 2/06/2013 N FN
+
Modified: cs/batlab/trunk/RELAX/build.sh
===================================================================
--- cs/batlab/trunk/RELAX/build.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/RELAX/build.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,16 +1,12 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id$
-# set location of netcdf headers for GMT
-export NETCDF_INC=$HOME/local/include/
-export NETCDF_LIB=$HOME/local/lib/
+# set location of netcdf headers for GMT, build and test program
+source ./build_common.sh \
+ && cd Relax* \
+ && ./waf configure --use-fftw --proj-dir=$HOME/local/ --gmt-dir=$HOME/local/ --fftw-dir=$HOME/local/ \
+ && ./waf
-# build and test program
-# need to replace run1.input to either test only first coseismic event, or limit integration to a certain number of iterations
-# grep records only the tenth iteration on the first coseismic event, puts it in results
-cd Relax*
-./waf configure --use-fftw --proj-dir=$HOME/local/ --gmt-dir=$HOME/local/ --fftw-dir=$HOME/local/ && ./waf
-
exit $?
Copied: cs/batlab/trunk/SELEN (from rev 21301, cs/batlab/trunk/CitcomS)
Modified: cs/batlab/trunk/SELEN/build.sh
===================================================================
--- cs/batlab/trunk/CitcomS/build.sh 2013-01-28 01:49:53 UTC (rev 21301)
+++ cs/batlab/trunk/SELEN/build.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -2,21 +2,8 @@
#
# $Id$
-# Point to any additional installed libraries
-export PATH=$PATH:$HOME/local/bin/
-export LDFLAGS=-L$HOME/local/lib/
-export CFLAGS=-I$HOME/local/include/
-export LD_LIBRARY_PATH=$HOME/local/lib/
+# Build SELEN
+source ./build_common.sh && cd selen && ./configure && make
-# Builds CitcomS
-cd CitcomS*
-
-if [ "$1" == "repo" ]
-then
- autoreconf -i && ./configure --without-pyre && make
-else
- ./configure --without-pyre && make
-fi
-
exit $?
Modified: cs/batlab/trunk/SELEN/build_files.scp
===================================================================
--- cs/batlab/trunk/CitcomS/build_files.scp 2013-01-28 01:49:53 UTC (rev 21301)
+++ cs/batlab/trunk/SELEN/build_files.scp 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,5 +1,5 @@
# $Id$
method = scp
-scp_file = ~/trunk/CitcomS/build.sh
+scp_file = ~/trunk/SELEN/build.sh
Deleted: cs/batlab/trunk/SELEN/dist_check.run-spec
===================================================================
--- cs/batlab/trunk/CitcomS/dist_check.run-spec 2013-01-28 01:49:53 UTC (rev 21301)
+++ cs/batlab/trunk/SELEN/dist_check.run-spec 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,32 +0,0 @@
-# $Id$
-
-project = CIG
-component = CitcomS
-description = Build test of CitcomS distribution
-run_type = build
-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
-
-remote_task = build.sh
-remote_task_args = dist
-
-# These platforms mostly work (still some minor tweaks needed)
-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_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5
-
-# These platforms fail
-#platforms = x86_64_Windows7, x86_WindowsXP
-
-notify = emheien at geodynamics.org
-
Deleted: cs/batlab/trunk/SELEN/dist_files.scp
===================================================================
--- cs/batlab/trunk/CitcomS/dist_files.scp 2013-01-28 01:49:53 UTC (rev 21301)
+++ cs/batlab/trunk/SELEN/dist_files.scp 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,6 +0,0 @@
-# $Id$
-
-method = scp
-scp_file = ~/trunk/distributions/CitcomS-3.2.0.tar.gz
-untar = true
-
Deleted: cs/batlab/trunk/SELEN/dist_files.url
===================================================================
--- cs/batlab/trunk/CitcomS/dist_files.url 2013-01-28 01:49:53 UTC (rev 21301)
+++ cs/batlab/trunk/SELEN/dist_files.url 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,6 +0,0 @@
-# $Id$
-
-method = url
-url = http://www.geodynamics.org/cig/software/citcoms/CitcomS-3.2.0.tar.gz
-untar = true
-
Deleted: cs/batlab/trunk/SELEN/repo_check.run-spec
===================================================================
--- cs/batlab/trunk/CitcomS/repo_check.run-spec 2013-01-28 01:49:53 UTC (rev 21301)
+++ cs/batlab/trunk/SELEN/repo_check.run-spec 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,32 +0,0 @@
-# $Id$
-
-project = CIG
-component = CitcomS
-description = Build test of CitcomS SVN
-run_type = build
-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
-
-remote_task = build.sh
-remote_task_args = repo
-
-# These platforms mostly work (still some minor tweaks needed)
-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_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5
-
-# These platforms fail
-#platforms = x86_64_Windows7, x86_WindowsXP
-
-notify = emheien at geodynamics.org
-
Copied: cs/batlab/trunk/SELEN/repo_check.run-spec (from rev 21320, cs/batlab/trunk/CitcomS/repo_check.run-spec)
===================================================================
--- cs/batlab/trunk/SELEN/repo_check.run-spec (rev 0)
+++ cs/batlab/trunk/SELEN/repo_check.run-spec 2013-02-07 07:36:36 UTC (rev 21340)
@@ -0,0 +1,21 @@
+# $Id$
+
+project = CIG
+component = SELEN
+description = Build test of SELEN git
+run_type = build
+inputs = repo_checkout.git, build_files.scp, ../support/netcdf.scp, ../support/gmt-4.5.8.scp, ../support/lib_scripts.scp
+
+remote_pre = build_support.sh
+remote_pre_args = build_netcdf.sh build_gmt-4.5.8.sh
+
+remote_task = build.sh
+
+# These platforms mostly work (still some minor tweaks needed)
+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_macos_10.7, x86_RedHat5, x86_RedHat6, x86_SL5
+
+# These platforms fail
+#platforms = x86_64_Windows7, x86_WindowsXP
+
+notify = emheien at geodynamics.org
+
Copied: cs/batlab/trunk/SELEN/repo_checkout.git (from rev 21301, cs/batlab/trunk/CitcomS/repo_checkout.svn)
===================================================================
--- cs/batlab/trunk/SELEN/repo_checkout.git (rev 0)
+++ cs/batlab/trunk/SELEN/repo_checkout.git 2013-02-07 07:36:36 UTC (rev 21340)
@@ -0,0 +1,5 @@
+# $Id$
+
+method = git
+git_repo = git://github.com/eheien/selen.git
+
Deleted: cs/batlab/trunk/SELEN/repo_checkout.svn
===================================================================
--- cs/batlab/trunk/CitcomS/repo_checkout.svn 2013-01-28 01:49:53 UTC (rev 21301)
+++ cs/batlab/trunk/SELEN/repo_checkout.svn 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,5 +0,0 @@
-# $Id$
-
-method = svn
-url = http://geodynamics.org/svn/cig/mc/3D/CitcomS/trunk CitcomS
-
Modified: cs/batlab/trunk/SPECFEM3D_GLOBE/build.sh
===================================================================
--- cs/batlab/trunk/SPECFEM3D_GLOBE/build.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/SPECFEM3D_GLOBE/build.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,13 +3,10 @@
# $Id$
# Point to any additional installed libraries
-export PATH=$PATH:$HOME/local/bin/
-export LDFLAGS=-L$HOME/local/lib/
-export CFLAGS=-I$HOME/local/include/
-export LD_LIBRARY_PATH=$HOME/local/lib/
+source ./build_common.sh \
+ && cd SPECFEM* \
+ && ./configure \
+ && make all
-cd SPECFEM*
-./configure && make all
-
exit $?
Modified: cs/batlab/trunk/setup_debug.sh
===================================================================
--- cs/batlab/trunk/setup_debug.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/setup_debug.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -14,15 +14,17 @@
# Get support files/libraries needed by CIG codes
cd support
+rm deal.nodoc-7.2.0.tar.gz ; wget https://dealii.googlecode.com/files/deal.nodoc-7.2.0.tar.gz
rm fftw-3.3.3.tar.gz ; wget http://www.fftw.org/fftw-3.3.3.tar.gz
rm gmt-4.5.8.tar.bz2 ; wget ftp://ftp.iris.washington.edu/pub/gmt/gmt-4.5.8.tar.bz2
-rm proj-4.8.0.tar.gz ; wget http://download.osgeo.org/proj/proj-4.8.0.tar.gz
+rm nemesis-1.0.2.tar.gz ; wget http://www.geodynamics.org/cig/software/pythia/nemesis-1.0.2.tar.gz
rm netcdf.tar.gz ; wget ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf.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
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 petsc-dev-pylith-1.8.0.tgz ; wget http://www.geodynamics.org/cig/software/pylith/petsc-dev-pylith-1.8.0.tgz
+rm proj-4.8.0.tar.gz ; wget http://download.osgeo.org/proj/proj-4.8.0.tar.gz
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 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
+rm trilinos-11.0.3-Source.tar.bz2 ; wget http://trilinos.sandia.gov/download/files/trilinos-11.0.3-Source.tar.bz2
cd ..
Modified: cs/batlab/trunk/support/build_common.sh
===================================================================
--- cs/batlab/trunk/support/build_common.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_common.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,5 +1,3 @@
-#!/bin/bash
-#
# $Id$
# Set up common paths, flags needed for all builds
@@ -12,5 +10,3 @@
export NETCDF_INC=$HOME/local/include/ &&
export NETCDF_LIB=$HOME/local/lib/
-exit $?
-
Copied: cs/batlab/trunk/support/build_dealii_svn.sh (from rev 21320, cs/batlab/trunk/support/build_fftw-3.3.3.sh)
===================================================================
--- cs/batlab/trunk/support/build_dealii_svn.sh (rev 0)
+++ cs/batlab/trunk/support/build_dealii_svn.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# $Id$
+
+source ./build_common.sh \
+ && cd deal.II \
+ && mkdir -p p4est \
+ && cd p4est \
+ && wget http://www.dealii.org/developer/external-libs/p4est-setup.sh \
+ && wget http://burstedde.ins.uni-bonn.de/release/p4est-0.3.4.tar.gz \
+ && chmod u+x p4est-setup.sh \
+ && ./p4est-setup.sh p4est-0.3.4.tar.gz $HOME/local/ \
+ && cd .. \
+ && ./configure --with-fortran=no --enable-shared --enable-mpi --disable-threads --with-trilinos=$HOME/local --with-p4est=$HOME/local \
+ && make -j 2 debug
+
+exit $?
+
Modified: cs/batlab/trunk/support/build_fftw-3.3.3.sh
===================================================================
--- cs/batlab/trunk/support/build_fftw-3.3.3.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_fftw-3.3.3.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id$
-./build_common.sh \
+source ./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-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_gmt-4.5.8.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,14 +1,13 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id$
-./build_common.sh \
- && cd GMT* \
+source ./build_common.sh \
+ && cd GMT4.5.8 \
&& ./configure --without-x --prefix=$HOME/local/ \
&& make \
&& make install-gmt \
- && make install-data \
- && make clean
+ && make install-data
exit $?
Modified: cs/batlab/trunk/support/build_nemesis-1.0.2.sh
===================================================================
--- cs/batlab/trunk/support/build_nemesis-1.0.2.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_nemesis-1.0.2.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,7 +3,7 @@
# $Id$
# Builds and installs nemesis library
-./build_common.sh && cd nemesis-1.0.2 && ./configure --prefix=$HOME/local/ && make && make install
+source ./build_common.sh && cd nemesis-1.0.2 && ./configure --prefix=$HOME/local/ && make && make install
exit $?
Modified: cs/batlab/trunk/support/build_netcdf.sh
===================================================================
--- cs/batlab/trunk/support/build_netcdf.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_netcdf.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id$
-cd netcdf* \
+source ./build_common.sh \
+ && cd netcdf* \
&& ./configure --disable-netcdf-4 --disable-doxygen --prefix=$HOME/local/ \
&& make install
Modified: cs/batlab/trunk/support/build_numdiff-5.6.1.sh
===================================================================
--- cs/batlab/trunk/support/build_numdiff-5.6.1.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_numdiff-5.6.1.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,7 +3,7 @@
# $Id$
# Builds and installs numdiff utility to compare results
-./build_common.sh && cd numdiff-5.6.1 && ./configure --prefix=$HOME/local/ && make && make install
+source ./build_common.sh && cd numdiff-5.6.1 && ./configure --prefix=$HOME/local/ && make && make install
exit $?
Modified: cs/batlab/trunk/support/build_numpy-1.7.0rc1.sh
===================================================================
--- cs/batlab/trunk/support/build_numpy-1.7.0rc1.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_numpy-1.7.0rc1.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,7 +3,7 @@
# $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/
+source ./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 $?
Modified: cs/batlab/trunk/support/build_openmpi-1.6.3.sh
===================================================================
--- cs/batlab/trunk/support/build_openmpi-1.6.3.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_openmpi-1.6.3.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,7 +3,7 @@
# $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
+source ./build_common.sh && cd openmpi-1.6.3 && ./configure --prefix=$HOME/local/ && make && make install
exit $?
Modified: cs/batlab/trunk/support/build_petsc-dev-pylith-1.8.0.sh
===================================================================
--- cs/batlab/trunk/support/build_petsc-dev-pylith-1.8.0.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_petsc-dev-pylith-1.8.0.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,7 +3,7 @@
# $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
+source ./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-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_proj-4.8.0.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
#
# $Id$
-./build_common.sh \
+source ./build_common.sh \
&& cd proj-4.8.0 \
&& ./configure --with-jni=no --prefix=$HOME/local/ \
&& make install
Modified: cs/batlab/trunk/support/build_spatialdata-1.9.0.sh
===================================================================
--- cs/batlab/trunk/support/build_spatialdata-1.9.0.sh 2013-02-06 05:12:33 UTC (rev 21339)
+++ cs/batlab/trunk/support/build_spatialdata-1.9.0.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -3,7 +3,7 @@
# $Id$
# Builds and installs spatialdata library
-./build_common.sh && cd spatialdata-1.9.0 && ./configure --prefix=$HOME/local/ && make && make install
+source ./build_common.sh && cd spatialdata-1.9.0 && ./configure --prefix=$HOME/local/ && make && make install
exit $?
Copied: cs/batlab/trunk/support/build_trilinos-11.0.3.sh (from rev 21320, cs/batlab/trunk/support/build_spatialdata-1.9.0.sh)
===================================================================
--- cs/batlab/trunk/support/build_trilinos-11.0.3.sh (rev 0)
+++ cs/batlab/trunk/support/build_trilinos-11.0.3.sh 2013-02-07 07:36:36 UTC (rev 21340)
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# $Id$
+
+# Builds and installs spatialdata library
+source ./build_common.sh \
+ && cd trilinos-11.0.3-Source/sampleScripts/ \
+ && rm -f CMakeCache.txt \
+ && cmake -D CMAKE_BUILD_TYPE:STRING=RELEASE -D TPL_ENABLE_MPI:BOOL=ON \
+ -D BUILD_SHARED_LIBS:BOOL=ON -D CMAKE_C_FLAGS:STRING="-fPIC" -DCMAKE_CXX_FLAGS:STRING="-fPIC" \
+ -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF -D Trilinos_ENABLE_Stratimikos:BOOL=ON \
+ -D Trilinos_ENABLE_Sacado:BOOL=ON -D Trilinos_ENABLE_OPTIONAL_PACKAGES:BOOL=ON \
+ -D Trilinos_ENABLE_Fortran:BOOL=OFF -D CMAKE_INSTALL_PREFIX:PATH=$HOME/local/ ../ \
+ && make -j 2 \
+ && make install
+
+exit $?
+
Copied: cs/batlab/trunk/support/dealii.svn (from rev 21301, cs/batlab/trunk/support/gmt-4.5.8.scp)
===================================================================
--- cs/batlab/trunk/support/dealii.svn (rev 0)
+++ cs/batlab/trunk/support/dealii.svn 2013-02-07 07:36:36 UTC (rev 21340)
@@ -0,0 +1,5 @@
+# $Id$
+
+method = svn
+url = --trust-server-cert --non-interactive https://svn.dealii.org/trunk/deal.II deal.II
+
Copied: cs/batlab/trunk/support/trilinos-11.0.3-Source.scp (from rev 21320, cs/batlab/trunk/support/spatialdata-1.9.0.scp)
===================================================================
--- cs/batlab/trunk/support/trilinos-11.0.3-Source.scp (rev 0)
+++ cs/batlab/trunk/support/trilinos-11.0.3-Source.scp 2013-02-07 07:36:36 UTC (rev 21340)
@@ -0,0 +1,6 @@
+# $Id$
+
+method = scp
+scp_file = ~/trunk/support/trilinos-11.0.3-Source.tar.bz2
+untar = true
+
More information about the CIG-COMMITS
mailing list