prepare master for sync of v9.x branches

diff --git a/deal.II-toolchain/packages/arpack-ng.package b/deal.II-toolchain/packages/arpack-ng.package
index fc6bcdb46fb6184abc13163b5a1cf161f9ef5aa6..7450f007fee3469aa7a06e04ca3ca50f538639dc 100644 (file)
--- a/deal.II-toolchain/packages/arpack-ng.package
+++ b/deal.II-toolchain/packages/arpack-ng.package
@@ -26,4 +26,3 @@ package_specific_conf () {
 export ARPACK_DIR=${INSTALL_PATH}
 " >> $CONFIG_FILE
 }
-

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 008660b32b24d4f10862cc5a23a735738ac4fa5b..e225e1c9c18d364b9d84a5328c5c8998ddf01068 100644 (file)
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -288,15 +288,12 @@ if [ ! -z "${ADOLC_DIR}" ]; then
 fi
 
 ################################################################################
-
 package_specific_install() {
     if [ ${RUN_DEAL_II_TESTS} = ON ]; then
         make test 2>&1 | tee candi_test.log
     fi
 }
 
-
-
 package_specific_conf() {
     ############################################################################
     # Generate modulefile

diff --git a/deal.II-toolchain/packages/gmsh.package b/deal.II-toolchain/packages/gmsh.package
index b4a816b7fb9263377573d20273ca13cc956dccdb..5acf082c90a55d8e04e9e047fc2fcd66538a331f 100644 (file)
--- a/deal.II-toolchain/packages/gmsh.package
+++ b/deal.II-toolchain/packages/gmsh.package
@@ -21,15 +21,15 @@ if [ ${CANDI_GMSH_LOAD_TARBALL} = ON ]; then
     # CHECKSUM=762c10f159dab4b042e3140b1c348427
 
     NAME=gmsh-${VERSION}-source
-    SOURCE=http://gmsh.info/src/
-    EXTRACTSTO=gmsh-${VERSION}-source
     PACKING=.tgz
+    EXTRACTSTO=gmsh-${VERSION}-source
+    SOURCE=http://gmsh.info/src/
 else
     VERSION=gmsh_4_8_4
     NAME=gmsh.git
-    SOURCE=https://gitlab.onelab.info/gmsh/
-    EXTRACTSTO=${VERSION}
     PACKING=git
+    EXTRACTSTO=${VERSION}
+    SOURCE=https://gitlab.onelab.info/gmsh/
 fi
 unset CANDI_GMSH_LOAD_TARBALL
 

diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package
index 9a6ea9c3a87337f6dde0c011713c0d5a958e6e24..7cfce9e4fd5263f7542dc850714c6c609411dc55 100644 (file)
--- a/deal.II-toolchain/packages/opencascade.package
+++ b/deal.II-toolchain/packages/opencascade.package
@@ -27,20 +27,17 @@ if [ ${CANDI_OPENCASCADE_LOAD_TARBALL} = ON ]; then
     PACKING=.tar.gz
 else
     # download git repository (huge download)
-    # if possible, try to download a release tarball (see above)
 
     # checkout specific release version
-    # VERSION=OCE-0.18.3
-    # VERSION=OCE-0.18.2
-
-    # or checkout current development version (master)
     VERSION=master
+    #VERSION=OCE-0.18.3
+    #VERSION=OCE-0.18.2
 
     # set up git repository
     NAME=oce.git
-    SOURCE=https://github.com/tpaviot/
-    EXTRACTSTO=OCE-${VERSION}
     PACKING=git
+    EXTRACTSTO=OCE-${VERSION}
+    SOURCE=https://github.com/tpaviot/
 fi
 unset CANDI_OPENCASCADE_LOAD_TARBALL
 

diff --git a/deal.II-toolchain/packages/p4est.package b/deal.II-toolchain/packages/p4est.package
index 085f82bcc11680d50ef7c8a2b22e37277a627075..3cba8330a2ca199a0f93581cf72aa4e99e849298 100644 (file)
--- a/deal.II-toolchain/packages/p4est.package
+++ b/deal.II-toolchain/packages/p4est.package
@@ -11,9 +11,10 @@ CHECKSUM="${CHECKSUM} 28cbaf51a335c8cc8e78bb38bbb99251ba7ebf80"
 CHECKSUM="${CHECKSUM} 6943949a6678589ebf1686ee7bad7ea1"
 
 NAME=p4est-${VERSION}
+PACKING=.tar.gz
 EXTRACTSTO=p4est-${VERSION}
 SOURCE=https://p4est.github.io/release/
-PACKING=.tar.gz
+
 BUILDCHAIN=custom
 
 INSTALL_PATH=${INSTALL_PATH}/${NAME}

diff --git a/deal.II-toolchain/packages/superlu_dist.package b/deal.II-toolchain/packages/superlu_dist.package
index 70d319c3bb175912ecfafb4be246ef8ec55a10fa..6c26753b5380970c076dfd137007798979b589c0 100644 (file)
--- a/deal.II-toolchain/packages/superlu_dist.package
+++ b/deal.II-toolchain/packages/superlu_dist.package
@@ -6,9 +6,9 @@ VERSION=5.1.2
 CHECKSUM=0a99bbb5f6c26a9c1d7ab17ea35d4e6f
 
 NAME=superlu_dist_${VERSION}
+PACKING=.tar.gz
 EXTRACTSTO=SuperLU_DIST_${VERSION}
 SOURCE=http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
-PACKING=.tar.gz
 
 BUILDCHAIN=cmake
 

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index 1934e403bac79b6f94c5cc910d5f17c1e2a55f59..0c208959dc0b7d74cdb8594decda87ce237e17a4 100644 (file)
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -91,7 +91,7 @@ if [ ! -z "${LAPACK_DIR}" ]; then
 fi
 
 # Set intel MKL options
-if [ "${MKL}" = "ON" ]; then
+if [ ${MKL} = ON ]; then
     cecho ${INFO} "trilinos: configuration with MKL"
 
     if [ -z "${BLAS_DIR}" ] && [ -z "${LAPACK_DIR}" ]; then

diff --git a/deal.II-toolchain/platforms/deprecated/fedora22.platform b/deal.II-toolchain/platforms/deprecated/fedora22.platform
deleted file mode 100644 (file)
index 290e917..0000000
--- a/deal.II-toolchain/platforms/deprecated/fedora22.platform
+++ /dev/null
@@ -1,22 +0,0 @@
-# Fedora 22
-
-# 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/deprecated/fedora23.platform b/deal.II-toolchain/platforms/deprecated/fedora23.platform
deleted file mode 100644 (file)
index 844000a..0000000
--- a/deal.II-toolchain/platforms/deprecated/fedora23.platform
+++ /dev/null
@@ -1,22 +0,0 @@
-# Fedora 23
-
-# 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/mojave.platform b/deal.II-toolchain/platforms/supported/macos_mojave.platform
similarity index 100%
rename from deal.II-toolchain/platforms/supported/mojave.platform
rename to deal.II-toolchain/platforms/supported/macos_mojave.platform