platform fedora: update

diff --git a/README.md b/README.md
index 969cb5705add2342a36bc73ff53572398cf61ce2..7c41d7f3d7fa527a18214339adfd07ba5f55c289 100644 (file)
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Follow the instructions on the screen
 
 ### Examples
 
-#### Install deal.II on RHEL 7, CentOS 7 or Fedora 26, 27, 28:
+#### Install deal.II on RHEL 7, CentOS 7 or Fedora:
 ```bash
   module load mpi/openmpi-`uname -i`
   ./candi.sh

diff --git a/candi.sh b/candi.sh
index 7658a24800ef683ed7dcf0a8775976a8febca03f..f1350e3f7c52b133b5f7b3bc201445d22d150830 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -619,7 +619,7 @@ guess_platform() {
         local OS_PRETTY_NAME=$(grep -oP '(?<=^PRETTY_NAME=).+' /etc/os-release | tr -d '"')
 
         if [ "$OS_ID" == "fedora" ]; then
-            echo fedora${OS_VERSIONID}
+            echo fedora
 
         elif [ "$OS_ID" == "centos" ]; then
             echo centos${OS_VERSIONID}

diff --git a/deal.II-toolchain/platforms/supported/fedora26.platform b/deal.II-toolchain/platforms/supported/fedora.platform
similarity index 74%
rename from deal.II-toolchain/platforms/supported/fedora26.platform
rename to deal.II-toolchain/platforms/supported/fedora.platform
index aea6a6fcc884cd237798d3d60972de94096579cd..7960dc3ac49084608fed0e060b7542f4b1956197 100644 (file)
--- a/deal.II-toolchain/platforms/supported/fedora26.platform
+++ b/deal.II-toolchain/platforms/supported/fedora.platform
@@ -1,14 +1,14 @@
-# Fedora 26
+# Fedora
 
 # 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 \
+# @development-tools gcc-c++ cmake patch libtool lua lua-devel \
+# doxygen graphviz graphviz-devel \
 # blas blas-devel lapack lapack-devel \
-# doxygen graphviz graphviz-devel qt-devel \
-# metis metis-devel 
+# openmpi openmpi-devel \
+# metis metis-devel
 # 
 # Please load the 'openmpi' compiler with
 # $  module load mpi/openmpi-x86_64
@@ -20,4 +20,3 @@
 #
 # Define the additional packages for this platform.
 #PACKAGES="once:cmake ${PACKAGES}"
-

diff --git a/deal.II-toolchain/platforms/supported/fedora27.platform b/deal.II-toolchain/platforms/supported/fedora27.platform
deleted file mode 100644 (file)
index e141d8f..0000000
--- a/deal.II-toolchain/platforms/supported/fedora27.platform
+++ /dev/null
@@ -1,23 +0,0 @@
-# Fedora 27
-
-# 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/fedora28.platform b/deal.II-toolchain/platforms/supported/fedora28.platform
deleted file mode 100644 (file)
index 81e51f4..0000000
--- a/deal.II-toolchain/platforms/supported/fedora28.platform
+++ /dev/null
@@ -1,23 +0,0 @@
-# Fedora 28
-
-# 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/fedora29.platform b/deal.II-toolchain/platforms/supported/fedora29.platform
deleted file mode 100644 (file)
index 8720ab3..0000000
--- a/deal.II-toolchain/platforms/supported/fedora29.platform
+++ /dev/null
@@ -1,23 +0,0 @@
-# Fedora 29
-
-# 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}"
-