Changeset 13371


Ignore:
Timestamp:
09/14/12 11:16:00 (13 years ago)
Author:
Mathieu Morlighem
Message:

CHG: cosmetics

Location:
issm/trunk-jpl/externalpackages
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh

    r13370 r13371  
    11#/bin/bash
    22set -eu
    3 pythonversion=2.7
    4 PYTHON=python${pythonversion}
    5 
    63export GIT_SSL_NO_VERIFY=true
    74export CC="gcc -fPIC "
    … …  
    118export FFLAGS=-ff2c
    129
    13 
    1410git clone https://github.com/matplotlib/matplotlib
    1511mv matplotlib src

  • issm/trunk-jpl/externalpackages/matplotlib/install-macosx64.sh

    r13370 r13371  
    11#/bin/bash
    22set -eu
    3 pythonversion=2.7
    4 PYTHON=python${pythonversion}
    53
    64export C_INCLUDE_PATH="$C_INCLUDE_PATH:/usr/include/c++/4.2.1"
    … …  
    1210export FFLAGS="-ff2c -arch x86_64 -I/usr/include/c++/4.2.1"
    1311export ARCHFLAGS="-arch x86_64 -I/usr/include/c++/4.2.1"
    14 
    15 
    1612
    1713git clone https://github.com/matplotlib/matplotlib
    … …  
    2521#sudo make -f make.osx PREFIX=$ISSM_DIR/externalpackages/matplotlib/deps PYVERSION=$pythonversion fetch deps mpl_install_std
    2622#sudo make -f make.osx PREFIX=$ISSM_DIR/externalpackages/matplotlib/deps PYVERSION=$pythonversion mpl_install_std
    27 #${PYTHON} -c "import matplotlib; print 'Installed matplotlib', matplotlib.__version__, matplotlib.__file__"
     23#python -c "import matplotlib; print 'Installed matplotlib', matplotlib.__version__, matplotlib.__file__"
    2824
    29 
    30 #to be tried:  first get freetype and  zlib and libpng installed in sudo mode
     25#to be tried:  first get freetype and zlib and libpng installed in sudo mode
    3126python setup.py build
    3227python setup.py install

  • issm/trunk-jpl/externalpackages/numpy/install-linux64.sh

    r13264 r13371  
    11#!/bin/bash
    22set -eu
    3 PYVERSION=2.7
    4 PYTHON=python${PYVERSION}
    53
    64export CC="gcc -fPIC"
    … …  
    2220python setup.py install
    2321cd ..
    24 ${PYTHON} -c "import numpy; print 'Installed NumPy', numpy.__version__"
    25 ${PYTHON} -c "import numpy; numpy.test()"
     22python -c "import numpy; print 'Installed NumPy', numpy.__version__"
     23python -c "import numpy; numpy.test()"

  • issm/trunk-jpl/externalpackages/numpy/install-macosx-snowleopard.sh

    r13266 r13371  
    11#!/bin/bash
    2 PYVERSION=2.7
    3 PYTHON=python${PYVERSION}
     2set -eu
    43
    5 # gfortran 4.6 (see ISSM_DIR/externalpackages/gfortran) is necessary for ISSM compilation.
    6 # On OSX 10.6, this recommended version gets installed in /usr/local/gfortran
    7 export CC=/usr/local/gfortran/bin/gcc
    8 export CXX=/usr/local/gfortran/bin/g++
     4# On OSX 10.6, gfortran gets installed in /usr/local/gfortran
     5export CC="/usr/local/gfortran/bin/gcc"
     6export CXX="/usr/local/gfortran/bin/g++"
    97
    108#download numpy first
    … …  
    1614python setup.py install
    1715cd ..
    18 ${PYTHON} -c "import numpy; print 'Installed NumPy', numpy.__version__"
    19 ${PYTHON} -c "import numpy; numpy.test()"
     16python -c "import numpy; print 'Installed NumPy', numpy.__version__"
     17python -c "import numpy; numpy.test()"

  • issm/trunk-jpl/externalpackages/scipy/install-linux64.sh

    r13264 r13371  
    11#!/bin/bash
    22set -eu
    3 PYVERSION=2.7
    4 PYTHON=python${PYVERSION}
    53
    64export CC="gcc -fPIC"
    … …  
    2725python setup.py install
    2826cd ..
    29 ${PYTHON} -c "import scipy; print 'Installed SciPy', scipy.__version__"
    30 ##${PYTHON} -c "import scipy; scipy.test()"
     27python -c "import scipy; print 'Installed SciPy', scipy.__version__"
     28#python -c "import scipy; scipy.test()"

  • issm/trunk-jpl/externalpackages/scipy/install-macosx-snowleopard.sh

    r13264 r13371  
    11#!/bin/bash
    22set -eu
    3 PYVERSION=2.7
    4 PYTHON=python${PYVERSION}
    53
    6 # gfortran 4.6 (see ISSM_DIR/externalpackages/gfortran) is necessary for ISSM compilation.
    7 # On OSX 10.6, this recommended version gets installed in /usr/local/gfortran
    8 export CC=/usr/local/gfortran/bin/gcc
    9 export CXX=/usr/local/gfortran/bin/g++
     4# On OSX 10.6, fgortran gets installed in /usr/local/gfortran
     5export CC="/usr/local/gfortran/bin/gcc"
     6export CXX="/usr/local/gfortran/bin/g++"
    107
    118#download scipy
    … …  
    1714python setup.py install
    1815cd ..
    19 ${PYTHON} -c "import scipy; print 'Installed SciPy', scipy.__version__"
    20 ${PYTHON} -c "import scipy; scipy.test()"
     16python -c "import scipy; print 'Installed SciPy', scipy.__version__"
     17python -c "import scipy; scipy.test()"
Note: See TracChangeset for help on using the changeset viewer.