From: Uwe Köcher Date: Tue, 25 Jul 2017 06:40:59 +0000 (+0200) Subject: major platform update; adds platforms debian9 and ubuntu17 contributed by Lukas van... X-Git-Tag: v0.8.5~4^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71399c061e768937c9613103844c72b964ff665;p=candi.git major platform update; adds platforms debian9 and ubuntu17 contributed by Lukas van de Wiel --- diff --git a/candi.sh b/candi.sh index fad4bbd..4240007 100755 --- a/candi.sh +++ b/candi.sh @@ -550,7 +550,17 @@ guess_platform() { # Try to guess the name of the platform we're running on if [ -f /usr/bin/cygwin1.dll ]; then echo cygwin - + + elif [ -x /usr/bin/sw_vers ]; then + local MACOSVER=$(sw_vers -productVersion) + case ${MACOSVER} in + 10.11*) echo elcapitan;; + 10.12*) echo sierra;; + esac + + elif [ ! -z "$CRAYOS_VERSION" ]; then + echo cray + elif [ -f /etc/fedora-release ]; then local FEDORANAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/fedora-release` case ${FEDORANAME} in @@ -561,43 +571,29 @@ guess_platform() { "Twenty Three"*) echo fedora23;; "Twenty Four"*) echo fedora24;; "Twenty Five"*) echo fedora25;; + "Twenty Six"*) echo fedora26;; esac elif [ -f /etc/redhat-release ]; then local RHELNAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/redhat-release` case ${RHELNAME} in - "Tikanga"*) echo rhel5;; - "Santiago"*) echo rhel6;; "Maipo"*) echo rhel7;; "Core"*) echo centos7;; esac - elif [ -x /usr/bin/sw_vers ]; then - local MACOSVER=$(sw_vers -productVersion) - case ${MACOSVER} in - 10.11*) echo elcapitan;; - 10.12*) echo sierra;; - esac - - elif [[ $CRAYOS_VERSION ]]; then - echo cray - elif [ -x /usr/bin/lsb_release ]; then local DISTRO=$(lsb_release -i -s) local CODENAME=$(lsb_release -c -s) local DESCRIPTION=$(lsb_release -d -s) case ${DISTRO}:${CODENAME}:${DESCRIPTION} in - *:*:*Ubuntu*\ 12*) echo ubuntu12;; - *:*:*Ubuntu*\ 14*) echo ubuntu14;; - *:*:*Ubuntu*\ 15*) echo ubuntu15;; - *:xenial*:*Ubuntu*) echo ubuntu16;; - *:Tikanga*:*) echo rhel5;; - *:Santiago*:*) echo rhel6;; - Scientific:Carbon*:*) echo rhel6;; - *:*:*CentOS*\ 5*) echo rhel5;; - *:*:*CentOS*\ 6*) echo rhel6;; - *:*:*openSUSE\ 12*) echo opensuse12;; - *:*:*openSUSE\ 13*) echo opensuse13;; + *:*:*Debian*9*) echo debian9;; + *:*:*Ubuntu*\ 12*) echo ubuntu12;; + *:*:*Ubuntu*\ 14*) echo ubuntu14;; + *:*:*Ubuntu*\ 15*) echo ubuntu15;; + *:xenial*:*Ubuntu*) echo ubuntu16;; + *:zesty*:*Ubuntu*) echo ubuntu17;; + *:*:*openSUSE\ 12*) echo opensuse12;; + *:*:*openSUSE\ 13*) echo opensuse13;; esac fi } @@ -607,32 +603,17 @@ guess_ostype() { if [ -f /usr/bin/cygwin1.dll ]; then echo cygwin + elif [ -x /usr/bin/sw_vers ]; then + echo macos + elif [ -f /etc/fedora-release ]; then echo linux elif [ -f /etc/redhat-release ]; then echo linux - elif [ -x /usr/bin/sw_vers ]; then - echo macos - elif [ -x /usr/bin/lsb_release ]; then - local DISTRO=$(lsb_release -i -s) - local CODENAME=$(lsb_release -c -s) - local DESCRIPTION=$(lsb_release -d -s) - case ${DISTRO}:${CODENAME}:${DESCRIPTION} in - *:*:*Ubuntu*\ 12*) echo linux;; - *:*:*Ubuntu*\ 14*) echo linux;; - *:*:*Ubuntu*\ 15*) echo linux;; - *:xenial*:*Ubuntu*) echo linux;; - *:Tikanga*:*) echo linux;; - *:Santiago*:*) echo linux;; - Scientific:Carbon*:*) echo linux;; - *:*:*CentOS*\ 5*) echo linux;; - *:*:*CentOS*\ 6*) echo linux;; - *:*:*openSUSE\ 12*) echo linux;; - *:*:*openSUSE\ 13*) echo linux;; - esac + echo linux fi } diff --git a/deal.II-toolchain/platforms/supported/fedora22.platform b/deal.II-toolchain/platforms/deprecated/fedora22.platform similarity index 100% rename from deal.II-toolchain/platforms/supported/fedora22.platform rename to deal.II-toolchain/platforms/deprecated/fedora22.platform diff --git a/deal.II-toolchain/platforms/supported/fedora23.platform b/deal.II-toolchain/platforms/deprecated/fedora23.platform similarity index 100% rename from deal.II-toolchain/platforms/supported/fedora23.platform rename to deal.II-toolchain/platforms/deprecated/fedora23.platform diff --git a/deal.II-toolchain/platforms/supported/centos7.platform b/deal.II-toolchain/platforms/supported/centos7.platform index a47dfb4..a68fde3 100644 --- a/deal.II-toolchain/platforms/supported/centos7.platform +++ b/deal.II-toolchain/platforms/supported/centos7.platform @@ -22,3 +22,4 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/debian9.platform b/deal.II-toolchain/platforms/supported/debian9.platform new file mode 100644 index 0000000..bbd5ea3 --- /dev/null +++ b/deal.II-toolchain/platforms/supported/debian9.platform @@ -0,0 +1,18 @@ +# debian 9 +# +# This build script assumes that you have several packages already +# installed via ubuntu's apt-get using the following commands: +# +# > sudo apt-get install build-essential automake autoconf gfortran \ +# openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \ +# libblas-dev liblapack-dev libblas3gf liblapack3gf splint tcl tcl-dev \ +# environment-modules libsuitesparse-dev libtool libboost-all-dev \ +# qt4-dev-tools +# +# Then reboot and run candi again. +## + +# +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/elcapitan.platform b/deal.II-toolchain/platforms/supported/elcapitan.platform index 244fd59..824ffb2 100644 --- a/deal.II-toolchain/platforms/supported/elcapitan.platform +++ b/deal.II-toolchain/platforms/supported/elcapitan.platform @@ -31,3 +31,8 @@ # and follow the activation notes to use the modulefile configuration. # ## + +# +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/fedora24.platform b/deal.II-toolchain/platforms/supported/fedora24.platform index 3762112..8ef0bba 100644 --- a/deal.II-toolchain/platforms/supported/fedora24.platform +++ b/deal.II-toolchain/platforms/supported/fedora24.platform @@ -20,3 +20,4 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/fedora25.platform b/deal.II-toolchain/platforms/supported/fedora25.platform index 4a01ff4..1a8ec32 100644 --- a/deal.II-toolchain/platforms/supported/fedora25.platform +++ b/deal.II-toolchain/platforms/supported/fedora25.platform @@ -20,3 +20,4 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/fedora26.platform b/deal.II-toolchain/platforms/supported/fedora26.platform new file mode 100644 index 0000000..aea6a6f --- /dev/null +++ b/deal.II-toolchain/platforms/supported/fedora26.platform @@ -0,0 +1,23 @@ +# Fedora 26 + +# This build script assumes that you have several packages already +# installed via Fedora's dnf using the following command: +# +# $ sudo dnf install \ +# @development-tools gcc-c++ cmake openmpi openmpi-devel splint \ +# patch libtool lua lua-devel \ +# blas blas-devel lapack lapack-devel \ +# doxygen graphviz graphviz-devel qt-devel \ +# metis metis-devel +# +# Please load the 'openmpi' compiler with +# $ module load mpi/openmpi-x86_64 +# and then set the compiler enviroment variables to +# $ export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77 +# before you continue! +## + +# +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/linux_cluster.platform b/deal.II-toolchain/platforms/supported/linux_cluster.platform index 50b297e..c2b3ec8 100644 --- a/deal.II-toolchain/platforms/supported/linux_cluster.platform +++ b/deal.II-toolchain/platforms/supported/linux_cluster.platform @@ -14,7 +14,6 @@ # ## - # # Define the additional packages for this platform. PACKAGES=" @@ -22,3 +21,4 @@ once:zlib once:bzip2 once:boost ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/opensuse12.platform b/deal.II-toolchain/platforms/supported/opensuse12.platform index a8c4703..cb0c3e3 100644 --- a/deal.II-toolchain/platforms/supported/opensuse12.platform +++ b/deal.II-toolchain/platforms/supported/opensuse12.platform @@ -22,3 +22,4 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/opensuse13.platform b/deal.II-toolchain/platforms/supported/opensuse13.platform index 4d06c2d..09c00d5 100644 --- a/deal.II-toolchain/platforms/supported/opensuse13.platform +++ b/deal.II-toolchain/platforms/supported/opensuse13.platform @@ -17,3 +17,4 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/rhel7.platform b/deal.II-toolchain/platforms/supported/rhel7.platform index 1527a4c..c9737cf 100644 --- a/deal.II-toolchain/platforms/supported/rhel7.platform +++ b/deal.II-toolchain/platforms/supported/rhel7.platform @@ -21,3 +21,4 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/sierra.platform b/deal.II-toolchain/platforms/supported/sierra.platform index 6f9d932..1b14dd3 100644 --- a/deal.II-toolchain/platforms/supported/sierra.platform +++ b/deal.II-toolchain/platforms/supported/sierra.platform @@ -31,3 +31,4 @@ # and follow the activation notes to use the modulefile configuration. # ## + diff --git a/deal.II-toolchain/platforms/supported/ubuntu12.platform b/deal.II-toolchain/platforms/supported/ubuntu12.platform index 6ebdc0e..4c87c33 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu12.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu12.platform @@ -12,10 +12,6 @@ # Then run candi again. ## -# -# Define the additional packages for this platform. -PACKAGES="once:cmake ${PACKAGES}" - # The default compiler on ubuntu12 does not support Trilinos 12. # Anyhow, the user can decide to use Trilinos 11 or 12, if the # version number is not set to AUTO. @@ -24,3 +20,8 @@ PACKAGES="once:cmake ${PACKAGES}" if [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then TRILINOS_MAJOR_VERSION=11 fi + +# +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/ubuntu14.platform b/deal.II-toolchain/platforms/supported/ubuntu14.platform index 6c33375..8de746c 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu14.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu14.platform @@ -23,3 +23,8 @@ if [ ${STABLE_BUILD} == "true" ] && [ ${DEAL_II_VERSION} == "v8.3.0" ] && [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then TRILINOS_MAJOR_VERSION=11 fi + +# +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/ubuntu15.platform b/deal.II-toolchain/platforms/supported/ubuntu15.platform index bb207da..e4aaf70 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu15.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu15.platform @@ -15,3 +15,4 @@ # # Define the additional packages for this platform. #PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/ubuntu16.platform b/deal.II-toolchain/platforms/supported/ubuntu16.platform index 674cd2f..263c1c0 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu16.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu16.platform @@ -1,4 +1,4 @@ -# ubuntu 16 +# ubuntu 16 LTS # # This build script assumes that you have several packages already # installed via ubuntu's apt-get using the following commands: @@ -13,3 +13,7 @@ # Then run candi again. ## +# +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" + diff --git a/deal.II-toolchain/platforms/supported/ubuntu17.platform b/deal.II-toolchain/platforms/supported/ubuntu17.platform new file mode 100644 index 0000000..5004333 --- /dev/null +++ b/deal.II-toolchain/platforms/supported/ubuntu17.platform @@ -0,0 +1,19 @@ +# ubuntu 17 +# +# This build script assumes that you have several packages already +# installed via ubuntu's apt-get using the following commands: +# +# > sudo apt-get install build-essential lsb-release wget \ +# automake autoconf gfortran \ +# openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \ +# libblas-dev liblapack-dev libblas3 liblapack3 \ +# libsuitesparse-dev libtool libboost-all-dev \ +# splint tcl tcl-dev environment-modules qt4-dev-tools +# +# Then run candi again. +## + +# +# Define the additional packages for this platform. +#PACKAGES="once:cmake ${PACKAGES}" +