Changeset 25982


Ignore:
Timestamp:
02/05/21 11:35:30 (4 years ago)
Author:
jdquinn
Message:

CHG: Cleanup

Location:
issm/trunk-jpl
Files:
1 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified issm/trunk-jpl/externalpackages/autotools/install-linux.sh

    r25959 r25982  
    1010M4_VER="1.4.18"
    1111
     12PREFIX="${ISSM_DIR}/externalpackages/autotools/install" # Set to location where external package should be installed
     13
    1214## Environment
    1315#
    14 export PATH="${ISSM_DIR}/externalpackages/autotools/install/bin:$PATH"
     16export PATH="${PREFIX}/bin:${PATH}"
    1517
    1618# Cleanup
    17 rm -rf install src
    18 mkdir install
     19rm -rf ${PREFIX} src
     20mkdir -p ${PREFIX}
    1921
    2022# Install m4
    21 echo " === INSTALLING M4 =="
     23echo " === INSTALLING M4 ==="
    2224${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m4-${M4_VER}.tar.gz" "m4-${M4_VER}.tar.gz"
    2325tar -zxvf m4-${M4_VER}.tar.gz
    … …  
    3234echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h
    3335
    34 ./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
     36./configure --prefix="${PREFIX}"
    3537if [ $# -eq 0 ]; then
    3638        make
    … …  
    4345
    4446# Install Autoconf
    45 echo " === INSTALLING AUTOCONF =="
     47echo " === INSTALLING AUTOCONF ==="
    4648rm -rf src
    4749${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/autoconf-${AUTOCONF_VER}.tar.gz" "autoconf-${AUTOCONF_VER}.tar.gz"
    … …  
    4951mv autoconf-${AUTOCONF_VER} src
    5052cd src
    51 ./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
     53./configure --prefix="${PREFIX}"
    5254if [ $# -eq 0 ]; then
    5355        make
    … …  
    5860fi
    5961cd ..
    60 
    6162# Install Automake
    62 echo " === INSTALLING AUTOMAKE =="
     63echo " === INSTALLING AUTOMAKE ==="
    6364rm -rf src
    6465${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/automake-${AUTOMAKE_VER}.tar.gz" "automake-${AUTOMAKE_VER}.tar.gz"
    … …  
    6667mv automake-${AUTOMAKE_VER} src
    6768cd src
    68 ./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
     69./configure --prefix="${PREFIX}"
    6970if [ $# -eq 0 ]; then
    7071        make
    … …  
    7778
    7879# Install libtool
    79 echo " === INSTALLING LIBTOOL =="
     80echo " === INSTALLING LIBTOOL ==="
    8081rm -rf src
    8182${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/libtool-${LIBTOOL_VER}.tar.gz" "libtool-${LIBTOOL_VER}.tar.gz"
    8283tar -zxvf libtool-${LIBTOOL_VER}.tar.gz
    83 rm libtool-${LIBTOOL_VER}.tar.gz
    8484mv libtool-${LIBTOOL_VER} src
    8585cd src
    86 ./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
     86./configure --prefix="${PREFIX}"
    8787if [ $# -eq 0 ]; then
    8888        make

  • TabularUnified issm/trunk-jpl/externalpackages/autotools/install-win.sh

    r23435 r25982  
    22set -eu
    33
     4
     5## Constants
     6#
    47AUTOCONF_VER="2.69"
    5 AUTOMAKE_MIN_VER="1.16"
    6 AUTOMAKE_BUILD_VER="${AUTOMAKE_MIN_VER}.1"
     8AUTOMAKE_VER="1.16.1"
    79LIBTOOL_VER="2.4.2"
    8 M4_VER="1.4.17"
     10M4_VER="1.4.18"
    911
    10 AUTOCONF="autoconf-${AUTOCONF_VER}"
    11 AUTOMAKE="automake-${AUTOMAKE_BUILD_VER}"
    12 LIBTOOL="libtool-${LIBTOOL_VER}"
    13 M4="m4-${M4_VER}"
     12PREFIX="${ISSM_DIR}/externalpackages/autotools/install" # Set to location where external package should be installed
    1413
    15 AUTOCONF_TARBALL="${AUTOCONF}.tar.gz"
    16 AUTOMAKE_TARBALL="${AUTOMAKE}.tar.gz"
    17 LIBTOOL_TARBALL="${LIBTOOL}.tar.gz"
    18 M4_TARBALL="${M4}.tar.gz"
     14## Environment
     15#
     16export PATH="${PREFIX}/bin:${PATH}"
    1917
    20 # Clean up existing assets
    21 rm -rf install src
    22 
    23 # Set up for installation
    24 mkdir install
    25 export PATH="$ISSM_DIR/externalpackages/autotools/install/bin:$PATH"
     18# Cleanup
     19rm -rf ${PREFIX} src
     20mkdir -p ${PREFIX}
    2621
    2722# Install m4
    28 echo " === INSTALLING M4 =="
    29 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${M4_TARBALL}" $M4_TARBALL
    30 tar -zxvf $M4_TARBALL
    31 rm -f $M4_TARBALL
    32 mv $M4 src
     23echo " === INSTALLING M4 ==="
     24${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m4-${M4_VER}.tar.gz" "m4-${M4_VER}.tar.gz"
     25tar -zxvf m4-${M4_VER}.tar.gz
     26mv m4-${M4_VER} src
    3327cd src
    34 ./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
    35 make
    36 make install
     28
     29./configure --prefix="${PREFIX}"
     30if [ $# -eq 0 ]; then
     31        make
     32        make install
     33else
     34        make -j $1
     35        make -j $1 install
     36fi
    3737cd ..
    3838
    39 # Install autoconf
     39# Install Autoconf
    4040echo " === INSTALLING AUTOCONF =="
    4141rm -rf src
    42 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOCONF_TARBALL}" $AUTOCONF_TARBALL
    43 tar -zxvf $AUTOCONF_TARBALL
    44 rm -f $AUTOCONF_TARBALL
    45 mv $AUTOCONF src
     42${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/autoconf-${AUTOCONF_VER}.tar.gz" "autoconf-${AUTOCONF_VER}.tar.gz"
     43tar -zxvf autoconf-${AUTOCONF_VER}.tar.gz
     44mv autoconf-${AUTOCONF_VER} src
    4645cd src
    47 ./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
    48 make
    49 make install
     46./configure --prefix="${PREFIX}"
     47if [ $# -eq 0 ]; then
     48        make
     49        make install
     50else
     51        make -j $1
     52        make -j $1 install
     53fi
    5054cd ..
    5155
    52 # Install automake
    53 echo " === INSTALLING AUTOMAKE =="
     56# Install Automake
     57echo " === INSTALLING AUTOMAKE ==="
    5458rm -rf src
    55 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOMAKE_TARBALL}" $AUTOMAKE_TARBALL
    56 tar -zxvf $AUTOMAKE_TARBALL
    57 rm -f $AUTOMAKE_TARBALL
    58 mv $AUTOMAKE src
     59${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/automake-${AUTOMAKE_VER}.tar.gz" "automake-${AUTOMAKE_VER}.tar.gz"
     60tar -zxvf automake-${AUTOMAKE_VER}.tar.gz
     61mv automake-${AUTOMAKE_VER} src
    5962cd src
    60 ./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
    61 make
    62 make install
     63./configure --prefix="${PREFIX}"
     64if [ $# -eq 0 ]; then
     65        make
     66        make install
     67else
     68        make -j $1
     69        make -j $1 install
     70fi
    6371cd ..
    6472
    6573# Install libtool
    66 echo " === INSTALLING LIBTOOL =="
     74echo " === INSTALLING LIBTOOL ==="
    6775rm -rf src
    68 $ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${LIBTOOL_TARBALL}" $LIBTOOL_TARBALL
    69 tar -zxvf $LIBTOOL_TARBALL
    70 rm -f $LIBTOOL_TARBALL
    71 mv $LIBTOOL src
     76${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/libtool-${LIBTOOL_VER}.tar.gz" "libtool-${LIBTOOL_VER}.tar.gz"
     77tar -zxvf libtool-${LIBTOOL_VER}.tar.gz
     78mv libtool-${LIBTOOL_VER} src
    7279cd src
    73 ./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
    74 make
    75 make install
     80./configure --prefix="${PREFIX}"
     81if [ $# -eq 0 ]; then
     82        make
     83        make install
     84else
     85        make -j $1
     86        make -j $1 install
     87fi
    7688cd ..
    7789

  • TabularUnified issm/trunk-jpl/jenkins/linux64_caladan_ad

    r24829 r25982  
    3131#List of external pakages to be installed and their installation scripts
    3232EXTERNALPACKAGES="
    33         autotools       install.sh
     33        autotools       install-linux.sh
    3434        cmake           install.sh
    3535        mpich           install-3.2-linux64.sh

  • TabularUnified issm/trunk-jpl/jenkins/linux64_caladan_ampi

    r25801 r25982  
    4040#List of external pakages to be installed and their installation scripts
    4141EXTERNALPACKAGES="
    42         autotools               install.sh
     42        autotools               install-linux.sh
    4343        cmake                   install.sh
    4444        mpich                   install-3.2-linux64.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion

    r25801 r25982  
    4040#
    4141EXTERNALPACKAGES="
    42         autotools               install.sh
     42        autotools               install-mac.sh
    4343        cmake                   install.sh
    4444        petsc                   install-3.12-mac.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-basic

    r25820 r25982  
    3232# List of external pakages to be installed and their installation scripts
    3333EXTERNALPACKAGES="
    34         autotools       install.sh
     34        autotools       install-mac.sh
    3535        cmake           install.sh
    3636        petsc           install-3.12-mac.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab

    r25860 r25982  
    4242
    4343EXTERNALPACKAGES="
    44         autotools       install.sh
     44        autotools       install-mac.sh
    4545        cmake           install.sh
    4646        petsc           install-3.12-mac-static.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-binaries-python

    r25881 r25982  
    4040
    4141EXTERNALPACKAGES="
    42         autotools       install.sh
     42        autotools       install-mac.sh
    4343        cmake           install.sh
    4444        petsc           install-3.12-mac-static.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-dakota

    r25860 r25982  
    3838#List of external pakages to be installed and their installation scripts
    3939EXTERNALPACKAGES="
    40         autotools               install.sh
    41         cmake                   install.sh
    42         petsc                   install-3.12-mac.sh
    43         gsl                             install.sh
    44         boost                   install-1.7-mac.sh
    45         dakota                  install-6.2-mac.sh
    46         curl                    install-7-mac.sh
    47         netcdf                  install-4.7-parallel.sh
    48         proj                    install-6.2.sh
    49         gdal                    install-3-python.sh
    50         gshhg                   install.sh
    51         gmt                             install-6-mac.sh
    52         gmsh                    install-4.sh
    53         triangle                install-mac.sh
    54         chaco                   install.sh
    55         m1qn3                   install.sh
    56         semic                   install.sh
    57         shell2junit             install.sh
     40        autotools       install-mac.sh
     41        cmake           install.sh
     42        petsc           install-3.12-mac.sh
     43        gsl                     install.sh
     44        boost           install-1.7-mac.sh
     45        dakota          install-6.2-mac.sh
     46        curl            install-7-mac.sh
     47        netcdf          install-4.7-parallel.sh
     48        proj            install-6.2.sh
     49        gdal            install-3-python.sh
     50        gshhg           install.sh
     51        gmt                     install-6-mac.sh
     52        gmsh            install-4.sh
     53        triangle        install-mac.sh
     54        chaco           install.sh
     55        m1qn3           install.sh
     56        semic           install.sh
     57        shell2junit     install.sh
    5858"
    5959

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-examples

    r25959 r25982  
    3939
    4040EXTERNALPACKAGES="
    41         autotools       install.sh
     41        autotools       install-mac.sh
    4242        cmake           install.sh
    4343        petsc           install-3.12-mac.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-full

    r25860 r25982  
    4040
    4141EXTERNALPACKAGES="
    42         autotools       install.sh
     42        autotools       install-mac.sh
    4343        cmake           install.sh
    4444        petsc           install-3.12-mac.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-full-valgrind

    r25860 r25982  
    4040
    4141EXTERNALPACKAGES="
    42         autotools       install.sh
     42        autotools       install-mac.sh
    4343        cmake           install.sh
    4444        petsc           install-3.12-mac.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-python

    r25860 r25982  
    3535# List of external pakages to be installed and their installation scripts
    3636EXTERNALPACKAGES="
    37         autotools       install.sh
     37        autotools       install-mac.sh
    3838        cmake           install.sh
    3939        petsc           install-3.12-mac.sh

  • TabularUnified issm/trunk-jpl/jenkins/pine_island-mac-solid_earth

    r25963 r25982  
    3838#List of external pakages to be installed and their installation scripts
    3939EXTERNALPACKAGES="
    40         autotools               install.sh
    41         cmake                   install.sh
    42         petsc                   install-3.12-mac.sh
    43         gsl                             install.sh
    44         boost                   install-1.7-mac.sh
    45         dakota                  install-6.2-mac.sh
    46         curl                    install-7-mac.sh
    47         netcdf                  install-4.7-parallel.sh
    48         proj                    install-6.2.sh
    49         gdal                    install-3-python.sh
    50         gshhg                   install.sh
    51         gmt                             install-6-mac.sh
    52         gmsh                    install-4.sh
    53         triangle                install-mac.sh
    54         chaco                   install.sh
    55         m1qn3                   install.sh
    56         semic                   install.sh
    57         shell2junit             install.sh
     40        autotools       install-mac.sh
     41        cmake           install.sh
     42        petsc           install-3.12-mac.sh
     43        gsl                     install.sh
     44        boost           install-1.7-mac.sh
     45        dakota          install-6.2-mac.sh
     46        curl            install-7-mac.sh
     47        netcdf          install-4.7-parallel.sh
     48        proj            install-6.2.sh
     49        gdal            install-3-python.sh
     50        gshhg           install.sh
     51        gmt                     install-6-mac.sh
     52        gmsh            install-4.sh
     53        triangle        install-mac.sh
     54        chaco           install.sh
     55        m1qn3           install.sh
     56        semic           install.sh
     57        shell2junit     install.sh
    5858"
    5959
Note: See TracChangeset for help on using the changeset viewer.