Index: /issm/trunk-jpl/externalpackages/adic/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/adic/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/adic/install.sh (revision 11101) @@ -1,7 +1,3 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; - #Erase install @@ -15,19 +11,19 @@ hg update -r 631 +#Configure and Compile cd source ./autogen.sh ./aclocal cd .. - mkdir build cd build -../source/configure --with-rose=$ISSM_TIER/externalpackages/rose/install \ - --with-openanalysis=$ISSM_TIER/externalpackages/openanalysis/openanalysis/x86_64-Linux \ - --with-boost=$ISSM_TIER/externalpackages/boost/install \ - --with-xerces=$ISSM_TIER/externalpackages/xerces/src \ - --with-xaifbooster=$ISSM_TIER/externalpackages/xaifbooster/xaifBooster \ - --with-colpack=$ISSM_TIER/externalpackages/colpack/install\ - --prefix=$ISSM_TIER/externalpackages/adic/install - -make -j $NUMCPUS -make -j $NUMCPUS install +../source/configure \ + --with-rose=$ISSM_TIER/externalpackages/rose/install \ + --with-openanalysis=$ISSM_TIER/externalpackages/openanalysis/openanalysis/x86_64-Linux \ + --with-boost=$ISSM_TIER/externalpackages/boost/install \ + --with-xerces=$ISSM_TIER/externalpackages/xerces/src \ + --with-xaifbooster=$ISSM_TIER/externalpackages/xaifbooster/xaifBooster \ + --with-colpack=$ISSM_TIER/externalpackages/colpack/install\ + --prefix=$ISSM_TIER/externalpackages/adic/install +make -j $1 +make -j $1 install Index: /issm/trunk-jpl/externalpackages/adolc/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/adolc/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/adolc/install.sh (revision 11101) @@ -1,12 +1,6 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - -#version of ADOL-C -version=2.2.0 - #Some cleanup -rm -rf install ADOL-C-$version src +rm -rf install ADOL-C-2.2.0 src #Create install directories @@ -14,16 +8,17 @@ #Untar -tar -zxvf ADOL-C-$version.tar.gz +tar -zxvf ADOL-C-2.2.0.tar.gz #Move ADOL-C into install directory -mv ADOL-C-$version/* src -rm -rf ADOL-C-$version - -#Apply patches -cd src +mv ADOL-C-2.2.0/* src +rm -rf ADOL-C-2.2.0 #Compile ADOL-C -../configure.sh - -make -j $NUMCPUS +cd src +./configure \ + --prefix=$ISSM_TIER/externalpackages/adolc/install \ + --enable-sparse \ + --enable-docexa \ + --enable-addexa +make -j $1 make install Index: /issm/trunk-jpl/externalpackages/angel/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/angel/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/angel/install.sh (revision 11101) @@ -1,6 +1,3 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; #Some cleanup @@ -10,12 +7,5 @@ svn co -r 82 https://angellib.svn.sourceforge.net/svnroot/angellib/trunk angel -#Apply patches +#Compile cd angel - -#Compile angel -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi +make -j $1 Index: /issm/trunk-jpl/externalpackages/autoconf/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/autoconf/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/autoconf/install.sh (revision 11101) @@ -1,10 +1,6 @@ #!/bin/bash -#version of autoconf -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/autoconf-//g'` -echo $version - #Some cleanup -rm -rf install autoconf-$version src +rm -rf install autoconf-2.63 src #Create install directories @@ -12,8 +8,8 @@ #Untar -tar -zxvf autoconf-$version.tar.gz +tar -zxvf autoconf-2.63.tar.gz #Move autoconf into src directory -mv autoconf-$version src +mv autoconf-2.63 src #Compile autoconf Index: /issm/trunk-jpl/externalpackages/automake/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/automake/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/automake/install.sh (revision 11101) @@ -1,10 +1,6 @@ #!/bin/bash -#version of automake -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/automake-//g'` -echo $version - #Some cleanup -rm -rf install automake-$version src +rm -rf install automake-1.10.2 src #Create install directories @@ -12,8 +8,6 @@ #Untar -tar -zxvf automake-$version.tar.gz - -#Move automake into src directory -mv automake-$version src +tar -zxvf automake-1.10.2.tar.gz +mv automake-1.10.2 src #Compile automake Index: /issm/trunk-jpl/externalpackages/bbftp/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/bbftp/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/bbftp/install.sh (revision 11101) @@ -1,13 +1,6 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - -#version of bbftp-client -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/bbftp-client-//g'` -echo $version - #Some cleanup -rm -rf src install bbftp-client-$version +rm -rf src install bbftp-client-3.2.0 #Create install directories @@ -15,24 +8,16 @@ #Untar -tar -zxvf bbftp-client-$version.tar.gz +tar -zxvf bbftp-client-3.2.0.tar.gz #Move bbftp-client into install directory -mv bbftp-client-$version/* src -rm -rf bbftp-client-$version +mv bbftp-client-3.2.0/* src +rm -rf bbftp-client-3.2.0 #Apply patches cd src -#Configure +#Configure and compile cd bbftpc ./configure --prefix=$ISSM_TIER/externalpackages/bbftp/install - -#Compile bbftp-client -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi - +make make install Index: /issm/trunk-jpl/externalpackages/boost/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/boost/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/boost/install.sh (revision 11101) @@ -1,35 +1,24 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - -#version of boost -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/boost_//g'` -echo $version - #Some cleanup -rm -rf install boost_$version src - -#Create install directories +rm -rf install boost_1_45_0 src mkdir install src #Untar -tar -zxvf boost_$version.tar.gz +tar -zxvf boost_1_45_0.tar.gz #Move boost into install directory -mv boost_$version/* src -rm -rf boost_$version +mv boost_1_45_0/* src +rm -rf boost_1_45_0 -#Apply patches +#Configure and compile cd src - -#Configure ./bootstrap.sh --prefix=$ISSM_TIER/externalpackages/boost/install #Compile boost -if [ -z $NUMCPUS ]; +if [ -z $1 ]; then ./bjam install else - ./bjam -j$NUMCPUS install + ./bjam -j $1 install fi Index: /issm/trunk-jpl/externalpackages/chaco/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/chaco/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/chaco/install.sh (revision 11101) @@ -1,6 +1,3 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; # Some cleanup @@ -8,6 +5,4 @@ rm -rf src rm -rf install - -# Create src and install directories mkdir src install @@ -25,6 +20,6 @@ # Build chaco cd src/code -make -j $NUMCPUS -make -j $NUMCPUS chacominusblas.a +make -j $1 +make -j $1 chacominusblas.a # Clean up objects (but not library or executable) Index: /issm/trunk-jpl/externalpackages/cmake/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/cmake/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/cmake/install.sh (revision 11101) @@ -1,32 +1,18 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - -#version of cmake -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/cmake-//g'` - #Some cleanup -rm -rf install cmake-$version - -#Create install directories +rm -rf install cmake-2.8.5 mkdir install #Untar -tar -zxvf cmake-$version.tar.gz +tar -zxvf cmake-2.8.5.tar.gz #Move cmake into install directory -mv cmake-$version/* install -rm -rf cmake-$version - +mv cmake-2.8.5/* install +rm -rf cmake-2.8.5 #Compile cmake cd install ./bootstrap --prefix=$ISSM_TIER/externalpackages/cmake/install -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi +make -j $1 make install Index: /issm/trunk-jpl/externalpackages/colpack/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/colpack/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/colpack/install.sh (revision 11101) @@ -1,19 +1,10 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; - #Erase install rm -rf install src ColPack -#version of ColPack -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/ColPack-//g'` - #install directory mkdir src - -tar -zxvf ColPack-$version.tar.gz - +tar -zxvf ColPack-1.0.3.tar.gz mv ColPack/* src rm -rf ColPack @@ -21,7 +12,6 @@ #compile cd src -make -j $NUMCPUS +make -j $1 cd .. - #install Index: /issm/trunk-jpl/externalpackages/cppcheck/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/cppcheck/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/cppcheck/install.sh (revision 11101) @@ -1,26 +1,16 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - - -#version of cppcheck -version=`echo *.tar | sed 's/\.tar//g' | sed 's/cppcheck-//g'` -echo $version - #Erase install -rm -rf install src cppcheck-$version - -#install directory +rm -rf install src cppcheck-1.48 mkdir src -tar -xvf cppcheck-$version.tar +tar -xvf cppcheck-1.48.tar -mv cppcheck-$version/* src -rm -rf cppcheck-$version +mv cppcheck-1.48/* src +rm -rf cppcheck-1.48 #compile cd src -make -j $NUMCPUS -make -j $NUMCPUS install PREFIX=$ISSM_TIER/externalpackages/cppcheck/install +make -j $1 +make -j $1 install PREFIX=$ISSM_TIER/externalpackages/cppcheck/install cd .. Index: /issm/trunk-jpl/externalpackages/dace/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dace/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/dace/install.sh (revision 11101) @@ -1,18 +1,12 @@ #!/bin/bash -#dace name -name=`echo *.zip | sed 's/\.zip//g'` - #Some cleanup -rm -rf install $name - -#Create src and install directories +rm -rf install dace mkdir install #uncompress -unzip $name.zip +unzip dace.zip #move to install directory -mv $name/* install -rm -rf $name - +mv dace/* install +rm -rf dace Index: /issm/trunk-jpl/externalpackages/dakota/install-altix64-cosmos.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-altix64-cosmos.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/dakota/install-altix64-cosmos.sh (revision 11101) @@ -0,0 +1,96 @@ +#!/bin/bash + +#Get number of cpus +NUMCPUS=$1; + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf install +mkdir src install + +#Untar +tar -zxvf Dakota_4_3.src.tar.gz + +#Move Dakota to src directory +mv Dakota/* src +rm -rf Dakota + +#Apply patches +patch src/src/ParallelLibrary.C ./ParallelLibrary.C.patch +patch src/src/ParallelLibrary.H ./ParallelLibrary.H.patch +patch src/src/NIDRProblemDescDB.C ./NIDRProblemDescDB.C.patch +patch src/src/NonDSampling.C ./NonDSampling.C.patch +patch src/src/NonDLocalReliability.C ./NonDLocalReliability.C.patch +patch src/src/NonDUnilevelRBDO.C ./NonDUnilevelRBDO.C.patch # source not even used? +#patch -R src/packages/Pecos/src/LHSDriver.cpp ./LHSDriver.cpp.patch + +#Configure dakota +cd src +./configure \ + --prefix="$ISSM_TIER/externalpackages/dakota/install" \ + --without-graphics \ + --with-pic \ + --disable-mpi \ + --with-blas=/opt/intel/mkl/9.1.023/lib/64/libmkl.so \ + --with-lapack=/opt/intel/mkl/9.1.023/lib/64/libmkl_lapack.so +cd .. + +#Before compiling, if running on 64 bits, we need to active fPIC compilation. Some packages +#do not register -fPIC in Dakota, which is a problem. Edit the faulty Makefiles and add the -fPIC +#flag to the compilation. +cat ./src/methods/NCSUOpt/Makefile | sed 's/FFLAGS = -g -O2/FFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/NCSUOpt/Makefile + +cat ./src/methods/acro/packages/pebbl/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/pebbl/src/Makefile + +cat ./src/methods/hopspack/src-nappspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-nappspack/Makefile + +cat ./src/methods/hopspack/src-cddlib/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-cddlib/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-conveyor/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-conveyor/Makefile + +cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-appspack/Makefile + +cat ./src/methods/acro/packages/colin/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/colin/src/Makefile + +cat ./src/methods/acro/packages/coliny/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/coliny/src/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CFLAGS = -O2/CFLAGS = -O2 -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/packages/ampl/Makefile + +#Compile and install dakota +cd src +if [ -z $NUMCPUS ]; +then + make + make install +else + make -j $NUMCPUS + make -j $NUMCPUS install +fi +cd .. + +#Weird behaviour of Dakota: libamplsolver.a and amplsolver.a are not the same thing! +cd install/lib +mv libamplsolver.a libamplsolver.a.bak +ln -s ../../src/packages/ampl/amplsolver.a ./libamplsolver.a Index: /issm/trunk-jpl/externalpackages/dakota/install-linux64-astrid.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-linux64-astrid.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/dakota/install-linux64-astrid.sh (revision 11101) @@ -0,0 +1,96 @@ +#!/bin/bash + +#Get number of cpus +NUMCPUS=$1; + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf install +mkdir src install + +#Untar +tar -zxvf Dakota_4_3.src.tar.gz + +#Move Dakota to src directory +mv Dakota/* src +rm -rf Dakota + +#Apply patches +patch src/src/ParallelLibrary.C ./ParallelLibrary.C.patch +patch src/src/ParallelLibrary.H ./ParallelLibrary.H.patch +patch src/src/NIDRProblemDescDB.C ./NIDRProblemDescDB.C.patch +patch src/src/NonDSampling.C ./NonDSampling.C.patch +patch src/src/NonDLocalReliability.C ./NonDLocalReliability.C.patch +patch src/src/NonDUnilevelRBDO.C ./NonDUnilevelRBDO.C.patch # source not even used? +#patch -R src/packages/Pecos/src/LHSDriver.cpp ./LHSDriver.cpp.patch + +#Configure dakota +cd src +./configure \ + --prefix="$ISSM_TIER/externalpackages/dakota/install" \ + --without-graphics \ + --with-pic \ + --disable-mpi \ + --with-blas=/usr/lib64/libblas.so.3.0.3 \ + --with-lapack=/usr/lib64/liblapack.so.3.0.3 +cd .. + +#Before compiling, if running on 64 bits, we need to active fPIC compilation. Some packages +#do not register -fPIC in Dakota, which is a problem. Edit the faulty Makefiles and add the -fPIC +#flag to the compilation. +cat ./src/methods/NCSUOpt/Makefile | sed 's/FFLAGS = -g -O2/FFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/NCSUOpt/Makefile + +cat ./src/methods/acro/packages/pebbl/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/pebbl/src/Makefile + +cat ./src/methods/hopspack/src-nappspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-nappspack/Makefile + +cat ./src/methods/hopspack/src-cddlib/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-cddlib/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-conveyor/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-conveyor/Makefile + +cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-appspack/Makefile + +cat ./src/methods/acro/packages/colin/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/colin/src/Makefile + +cat ./src/methods/acro/packages/coliny/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/coliny/src/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CFLAGS = -O2/CFLAGS = -O2 -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/packages/ampl/Makefile + +#Compile and install dakota +cd src +if [ -z $NUMCPUS ]; +then + make + make install +else + make -j $NUMCPUS + make -j $NUMCPUS install +fi +cd .. + +#Weird behaviour of Dakota: libamplsolver.a and amplsolver.a are not the same thing! +cd install/lib +mv libamplsolver.a libamplsolver.a.bak +ln -s ../../src/packages/ampl/amplsolver.a ./libamplsolver.a Index: /issm/trunk-jpl/externalpackages/dakota/install-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-macosx64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/dakota/install-macosx64.sh (revision 11101) @@ -0,0 +1,94 @@ +#!/bin/bash + +#Get number of cpus +NUMCPUS=$1; + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf install +mkdir src install + +#Untar +tar -zxvf Dakota_4_3.src.tar.gz + +#Move Dakota to src directory +mv Dakota/* src +rm -rf Dakota + +#Apply patches +patch src/src/ParallelLibrary.C ./ParallelLibrary.C.patch +patch src/src/ParallelLibrary.H ./ParallelLibrary.H.patch +patch src/src/NIDRProblemDescDB.C ./NIDRProblemDescDB.C.patch +patch src/src/NonDSampling.C ./NonDSampling.C.patch +patch src/src/NonDLocalReliability.C ./NonDLocalReliability.C.patch +patch src/src/NonDUnilevelRBDO.C ./NonDUnilevelRBDO.C.patch # source not even used? +#patch -R src/packages/Pecos/src/LHSDriver.cpp ./LHSDriver.cpp.patch + +#Configure dakota +cd src +./configure \ + --prefix="$ISSM_TIER/externalpackages/dakota/install" \ + --without-graphics \ + --with-pic \ + --disable-mpi +cd .. + +#Before compiling, if running on 64 bits, we need to active fPIC compilation. Some packages +#do not register -fPIC in Dakota, which is a problem. Edit the faulty Makefiles and add the -fPIC +#flag to the compilation. +cat ./src/methods/NCSUOpt/Makefile | sed 's/FFLAGS = -g -O2/FFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/NCSUOpt/Makefile + +cat ./src/methods/acro/packages/pebbl/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/pebbl/src/Makefile + +cat ./src/methods/hopspack/src-nappspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-nappspack/Makefile + +cat ./src/methods/hopspack/src-cddlib/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-cddlib/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-conveyor/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-conveyor/Makefile + +cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-appspack/Makefile + +cat ./src/methods/acro/packages/colin/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/colin/src/Makefile + +cat ./src/methods/acro/packages/coliny/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/coliny/src/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CFLAGS = -O2/CFLAGS = -O2 -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/packages/ampl/Makefile + +#Compile and install dakota +cd src +if [ -z $NUMCPUS ]; +then + make + make install +else + make -j $NUMCPUS + make -j $NUMCPUS install +fi +cd .. + +#Weird behaviour of Dakota: libamplsolver.a and amplsolver.a are not the same thing! +cd install/lib +mv libamplsolver.a libamplsolver.a.bak +ln -s ../../src/packages/ampl/amplsolver.a ./libamplsolver.a Index: /issm/trunk-jpl/externalpackages/dakota/install-pleiades.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install-pleiades.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/dakota/install-pleiades.sh (revision 11101) @@ -0,0 +1,96 @@ +#!/bin/bash + +#Get number of cpus +NUMCPUS=$1; + +#Some cleanup +rm -rf Dakota +rm -rf src +rm -rf install +mkdir src install + +#Untar +tar -zxvf Dakota_4_3.src.tar.gz + +#Move Dakota to src directory +mv Dakota/* src +rm -rf Dakota + +#Apply patches +patch src/src/ParallelLibrary.C ./ParallelLibrary.C.patch +patch src/src/ParallelLibrary.H ./ParallelLibrary.H.patch +patch src/src/NIDRProblemDescDB.C ./NIDRProblemDescDB.C.patch +patch src/src/NonDSampling.C ./NonDSampling.C.patch +patch src/src/NonDLocalReliability.C ./NonDLocalReliability.C.patch +patch src/src/NonDUnilevelRBDO.C ./NonDUnilevelRBDO.C.patch # source not even used? +#patch -R src/packages/Pecos/src/LHSDriver.cpp ./LHSDriver.cpp.patch + +#Configure dakota +cd src +./configure \ + --prefix="$ISSM_TIER/externalpackages/dakota/install" \ + --without-graphics \ + --with-pic \ + --disable-mpi \ + --with-blas="-L/nasa/intel/mkl/10.0.011/lib/64/ -lmkl -lmkl_lapack -liomp5 -lpthread" \ + --with-lapack="-L/nasa/intel/mkl/10.0.011/lib/64/ -lmkl -lmkl_lapack -liomp5 -lpthread" +cd .. + +#Before compiling, if running on 64 bits, we need to active fPIC compilation. Some packages +#do not register -fPIC in Dakota, which is a problem. Edit the faulty Makefiles and add the -fPIC +#flag to the compilation. +cat ./src/methods/NCSUOpt/Makefile | sed 's/FFLAGS = -g -O2/FFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/NCSUOpt/Makefile + +cat ./src/methods/acro/packages/pebbl/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/pebbl/src/Makefile + +cat ./src/methods/hopspack/src-nappspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-nappspack/Makefile + +cat ./src/methods/hopspack/src-cddlib/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-cddlib/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-shared/Makefile + +cat ./src/methods/hopspack/src-conveyor/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-conveyor/Makefile + +cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/methods/hopspack/src-appspack/Makefile + +cat ./src/methods/acro/packages/colin/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/colin/src/Makefile + +cat ./src/methods/acro/packages/coliny/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/coliny/src/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CFLAGS = -O2/CFLAGS = -O2 -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CFLAGS = -O2 -fpermissive -fPIC/g' > temp +mv temp ./src/methods/acro/packages/tpl/3po/Makefile + +cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp +mv temp ./src/packages/ampl/Makefile + +#Compile and install dakota +cd src +if [ -z $NUMCPUS ]; +then + make + make install +else + make -j $NUMCPUS + make -j $NUMCPUS install +fi +cd .. + +#Weird behaviour of Dakota: libamplsolver.a and amplsolver.a are not the same thing! +cd install/lib +mv libamplsolver.a libamplsolver.a.bak +ln -s ../../src/packages/ampl/amplsolver.a ./libamplsolver.a Index: sm/trunk-jpl/externalpackages/dakota/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/dakota/install.sh (revision 11100) +++ (revision ) @@ -1,97 +1,0 @@ -#!/bin/bash - -#Get number of cpus -NUMCPUS=$1; - -#Some cleanup -rm -rf Dakota -rm -rf src -rm -rf install - -#Create src and install directories -mkdir src install - -#version of doxygen -version=`echo *.src.tar.gz | sed 's/\.src\.tar\.gz//g' | sed 's/Dakota_//g'` - -#Untar -tar -zxvf Dakota_$version.src.tar.gz - -#Move Dakota to src directory -mv Dakota/* src -rm -rf Dakota - -#Apply patches -patch src/src/ParallelLibrary.C ./ParallelLibrary.C.patch -patch src/src/ParallelLibrary.H ./ParallelLibrary.H.patch -patch src/src/NIDRProblemDescDB.C ./NIDRProblemDescDB.C.patch -patch src/src/NonDSampling.C ./NonDSampling.C.patch -patch src/src/NonDLocalReliability.C ./NonDLocalReliability.C.patch -patch src/src/NonDUnilevelRBDO.C ./NonDUnilevelRBDO.C.patch # source not even used? -#patch -R src/packages/Pecos/src/LHSDriver.cpp ./LHSDriver.cpp.patch - -#Configure dakota -cd src -source ../configure.sh -cd .. - -#Before compiling, if running on 64 bits, we need to active fPIC compilation. Some packages -#do not register -fPIC in Dakota, which is a problem. Edit the faulty Makefiles and add the -fPIC -#flag to the compilation. -cat ./src/methods/NCSUOpt/Makefile | sed 's/FFLAGS = -g -O2/FFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/methods/NCSUOpt/Makefile - -cat ./src/methods/acro/packages/pebbl/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp -mv temp ./src/methods/acro/packages/pebbl/src/Makefile - -cat ./src/methods/hopspack/src-nappspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/methods/hopspack/src-nappspack/Makefile - -cat ./src/methods/hopspack/src-cddlib/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/methods/hopspack/src-cddlib/Makefile - -cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/methods/hopspack/src-shared/Makefile - -cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/methods/hopspack/src-shared/Makefile - -cat ./src/methods/hopspack/src-conveyor/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/methods/hopspack/src-conveyor/Makefile - -cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/methods/hopspack/src-appspack/Makefile - -cat ./src/methods/acro/packages/colin/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp -mv temp ./src/methods/acro/packages/colin/src/Makefile - -cat ./src/methods/acro/packages/coliny/src/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CXXFLAGS = -O2 -fpermissive -fPIC/g' > temp -mv temp ./src/methods/acro/packages/coliny/src/Makefile - -cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CFLAGS = -O2/CFLAGS = -O2 -fPIC/g' > temp -mv temp ./src/methods/acro/packages/tpl/3po/Makefile - -cat ./src/methods/acro/packages/tpl/3po/Makefile | sed 's/CXXFLAGS = -O2 -fpermissive/CFLAGS = -O2 -fpermissive -fPIC/g' > temp -mv temp ./src/methods/acro/packages/tpl/3po/Makefile - -cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp -mv temp ./src/packages/ampl/Makefile - - - -#Compile and install dakota -cd src -if [ -z $NUMCPUS ]; -then - make - make install -else - make -j $NUMCPUS - make -j $NUMCPUS install -fi -cd .. - -#Weird behaviour of Dakota: libamplsolver.a and amplsolver.a are not the same thing! -cd install/lib -mv libamplsolver.a libamplsolver.a.bak -ln -s ../../src/packages/ampl/amplsolver.a ./libamplsolver.a Index: /issm/trunk-jpl/externalpackages/doxygen/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/doxygen/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/doxygen/install.sh (revision 11101) @@ -3,14 +3,8 @@ #wget http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.4.src.tar.gz -#Get number of cpus on current platform -NUMCPUS=$1; - -#version of doxygen -version=`echo *.src.tar.gz | sed 's/\.src\.tar\.gz//g' | sed 's/doxygen-//g'` - #Some cleanup rm -rf src rm -rf install -rm -rf doxygen-$version +rm -rf doxygen-1.7.4 #Create src and install directories @@ -18,22 +12,15 @@ #Untar -tar -zxvf doxygen-$version.src.tar.gz +tar -zxvf doxygen-1.7.4.src.tar.gz #Move doxygen into src directory -mv doxygen-$version/* src -rm -rf doxygen-$version +mv doxygen-1.7.4/* src +rm -rf doxygen-1.7.4 #Configure doxygen cd src && ./configure --prefix "$ISSM_TIER/externalpackages/doxygen/install" - -#Compile doxygen -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi +make -j $1 #Install doxygen -make install +make install make install_docs Index: /issm/trunk-jpl/externalpackages/findbugs/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/findbugs/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/findbugs/install.sh (revision 11101) @@ -1,19 +1,10 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - - -#version of findbugs -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/findbugs-//g'` - #Erase install -rm -rf install findbugs-$version - -#install directory +rm -rf install findbugs-1.3.9 mkdir install -tar -zxvf findbugs-$version.tar.gz +tar -zxvf findbugs-1.3.9.tar.gz -mv findbugs-$version/* install -rm -rf findbugs-$version +mv findbugs-1.3.9/* install +rm -rf findbugs-1.3.9 Index: /issm/trunk-jpl/externalpackages/gdal/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/gdal/install.sh (revision 11101) @@ -1,41 +1,32 @@ #!/bin/bash - -#Get number of cpus -NUMCPUS=$1; - -#version of gdal -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/gdal-//g'` #Some cleanup rm -rf src rm -rf install -rm -rf gdal-$version - -#Create src and install directories +rm -rf gdal-1.6.0 mkdir src install #Untar -tar -zxvf gdal-$version.tar.gz +tar -zxvf gdal-1.6.0.tar.gz #Move gdal into src directory -mv gdal-$version/* src -rm -rf gdal-$version +mv gdal-1.6.0/* src +rm -rf gdal-1.6.0 #Configure gdal cd src -./configure --prefix="$ISSM_TIER/externalpackages/gdal/install" --without-python --with-netcdf=no --with-jasper=no --without-ld-shared --with-unix-stdio-64=no --with-expat-lib=/usr/lib64/libexpat.so -#./configure --prefix="$ISSM_TIER/externalpackages/gdal/install" --with-python --with-netcdf=no --with-jasper=no --without-ld-shared --with-unix-stdio-64=no --with-expat-lib=/usr/lib64/libexpat.so +./configure \ + --prefix="$ISSM_TIER/externalpackages/gdal/install" \ + --without-python \ + --with-netcdf=no \ + --with-jasper=no \ + --without-ld-shared \ + --with-unix-stdio-64=no \ + --with-expat-lib=/usr/lib64/libexpat.so #Patch GDALmake.opt patch GDALmake.opt ../GDALmake.opt.patch - #Compile and install gdal -if [ -z $NUMCPUS ]; -then - make - make install -else - make -j $NUMCPUS - make install -fi +make -j $1 +make install Index: /issm/trunk-jpl/externalpackages/graphviz/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/graphviz/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/graphviz/install.sh (revision 11101) @@ -1,38 +1,23 @@ #!/bin/bash - -#Get number of cpus -NUMCPUS=$1; #Some cleanup rm -rf install src - -#Create src and install directories mkdir install src -#version of graphviz -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/graphviz-//g'` -echo $version - #Untar -tar -zxvf graphviz-$version.tar.gz +tar -zxvf graphviz-2.24.0.tar.gz #Move Dakota to src directory -mv graphviz-$version/* src/ -rm -rf graphviz-$version +mv graphviz-2.24.0/* src/ +rm -rf graphviz-2.24.0 #Configure dakota cd src -source ../configure.sh +./configure --prefix="$ISSM_TIER/externalpackages/graphviz/install" cd .. #Compile and install cd src -if [ -z $NUMCPUS ]; -then - make - make install -else - make -j $NUMCPUS - make -j $NUMCPUS install -fi +make -j $1 +make -j $1 install cd .. Index: /issm/trunk-jpl/externalpackages/latex2rtf/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/latex2rtf/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/latex2rtf/install.sh (revision 11101) @@ -1,13 +1,10 @@ #!/bin/bash -#Get version -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/latex2rtf-//g'` - #Some cleanup -rm -rf latex2rtf-$version cfg install +rm -rf latex2rtf-2.0.0 cfg install #untar -tar -zxvf latex2rtf-$version.tar.gz -mv latex2rtf-$version install +tar -zxvf latex2rtf-2.0.0.tar.gz +mv latex2rtf-2.0.0 install #Compile Index: /issm/trunk-jpl/externalpackages/libtool/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/libtool/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/libtool/install.sh (revision 11101) @@ -1,19 +1,13 @@ #!/bin/bash -#version of libtool -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/libtool-//g'` -echo $version - #Some cleanup -rm -rf install libtool-$version src - -#Create install directories +rm -rf install libtool-2.2.6b src mkdir install #Untar -tar -zxvf libtool-$version.tar.gz +tar -zxvf libtool-2.2.6b.tar.gz #Move libtool into src directory -mv libtool-$version src +mv libtool-2.2.6b src #Compile libtool Index: /issm/trunk-jpl/externalpackages/m2html/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/m2html/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/m2html/install.sh (revision 11101) @@ -1,19 +1,14 @@ #!/bin/bash -#m2html name -name=`echo *.zip | sed 's/\.zip//g'` - #Some cleanup -rm -rf install $name - -#Create src and install directories +rm -rf install m2html mkdir install #uncompress -unzip $name.zip +unzip m2html.zip #move to install directory -mv $name/* install -rm -rf $name +mv m2html/* install +rm -rf m2html #patch m2html Index: /issm/trunk-jpl/externalpackages/mercurial/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mercurial/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/mercurial/install.sh (revision 11101) @@ -1,23 +1,14 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - -#version of mercurial -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/mercurial-//g'` -echo $version - #Some cleanup -rm -rf install mercurial-$version - -#Create install directories +rm -rf install mercurial-1.7.3 mkdir install #Untar -tar -zxvf mercurial-$version.tar.gz +tar -zxvf mercurial-1.7.3.tar.gz #Move mercurial into install directory -mv mercurial-$version/* install -rm -rf mercurial-$version +mv mercurial-1.7.3/* install +rm -rf mercurial-1.7.3 #Apply patches @@ -27,8 +18,3 @@ #Compile mercurial -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi +make -j $1 Index: /issm/trunk-jpl/externalpackages/metis/configs/4.0/altix64/Makefile.in.patch =================================================================== --- /issm/trunk-jpl/externalpackages/metis/configs/4.0/altix64/Makefile.in.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/configs/4.0/altix64/Makefile.in.patch (revision 11101) @@ -0,0 +1,10 @@ +3,5c3 +< CC = gcc +< OBJ_EXT=o +< LIB_EXT=a +--- +> CC = cc +8c6 +< OPTFLAGS = -DLINUX -fPIC +--- +> OPTFLAGS = -O2 Index: /issm/trunk-jpl/externalpackages/metis/configs/4.0/cosmos/Makefile.in.patch =================================================================== --- /issm/trunk-jpl/externalpackages/metis/configs/4.0/cosmos/Makefile.in.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/configs/4.0/cosmos/Makefile.in.patch (revision 11101) @@ -0,0 +1,10 @@ +3,5c3 +< CC = icc +< OBJ_EXT=o +< LIB_EXT=a +--- +> CC = cc +8c6 +< OPTFLAGS = -DLINUX -fPIC +--- +> OPTFLAGS = -O2 Index: /issm/trunk-jpl/externalpackages/metis/configs/4.0/linux64/Makefile.in.patch =================================================================== --- /issm/trunk-jpl/externalpackages/metis/configs/4.0/linux64/Makefile.in.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/configs/4.0/linux64/Makefile.in.patch (revision 11101) @@ -0,0 +1,10 @@ +3,5c3 +< CC = gcc +< OBJ_EXT=o +< LIB_EXT=a +--- +> CC = cc +8c6 +< OPTFLAGS = -DLINUX -fPIC +--- +> OPTFLAGS = -O2 Index: /issm/trunk-jpl/externalpackages/metis/configs/4.0/macosx32/Makefile.in.patch =================================================================== --- /issm/trunk-jpl/externalpackages/metis/configs/4.0/macosx32/Makefile.in.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/configs/4.0/macosx32/Makefile.in.patch (revision 11101) @@ -0,0 +1,10 @@ +3,5c3 +< CC = gcc +< OBJ_EXT=o +< LIB_EXT=a +--- +> CC = cc +8c6 +< OPTFLAGS = -DLINUX -fPIC +--- +> OPTFLAGS = -O2 -m32 Index: /issm/trunk-jpl/externalpackages/metis/configs/4.0/macosx64/Makefile.in.patch =================================================================== --- /issm/trunk-jpl/externalpackages/metis/configs/4.0/macosx64/Makefile.in.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/configs/4.0/macosx64/Makefile.in.patch (revision 11101) @@ -0,0 +1,10 @@ +3,5c3 +< CC = gcc +< OBJ_EXT=o +< LIB_EXT=a +--- +> CC = cc +8c6 +< OPTFLAGS = -DLINUX -fPIC +--- +> OPTFLAGS = -O2 -m64 Index: /issm/trunk-jpl/externalpackages/metis/configs/4.0/pleiades/Makefile.in.patch =================================================================== --- /issm/trunk-jpl/externalpackages/metis/configs/4.0/pleiades/Makefile.in.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/configs/4.0/pleiades/Makefile.in.patch (revision 11101) @@ -0,0 +1,10 @@ +3,5c3 +< CC = icc +< OBJ_EXT=o +< LIB_EXT=a +--- +> CC = cc +8c6 +< OPTFLAGS = -O3 -xSSE4.2 -fPIC +--- +> OPTFLAGS = -O2 Index: /issm/trunk-jpl/externalpackages/metis/configs/4.0/win32/Makefile.in.patch =================================================================== --- /issm/trunk-jpl/externalpackages/metis/configs/4.0/win32/Makefile.in.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/configs/4.0/win32/Makefile.in.patch (revision 11101) @@ -0,0 +1,14 @@ +3,5c3,5 +< CC = gcc +< OBJ_EXT=o +< LIB_EXT=a +--- +> CC = icl +> OBJ_EXT=obj +> LIB_EXT=lib +8c8 +< OPTFLAGS = -DLINUX -fPIC +--- +> OPTFLAGS = -DWIN32 -D__VC__ +22d21 +< #RANLIB = Index: /issm/trunk-jpl/externalpackages/metis/install-4.0-altix64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-4.0-altix64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-4.0-altix64.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install metis-4.0 +mkdir install + +#Untar +tar -zxvf metis-4.0.tar.gz + +#Move metis into install directory +mv metis-4.0/* install +rm -rf metis-4.0 + +#Apply patches +cd install +patch -p1 < ../metis-4.0.patch +patch Makefile.in ../configs/4.0/altix64/Makefile.in.patch + +#Compile +make Index: /issm/trunk-jpl/externalpackages/metis/install-4.0-cosmos.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-4.0-cosmos.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-4.0-cosmos.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install metis-4.0 +mkdir install + +#Untar +tar -zxvf metis-4.0.tar.gz + +#Move metis into install directory +mv metis-4.0/* install +rm -rf metis-4.0 + +#Apply patches +cd install +patch -p1 < ../metis-4.0.patch +patch Makefile.in ../configs/4.0/cosmos/Makefile.in.patch + +#Compile +make Index: /issm/trunk-jpl/externalpackages/metis/install-4.0-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-4.0-linux64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-4.0-linux64.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install metis-4.0 +mkdir install + +#Untar +tar -zxvf metis-4.0.tar.gz + +#Move metis into install directory +mv metis-4.0/* install +rm -rf metis-4.0 + +#Apply patches +cd install +patch -p1 < ../metis-4.0.patch +patch Makefile.in ../configs/4.0/linux64/Makefile.in.patch + +#Compile +make Index: /issm/trunk-jpl/externalpackages/metis/install-4.0-macosx32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-4.0-macosx32.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-4.0-macosx32.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install metis-4.0 +mkdir install + +#Untar +tar -zxvf metis-4.0.tar.gz + +#Move metis into install directory +mv metis-4.0/* install +rm -rf metis-4.0 + +#Apply patches +cd install +patch -p1 < ../metis-4.0.patch +patch Makefile.in ../configs/4.0/macosx32/Makefile.in.patch + +#Compile +make Index: /issm/trunk-jpl/externalpackages/metis/install-4.0-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-4.0-macosx64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-4.0-macosx64.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install metis-4.0 +mkdir install + +#Untar +tar -zxvf metis-4.0.tar.gz + +#Move metis into install directory +mv metis-4.0/* install +rm -rf metis-4.0 + +#Apply patches +cd install +patch -p1 < ../metis-4.0.patch +patch Makefile.in ../configs/4.0/macosx64/Makefile.in.patch + +#Compile +make Index: /issm/trunk-jpl/externalpackages/metis/install-4.0-pleiades.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-4.0-pleiades.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-4.0-pleiades.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install metis-4.0 +mkdir install + +#Untar +tar -zxvf metis-4.0.tar.gz + +#Move metis into install directory +mv metis-4.0/* install +rm -rf metis-4.0 + +#Apply patches +cd install +patch -p1 < ../metis-4.0.patch +patch Makefile.in ../configs/4.0/pleiades/Makefile.in.patch + +#Compile +make Index: /issm/trunk-jpl/externalpackages/metis/install-4.0-win32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-4.0-win32.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-4.0-win32.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install metis-4.0 +mkdir install + +#Untar +tar -zxvf metis-4.0.tar.gz + +#Move metis into install directory +mv metis-4.0/* install +rm -rf metis-4.0 + +#Apply patches +cd install +patch -p1 < ../metis-4.0.patch +patch Makefile.in ../configs/4.0/win32/Makefile.in.patch + +#Compile +make Index: /issm/trunk-jpl/externalpackages/metis/install-5.0.1-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-5.0.1-linux64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/metis/install-5.0.1-linux64.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash +#metis 5.0 should be used: srand48 and drand48 are being redefined in conflict to the stdlib equivalent functions. + +#Some cleanup +rm -rf install metis-5.0.1 +mkdir install + +#Untar +tar -zxvf metis-5.0.1.tar.gz + +#Move metis into install directory +mv metis-5.0.1/* install +rm -rf metis-5.0.1 + +#Apply patches +cd install + +#Compile metis +make config prefix="$ISSM_TIER/externalpackages/metis/install" +make -j $1 install Index: sm/trunk-jpl/externalpackages/metis/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install.sh (revision 11100) +++ (revision ) @@ -1,46 +1,0 @@ -#!/bin/bash - -#get number of CPUS -NUMCPUS=$1; - -#version of metis -version=4.0 #outdated, srand48 and drand48 are being redefined in conflict to the stdlib equivalent functions. -#version=5.0.1 - -#Some cleanup -rm -rf install metis-$version - -#Create install directories -mkdir install - -#Untar -tar -zxvf metis-$version.tar.gz - -#Move metis into install directory -mv metis-$version/* install -rm -rf metis-$version - -#Apply patches -cd install -if [[ $version = "4.0" ]]; then -patch -p1 < ../metis-4.0.patch -patch Makefile.in ../Makefile.in.patch -fi - -#Compile metis -if [ -z $NUMCPUS ]; -then - if [[ $version = "4.0" ]]; then - make - else - make config prefix=$ISSM_TIER/externalpackages/metis/install - make install - fi -else - if [[ $version = "4.0" ]]; then - make - else - make config prefix=$ISSM_TIER/externalpackages/metis/install - make -j $NUMCPUS install - fi -fi Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/Examples.Makefile.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/Examples.Makefile.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/Examples.Makefile.patch (revision 11101) @@ -0,0 +1,6 @@ +72,73c72,73 +< cpi: cpi.o ../lib/lib${MPILIBNAME}.a +< $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} +--- +> cpi: cpi.o ../lib/lib${MPILIBNAME}.a +> $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} ../lib/libmpich.a Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/configure.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/configure.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/configure.sh (revision 11101) @@ -0,0 +1,2 @@ +#!/bin/bash +./configure --prefix="$ISSM_TIER/externalpackages/mpich2/install" --enable-sharedlibs=gcc --enable-f91=gfortran Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/mpicxx.h.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/mpicxx.h.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/altix64/mpicxx.h.patch (revision 11101) @@ -0,0 +1,12 @@ +26c26 +< //#error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +30c30 +< //#error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +35c35 +< //#error "SEEK_END is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_END is #defined but must not be for the C++ binding of MPI" Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/Examples.Makefile.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/Examples.Makefile.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/Examples.Makefile.patch (revision 11101) @@ -0,0 +1,6 @@ +72,73c72,73 +< cpi: cpi.o ../lib/lib${MPILIBNAME}.a +< $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} +--- +> cpi: cpi.o ../lib/lib${MPILIBNAME}.a +> $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} ../lib/libmpich.a Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/configure.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/configure.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/configure.sh (revision 11101) @@ -0,0 +1,4 @@ +#!/bin/bash +export CFLAGS="$CFLAGS -fPIC" +export FFLAGS="$FFLAGS -fPIC" +./configure --prefix="$ISSM_TIER/externalpackages/mpich2/install" --enable-sharedlibs=gcc --enable-f91=gfortran Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/mpicxx.h.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/mpicxx.h.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/linux64/mpicxx.h.patch (revision 11101) @@ -0,0 +1,12 @@ +26c26 +< //#error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +30c30 +< //#error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +35c35 +< //#error "SEEK_END is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_END is #defined but must not be for the C++ binding of MPI" Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/Examples.Makefile.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/Examples.Makefile.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/Examples.Makefile.patch (revision 11101) @@ -0,0 +1,6 @@ +72,73c72,73 +< cpi: cpi.o ../lib/lib${MPILIBNAME}.a +< $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} +--- +> cpi: cpi.o ../lib/lib${MPILIBNAME}.a +> $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} ../lib/libmpich.a Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/configure.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/configure.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/configure.sh (revision 11101) @@ -0,0 +1,3 @@ +#!/bin/bash +export CFLAGS=" -m32" +./configure --prefix="$ISSM_TIER/externalpackages/mpich2/install" --enable-f91=gfortran --enable-sharedlibs=osx-gcc Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/mpicxx.h.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/mpicxx.h.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/macosx32/mpicxx.h.patch (revision 11101) @@ -0,0 +1,12 @@ +26c26 +< //#error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +30c30 +< //#error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +35c35 +< //#error "SEEK_END is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_END is #defined but must not be for the C++ binding of MPI" Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/Examples.Makefile.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/Examples.Makefile.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/Examples.Makefile.patch (revision 11101) @@ -0,0 +1,6 @@ +72,73c72,73 +< cpi: cpi.o ../lib/lib${MPILIBNAME}.a +< $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} +--- +> cpi: cpi.o ../lib/lib${MPILIBNAME}.a +> $(C_LINK) $(LDFLAGS) -o cpi cpi.o -lm ${LIBS} ../lib/libmpich.a Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/configure.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/configure.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/configure.sh (revision 11101) @@ -0,0 +1,2 @@ +#!/bin/bash +./configure --prefix="$ISSM_TIER/externalpackages/mpich2/install" Index: /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/mpicxx.h.patch =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/mpicxx.h.patch (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/configs/1.0.2/win32/mpicxx.h.patch (revision 11101) @@ -0,0 +1,12 @@ +26c26 +< //#error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_SET is #defined but must not be for the C++ binding of MPI" +30c30 +< //#error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_CUR is #defined but must not be for the C++ binding of MPI" +35c35 +< //#error "SEEK_END is #defined but must not be for the C++ binding of MPI" +--- +> #error "SEEK_END is #defined but must not be for the C++ binding of MPI" Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh (revision 11101) @@ -0,0 +1,35 @@ +#!/bin/bash + +#Some cleanup +rm -rf src install mpich2-1.0.2p1 +mkdir src install + +#Untar +tar -zxvf mpich2-1.0.2p1.tar.gz + +#Move mpich2 into src directory +mv mpich2-1.0.2p1/* src +rm -rf mpich2-1.0.2p1 + +#Configure mpich2 +cd src +make distclean +export CFLAGS="$CFLAGS -fPIC" +export FFLAGS="$FFLAGS -fPIC" +./configure \ + --prefix="$ISSM_TIER/externalpackages/mpich2/install" \ + --enable-sharedlibs=gcc \ + --enable-f91=gfortran + +#Apply Patch to examples +patch ./examples/Makefile ../configs/1.0.2/altix64/Examples.Makefile.patch +patch -R ./src/binding/cxx/mpicxx.h ../configs/1.0.2/altix64/mpicxx.h.patch +patch -R ./src/include/mpicxx.h ../configs/1.0.2/altix64/mpicxx.h.patch + +#Compile mpich2 +make -j $NUMCPUS +make install + +#remove so files +cd ../install/lib +rm -rf *.so Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh (revision 11101) @@ -0,0 +1,35 @@ +#!/bin/bash + +#Some cleanup +rm -rf src install mpich2-1.0.2p1 +mkdir src install + +#Untar +tar -zxvf mpich2-1.0.2p1.tar.gz + +#Move mpich2 into src directory +mv mpich2-1.0.2p1/* src +rm -rf mpich2-1.0.2p1 + +#Configure mpich2 +cd src +make distclean +export CFLAGS="$CFLAGS -fPIC" +export FFLAGS="$FFLAGS -fPIC" +./configure \ + --prefix="$ISSM_TIER/externalpackages/mpich2/install" \ + --enable-sharedlibs=gcc \ + --enable-f91=gfortran + +#Apply Patch to examples +patch ./examples/Makefile ../configs/1.0.2/linux64/Examples.Makefile.patch +patch -R ./src/binding/cxx/mpicxx.h ../configs/1.0.2/linux64/mpicxx.h.patch +patch -R ./src/include/mpicxx.h ../configs/1.0.2/linux64/mpicxx.h.patch + +#Compile mpich2 +make -j $NUMCPUS +make install + +#remove so files +cd ../install/lib +rm -rf *.so Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh (revision 11101) @@ -0,0 +1,34 @@ +#!/bin/bash + +#Some cleanup +rm -rf src install mpich2-1.0.2p1 +mkdir src install + +#Untar +tar -zxvf mpich2-1.0.2p1.tar.gz + +#Move mpich2 into src directory +mv mpich2-1.0.2p1/* src +rm -rf mpich2-1.0.2p1 + +#Configure mpich2 +cd src +make distclean +export CFLAGS=" -m32" +./configure \ + --prefix="$ISSM_TIER/externalpackages/mpich2/install" \ + --enable-f91=gfortran \ + --enable-sharedlibs=osx-gcc + +#Apply Patch to examples +patch ./examples/Makefile ../configs/1.0.2/macosx32/Examples.Makefile.patch +patch -R ./src/binding/cxx/mpicxx.h ../configs/1.0.2/macosx32/mpicxx.h.patch +patch -R ./src/include/mpicxx.h ../configs/1.0.2/macosx32/mpicxx.h.patch + +#Compile mpich2 +make -j $NUMCPUS +make install + +#remove so files +cd ../install/lib +rm -rf *.so Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh (revision 11101) @@ -0,0 +1,32 @@ +#!/bin/bash + +#Some cleanup +rm -rf src install mpich2-1.0.2p1 +mkdir src install + +#Untar +tar -zxvf mpich2-1.0.2p1.tar.gz + +#Move mpich2 into src directory +mv mpich2-1.0.2p1/* src +rm -rf mpich2-1.0.2p1 + +#Configure mpich2 +cd src +make distclean +export CFLAGS="$CFLAGS -fPIC" +export FFLAGS="$FFLAGS -fPIC" +./configure --prefix="$ISSM_TIER/externalpackages/mpich2/install" + +#Apply Patch to examples +patch ./examples/Makefile ../configs/1.0.2/win32/Examples.Makefile.patch +patch -R ./src/binding/cxx/mpicxx.h ../configs/1.0.2/win32/mpicxx.h.patch +patch -R ./src/include/mpicxx.h ../configs/1.0.2/win32/mpicxx.h.patch + +#Compile mpich2 +make -j $NUMCPUS +make install + +#remove so files +cd ../install/lib +rm -rf *.so Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh (revision 11101) @@ -0,0 +1,30 @@ +#!/bin/bash + +#Some cleanup +rm -rf src install mpich2-1.4 +mkdir src install + +#Untar +tar -zxvf mpich2-1.4.tar.gz + +#Move mpich2 into src directory +mv mpich2-1.4/* src +rm -rf mpich2-1.4 + +#Configure mpich2 +cd src +export CFLAGS="$CFLAGS -fPIC" +export FFLAGS="$FFLAGS -fPIC" +./configure \ + --prefix="$ISSM_TIER/externalpackages/mpich2/install" \ + --enable-shared \ + --enable-sharedlibs=gcc \ + --enable-f91=gfortran + +#Compile mpich2 +make -j $1 +make install + +#remove so files +cd ../install/lib +rm -rf *.so Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh (revision 11101) @@ -0,0 +1,33 @@ +#!/bin/bash + +#Some cleanup +rm -rf src install mpich2-1.4 +mkdir src install + +#Untar +tar -zxvf mpich2-1.4.tar.gz + +#Move mpich2 into src directory +mv mpich2-1.4/* src +rm -rf mpich2-1.4 + +#Configure mpich2 +cd src +export CFLAGS=" -arch i386" +export CXXFLAGS=" -arch i386" +export CPPFLAGS=" -arch i386" +export FFLAGS=" -arch i386" +./configure \ + --prefix="$ISSM_TIER/externalpackages/mpich2/install" \ + --enable-f91=gfortran \ + --enable-sharedlibs=osx-gcc \ + --enable-shared \ + --enable-fc="/usr/local/bin/gfortran" + +#Compile mpich2 +make -j $1 +make install + +#remove so files +cd ../install/lib +rm -rf *.so Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh (revision 11101) @@ -0,0 +1,33 @@ +#!/bin/bash + +#Some cleanup +rm -rf src install mpich2-1.4 +mkdir src install + +#Untar +tar -zxvf mpich2-1.4.tar.gz + +#Move mpich2 into src directory +mv mpich2-1.4/* src +rm -rf mpich2-1.4 + +#Configure mpich2 +cd src +export FCFLAGS=" -m64" +export FFLAGS=" -m64" +export CFLAGS=" -arch x86_64" +export CXXFLAGS=" -arch x86_64" +./configure \ + --prefix="$ISSM_TIER/externalpackages/mpich2/install" \ + --enable-f91 \ + --enable-sharedlibs=osx-gcc \ + --enable-shared \ + --enable-fc + +#Compile mpich2 +make -j $1 +make install + +#remove so files +cd ../install/lib +rm -rf *.so Index: sm/trunk-jpl/externalpackages/mpich2/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install.sh (revision 11100) +++ (revision ) @@ -1,50 +1,0 @@ -#!/bin/bash - -#Get number of cpus -NUMCPUS=$1; - -#version of mpich2 -version=1.0.2p1 -#version=1.4 - -#Some cleanup -rm -rf src install mpich2-$version - -#Create src and install directories -mkdir src install - -#Untar -tar -zxvf mpich2-$version.tar.gz - -#Move mpich2 into src directory -mv mpich2-$version/* src -rm -rf mpich2-$version - -#Configure mpich2 -cd src -if [[ "$version" == "1.0.2p1" ]]; -then - make distclean -fi - -source ../configure.sh - -if [[ "$version" == "1.0.2p1" ]]; -then - #Apply Patch to examples - patch ./examples/Makefile ../Examples.Makefile.patch - patch -R ./src/binding/cxx/mpicxx.h ../mpicxx.h.patch - patch -R ./src/include/mpicxx.h ../mpicxx.h.patch -fi - -#Compile mpich2 -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi -make install - -cd ../install/lib -rm -rf *.so Index: /issm/trunk-jpl/externalpackages/ncview/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/ncview/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/ncview/install.sh (revision 11101) @@ -1,28 +1,23 @@ #!/bin/bash - -#version of doxygen -#version="2.0beta4" -version="1.93g" #Some cleanup rm -rf install - -#Create install directories mkdir install #Untar -tar -zxvf ncview-$version.tar.gz +tar -zxvf ncview-1.93g.tar.gz #Move doxygen into src directory -mv ncview-$version/* install -rmdir ncview-$version +mv ncview-1.93g/* install +rmdir ncview-1.93g #Configure doxygen cd install -./configure --prefix "$ISSM_TIER/externalpackages/ncview/install" \ ---x-libraries=/usr/X11/lib/ \ ---x-includes=/usr/X11/include/ \ ---with-netcdf_incdir="$ISSM_TIER/externalpackages/netcdf/install/include/" \ ---with-netcdf_libdir="$ISSM_TIER/externalpackages/netcdf/install/lib/" +./configure \ + --prefix "$ISSM_TIER/externalpackages/ncview/install" \ + --x-libraries=/usr/X11/lib/ \ + --x-includes=/usr/X11/include/ \ + --with-netcdf_incdir="$ISSM_TIER/externalpackages/netcdf/install/include/" \ + --with-netcdf_libdir="$ISSM_TIER/externalpackages/netcdf/install/lib/" make Index: /issm/trunk-jpl/externalpackages/netcdf/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/netcdf/install.sh (revision 11101) @@ -1,35 +1,19 @@ #!/bin/bash -#Get number of cpus on current platform -NUMCPUS=$1; - -#version of netcdf -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/netcdf-//g'` - #Some cleanup -rm -rf install netcdf-$version - -#Create install directories +rm -rf install netcdf-4.0.1 mkdir install #Untar -tar -zxvf netcdf-$version.tar.gz +tar -zxvf netcdf-4.0.1.tar.gz #Move netcdf to install directory rm -rf install/* -mv netcdf-$version/* install/ -rm -rf netcdf-$version +mv netcdf-4.0.1/* install/ +rm -rf netcdf-4.0.1 -#Configure netcdf +#Configure and compile cd install ./configure --prefix="$ISSM_TIER/externalpackages/netcdf/install" - -#Compile and install netcdf -if [ -z $NUMCPUS ]; -then - make - make install -else - make -j $NUMCPUS - make -j $NUMCPUS install -fi +make -j $NUMCPUS +make -j $NUMCPUS install Index: /issm/trunk-jpl/externalpackages/oofem/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/oofem/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/oofem/install.sh (revision 11101) @@ -1,36 +1,24 @@ #!/bin/bash - -#Get number of cpus on current platform -NUMCPUS=$1; - -#version of doxygen -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/oofem-//g'` #Some cleanup rm -rf src -rm -rf oofem-$version - -#Create src and install directories +rm -rf oofem-2.0 mkdir src #Untar -tar -zxvf oofem-$version.tar.gz +tar -zxvf oofem-2.0.tar.gz #Move oofem into src directory -mv oofem-$version/* src -rm -rf oofem-$version +mv oofem-2.0/* src +rm -rf oofem-2.0 # currently a basic serial configuration, see http://www.oofem.org/wiki/doku.php?id=installation # for details on enabling the IML++ and PETSc libraries, and for configuring the parallel version -cd src && ./configure OOFEM_TARGET=oofem-$version --enable-dss && cd targets/oofem-$version +cd src +./configure OOFEM_TARGET=oofem-2.0 --enable-dss #Compile oofem -if [ -z $NUMCPUS ]; -then - make - - else - make -j $NUMCPUS -fi +cd targets/oofem-2.0 +make -j $1 # build verification tools @@ -38,3 +26,3 @@ # testing solver -cd ../targets/oofem-$version && make tests && less ./test_results +cd ../targets/oofem-2.0 && make tests && less ./test_results Index: /issm/trunk-jpl/externalpackages/openanalysis/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/openanalysis/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/openanalysis/install.sh (revision 11101) @@ -1,6 +1,3 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; #Some cleanup @@ -10,5 +7,4 @@ svn co http://svn.berlios.de/svnroot/repos/openanalysis/OpenAnalysis/trunk openanalysis - #Configure cd openanalysis Index: /issm/trunk-jpl/externalpackages/polygonclipper/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/polygonclipper/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/polygonclipper/install.sh (revision 11101) @@ -1,17 +1,14 @@ #!/bin/bash - -#m2html name -name=`echo *.zip | sed 's/\.zip//g'` #Some cleanup rm -rf install -#Create src and install directories +#install mkdir install cd install -cp ../$name.zip . +cp ../PolygonClipper.zip . #uncompress -unzip $name.zip +unzip PolygonClipper.zip #Make Index: /issm/trunk-jpl/externalpackages/qhull/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/qhull/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/qhull/install.sh (revision 11101) @@ -1,36 +1,19 @@ #!/bin/bash -#Get number of cpus on current platform -NUMCPUS=$1; - -#version of qhull -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/qhull-//g'` - #Some cleanup -rm -rf src install qhull-$version - -#Create src and install directories +rm -rf src install qhull-2003.1 mkdir src install #Untar -tar -zxvf qhull-$version.tar.gz +tar -zxvf qhull-2003.1.tar.gz #Move qhull to src directory rm -rf src/* -mv qhull-$version/* src/ -rm -rf qhull-$version +mv qhull-2003.1/* src/ +rm -rf qhull-2003.1 #Configure qhull cd src - ./configure --prefix="$ISSM_TIER/externalpackages/qhull/install" - -#Compile qhull and install it -if [ -z $NUMCPUS ]; -then - make - make install -else - make -j $NUMCPUS - make -j $NUMCPUS install -fi +make -j $1 +make -j $1 install Index: /issm/trunk-jpl/externalpackages/rats/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/rats/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/rats/install.sh (revision 11101) @@ -1,27 +1,17 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - - -#version of rats -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/rats-//g'` - #Erase install -rm -rf install src rats-$version +rm -rf install src rats-2.3 #install directory mkdir src - -tar -zxvf rats-$version.tar.gz - - -mv rats-$version/* src -rm -rf rats-$version +tar -zxvf rats-2.3.tar.gz +mv rats-2.3/* src +rm -rf rats-2.3 #compile cd src ./configure --prefix=$ISSM_TIER/externalpackages/rats/install -make -j $NUMCPUS +make -j $1 make install cd .. Index: /issm/trunk-jpl/externalpackages/rose/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/rose/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/rose/install.sh (revision 11101) @@ -1,30 +1,21 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; - -#version of rose -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/rose-//g'` -echo $version #Some cleanup rm -rf source build install - -#Create install directories mkdir install source build #Untar -tar -zxvf rose-$version.tar.gz +tar -zxvf rose-0.9.5a-13219.tar.gz #Move rose into install directory -mv rose-$version/* source -rm -rf rose-$version - -cd build +mv rose-0.9.5a-13219/* source +rm -rf rose-0.9.5a-13219 #Configure -../source/configure --prefix=$ISSM_TIER/externalpackages/rose/install \ - --with-boost=$ISSM_TIER/externalpackages/boost/install\ - --srcdir=$ISSM_TIER/externalpackages/rose/source +cd build +../source/configure \ + --prefix=$ISSM_TIER/externalpackages/rose/install \ + --with-boost=$ISSM_TIER/externalpackages/boost/install\ + --srcdir=$ISSM_TIER/externalpackages/rose/source make -j $NUMCPUS Index: /issm/trunk-jpl/externalpackages/satstress/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/satstress/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/satstress/install.sh (revision 11101) @@ -1,23 +1,14 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - -#version of SatStress -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/SatStress-//g'` -echo $version - #Some cleanup -rm -rf install SatStress-$version - -#Create install directories +rm -rf install SatStress-0.1.2 mkdir install #Untar -tar -zxvf SatStress-$version.tar.gz +tar -zxvf SatStress-0.1.2.tar.gz #Move SatStress into install directory -mv SatStress-$version/* install -rm -rf SatStress-$version +mv SatStress-0.1.2/* install +rm -rf SatStress-0.1.2 #Compile SatStress Index: /issm/trunk-jpl/externalpackages/shapelib/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/shapelib/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/shapelib/install.sh (revision 11101) @@ -1,6 +1,3 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; # Some cleanup @@ -8,6 +5,4 @@ rm -rf src rm -rf install - -# Create src and install directories mkdir src install @@ -26,5 +21,5 @@ # Build shapelib and run self-tests cd src -make -j $NUMCPUS +make -j $1 make test @@ -50,3 +45,2 @@ mv src/shputils install/exec mv src/shptest install/exec - Index: /issm/trunk-jpl/externalpackages/slepc/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/slepc/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/slepc/install.sh (revision 11101) @@ -1,30 +1,17 @@ #!/bin/bash -#Get number of cpus on current platform -NUMCPUS=$1; - -#version of slepc -version=`echo *.tgz | sed 's/\.tgz//g' | sed 's/slepc-//g'` - #Some cleanup -rm -rf install slepc-$version - -#Create install directories +rm -rf install slepc-2.3.2 mkdir install #Untar -tar -zxvf slepc-$version.tgz +tar -zxvf slepc-2.3.2.tgz #Move slepc to install directory -mv slepc-$version/* install/ -rm -rf slepc-$version +mv slepc-2.3.2/* install/ +rm -rf slepc-2.3.2 #Make slepc cd install ./config/configure.py -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi +make -j $1 Index: /issm/trunk-jpl/externalpackages/tao/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/tao/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/tao/install.sh (revision 11101) @@ -1,26 +1,17 @@ #!/bin/bash -#Get number of cpus on current platform -NUMCPUS=$1; - -#version -version='1.10.1-p1' - #Some cleanup -rm -rf install tao-$version - -#Create src and install directories +rm -rf install tao-1.10.1-p1 mkdir install #Untar -tar -zxvf tao-$version.tar.gz +tar -zxvf tao-1.10.1-p1.tar.gz #move into place -mv tao-$version/* install/ -rm -rf tao-$version +mv tao-1.10.1-p1/* install/ +rm -rf tao-1.10.1-p1 cd install - export TAO_DIR="$ISSM_TIER/externalpackages/tao/install/" -#recomplie petsc with --with-clanguage=C++ +#petsc needs to be compiled with --with-clanguage=C++ make Index: /issm/trunk-jpl/externalpackages/tex2im/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/tex2im/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/tex2im/install.sh (revision 11101) @@ -1,16 +1,12 @@ #!/bin/bash - -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/tex2im-//g'` #Some cleanup rm -rf install - -#Create install mkdir install #Untar -tar -zxvf tex2im-$version.tar.gz +tar -zxvf tex2im-1.8.tar.gz #Move tex2im into src directory -mv tex2im-$version/tex2im install/ -rm -rf tex2im-$version +mv tex2im-1.8/tex2im install/ +rm -rf tex2im-1.8 Index: /issm/trunk-jpl/externalpackages/valgrind/install-altix64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/install-altix64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/valgrind/install-altix64.sh (revision 11101) @@ -0,0 +1,24 @@ +#!/bin/bash + +#Some cleanup +rm -rf install valgrind-3.6.0 +mkdir install + +#Untar +tar -jxvf valgrind-3.6.0.tar.bz2 + +#Move valgrind into install directory +mv valgrind-3.6.0/* install +rm -rf valgrind-3.6.0 + +#configure +cd install +./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install" + +#Compile valgrind +make -j 4 +make install + +#final thing: if mpi is compiled in, soft link its target to a simpler name +cd lib +ln -s valgrind/libmpi* ./libmpidebug.so Index: /issm/trunk-jpl/externalpackages/valgrind/install-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/install-linux64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/valgrind/install-linux64.sh (revision 11101) @@ -0,0 +1,24 @@ +#!/bin/bash + +#Some cleanup +rm -rf install valgrind-3.6.0 +mkdir install + +#Untar +tar -jxvf valgrind-3.6.0.tar.bz2 + +#Move valgrind into install directory +mv valgrind-3.6.0/* install +rm -rf valgrind-3.6.0 + +#configure +cd install +./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install" + +#Compile valgrind +make -j 4 +make install + +#final thing: if mpi is compiled in, soft link its target to a simpler name +cd lib +ln -s valgrind/libmpi* ./libmpidebug.so Index: /issm/trunk-jpl/externalpackages/valgrind/install-macosx32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/install-macosx32.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/valgrind/install-macosx32.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install valgrind-3.6.0 +mkdir install + +#Untar +tar -jxvf valgrind-3.6.0.tar.bz2 + +#Move valgrind into install directory +mv valgrind-3.6.0/* install +rm -rf valgrind-3.6.0 + +#configure +cd install +./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install" --enable-only32bit + +#Compile valgrind +make -j 4 +make install Index: /issm/trunk-jpl/externalpackages/valgrind/install-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/install-macosx64.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/valgrind/install-macosx64.sh (revision 11101) @@ -0,0 +1,20 @@ +#!/bin/bash + +#Some cleanup +rm -rf install valgrind-3.6.0 +mkdir install + +#Untar +tar -jxvf valgrind-3.6.0.tar.bz2 + +#Move valgrind into install directory +mv valgrind-3.6.0/* install +rm -rf valgrind-3.6.0 + +#configure +cd install +./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install" --enable-only64bit + +#Compile valgrind +make -j 4 +make install Index: /issm/trunk-jpl/externalpackages/valgrind/install-win32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/install-win32.sh (revision 11101) +++ /issm/trunk-jpl/externalpackages/valgrind/install-win32.sh (revision 11101) @@ -0,0 +1,24 @@ +#!/bin/bash + +#Some cleanup +rm -rf install valgrind-3.6.0 +mkdir install + +#Untar +tar -jxvf valgrind-3.6.0.tar.bz2 + +#Move valgrind into install directory +mv valgrind-3.6.0/* install +rm -rf valgrind-3.6.0 + +#configure +cd install +./configure --prefix="$ISSM_TIER/externalpackages/valgrind/install" + +#Compile valgrind +make -j 4 +make install + +#final thing: if mpi is compiled in, soft link its target to a simpler name +cd lib +ln -s valgrind/libmpi* ./libmpidebug.so Index: sm/trunk-jpl/externalpackages/valgrind/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/valgrind/install.sh (revision 11100) +++ (revision ) @@ -1,36 +1,0 @@ -#!/bin/bash - -#Get number of cpus on current platform -NUMCPUS=4 - -#version of valgrind -version=`echo *.tar.bz2 | sed 's/\.tar\.bz2//g' | sed 's/valgrind-//g'` - -#Some cleanup -rm -rf install valgrind-$version - -#Create install directories -mkdir install - -#Untar -#tar -zxvf valgrind-$version.tar.gz -tar -jxvf valgrind-$version.tar.bz2 - -#Move valgrind into install directory -mv valgrind-$version/* install -rm -rf valgrind-$version - -cd install - -#configure -../configure.sh - -#Compile valgrind -make -j $NUMCPUS - -make install - -#final thing: if mpi is compiled in, soft link its target to a simpler name -cd lib -ln -s valgrind/libmpi* ./libmpidebug.so - Index: /issm/trunk-jpl/externalpackages/vim/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/vim/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/vim/install.sh (revision 11101) @@ -1,39 +1,26 @@ #!/bin/bash - -#Get number of cpus on current platform -NUMCPUS=$1; - -#version of vim -version=`echo *.tar.bz2 | sed 's/\.tar\.bz2//g' | sed 's/vim-//g'` #ex 7.2 -version2=$(echo $version | sed -e "s/\.//g") #ex: 72 #Some cleanup rm -rf install src -rm -rf vim$version2 - -#Create src and install directories +rm -rf vim72 mkdir install src #Untar -bzip2 -d -k vim-$version.tar.bz2 -tar -xvf vim-$version.tar -rm vim-$version.tar +bzip2 -d -k vim-7.2.tar.bz2 +tar -xvf vim-7.2.tar +rm vim-7.2.tar #Move vim into install directory -mv vim$version2/* src -rm -rf vim$version2 +mv vim72/* src +rm -rf vim72 #Configure vim (icc seems to have issues with wctype.h) export CC=gcc -cd src/src && ./configure --prefix "$ISSM_TIER/externalpackages/vim/install" --with-gcc "/usr/bin/gcc" +cd src/src +./configure \ + --prefix "$ISSM_TIER/externalpackages/vim/install" \ + --with-gcc "/usr/bin/gcc" #Compile vim -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi - -#Install vim +make -j $1 make install Index: /issm/trunk-jpl/externalpackages/xaifbooster/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/xaifbooster/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/xaifbooster/install.sh (revision 11101) @@ -1,6 +1,3 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; #Some cleanup @@ -10,11 +7,5 @@ svn co -r 125 http://hpc.svn.rice.edu/r/xaifBooster/trunk xaifBooster +#Compile xaifBooster cd xaifBooster - -#Compile xaifBooster -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi +make -j $1 Index: /issm/trunk-jpl/externalpackages/xerces/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/xerces/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/xerces/install.sh (revision 11101) @@ -1,23 +1,14 @@ #!/bin/bash -#get number of CPUS -NUMCPUS=$1; - -#version of xerces-c-tools -version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/xerces-c-//g'` -echo $version - #Some cleanup -rm -rf install xerces-c-$version src - -#Create install directories +rm -rf install xerces-c-src_2_8_0 src mkdir install src #Untar -tar -zxvf xerces-c-$version.tar.gz +tar -zxvf xerces-c-src_2_8_0.tar.gz #Move xerces-c-tools into install directory -mv xerces-c-$version/* src -rm -rf xerces-c-$version +mv xerces-c-src_2_8_0/* src +rm -rf xerces-c-src_2_8_0 #Apply patches @@ -28,8 +19,3 @@ #Compile xerces-c-tools -if [ -z $NUMCPUS ]; -then - make -else - make -j $NUMCPUS -fi +make -j $1 Index: /issm/trunk-jpl/externalpackages/yams/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/yams/install.sh (revision 11100) +++ /issm/trunk-jpl/externalpackages/yams/install.sh (revision 11101) @@ -3,6 +3,4 @@ #Some cleanup rm -rf install - -#Create src and install directories mkdir install