deal.II: moved code for switching off packages from configuration file to a preparati...

diff --git a/deal.II/packages/dealii-prepare.package b/deal.II/packages/dealii-prepare.package
new file mode 100644 (file)
index 0000000..ea502dc
--- /dev/null
+++ b/deal.II/packages/dealii-prepare.package
@@ -0,0 +1,47 @@
+NAME=dealii_prepare
+BUILDCHAIN=ignore
+
+####################################
+### DO NOT MODIFY THE CODE BELOW ###
+####################################
+
+#########################################################################
+# Loop over the options in DEAL_CONFOPTS and if the package is turned off, add
+# it to the PACKAGES_OFF list.
+for PACKAGE in ${DEAL_CONFOPTS[@]}; do
+  case ${PACKAGE} in
+      *DEAL_II_WITH*:BOOL=OFF)
+      PACKAGE_NAME=${PACKAGE##*WITH_};
+      PACKAGE_NAME=${PACKAGE_NAME%%:BOOL*};
+      PACKAGES_OFF=${PACKAGE_NAME}' '${PACKAGES_OFF};;
+  esac
+done
+
+# Turn off ParMETIS and SuperLU_dist if metis is off.
+if [[ ${PACKAGES_OFF} =~ 'METIS' ]]; then
+  PACKAGES_OFF=${PACKAGES_OFF}' PARMETIS';
+  PACKAGES_OFF=${PACKAGES_OFF}' SUPERLU_DIST';
+  ParMetis=OFF
+  SuperLUDist=OFF
+else
+  ParMETIS=ON
+  SuperLUDist=ON
+fi
+
+# Transform upper case to lower case.
+PACKAGES_OFF=${PACKAGES_OFF,,}
+
+#########################################################################
+TRILINOS_CONFOPTS=" \
+-D BLAS_LIBRARY_DIRS:STRING=${BLAS_DIR} \
+-D LAPACK_LIBRARY_DIRS:STRING=${LAPACK_LIBRARY_DIRS} \
+"
+
+if [[ ${MKL} == ON ]]; then
+  TRILINOS_CONFOPTS=" \
+  ${TRILINOS_CONFOPTS} \
+  -D BLAS_LIBRARY_NAMES:STRING='mkl_core;mkl_sequential' \
+  -D LAPACK_LIBRARY_NAMES:STRING=mkl_intel_lp64 \
+  "
+fi
+

diff --git a/deal.II/packages/superlu_dist.package b/deal.II/packages/superlu_dist.package
index c730ca0b258e2649ce05490818672becb222b2fb..7a666471892c518461a2dbc59c1d73fb0a706c9e 100644 (file)
--- a/deal.II/packages/superlu_dist.package
+++ b/deal.II/packages/superlu_dist.package
@@ -3,6 +3,7 @@ NAME=superlu_dist_${VERSION}
 EXTRACTSTO=SuperLU_DIST_${VERSION}
 SOURCE=http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
 PACKING=.tar.gz
+DOWNLOADER=curl
 CHECKSUM=f4805659157d93a962500902c219046b
 BUILDCHAIN=custom
 

diff --git a/deal.II/platforms/supported/centos7.platform b/deal.II/platforms/supported/centos7.platform
index 47ee5e639d4a5a7807047ab2aba44454224d2b4b..a9649a30fa40d93d4e1832583c726dc6d5c8a448 100644 (file)
--- a/deal.II/platforms/supported/centos7.platform
+++ b/deal.II/platforms/supported/centos7.platform
@@ -22,6 +22,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 once:parmetis
 once:superlu_dist
 once:hdf5

diff --git a/deal.II/platforms/supported/fedora19.platform b/deal.II/platforms/supported/fedora19.platform
index d12a8af6a9f2984d2e797bb285fcc8b977795b18..958e41175e4f33fa0b832c636fc9c2e23cc0ab49 100644 (file)
--- a/deal.II/platforms/supported/fedora19.platform
+++ b/deal.II/platforms/supported/fedora19.platform
@@ -17,6 +17,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 #once:boost
 once:parmetis
 once:superlu_dist

diff --git a/deal.II/platforms/supported/fedora20.platform b/deal.II/platforms/supported/fedora20.platform
index 1e26f8e060ad2a87fb3510ddc29bbe5a30da07eb..b9d3564f62ff219bd63ff8ac378bf2d715684e3f 100644 (file)
--- a/deal.II/platforms/supported/fedora20.platform
+++ b/deal.II/platforms/supported/fedora20.platform
@@ -23,6 +23,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 #once:boost
 once:parmetis
 once:superlu_dist

diff --git a/deal.II/platforms/supported/fedora21.platform b/deal.II/platforms/supported/fedora21.platform
index d80e82eb34eb376ca038fc58f88ec87554e8bcb5..8eba06d7ad21544cf9645948f15d544fdf8e0230 100644 (file)
--- a/deal.II/platforms/supported/fedora21.platform
+++ b/deal.II/platforms/supported/fedora21.platform
@@ -24,6 +24,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 #once:boost
 once:parmetis
 once:superlu_dist

diff --git a/deal.II/platforms/supported/fedora22.platform b/deal.II/platforms/supported/fedora22.platform
index 668d7bcba4bd657826cc24cdce80c272612c48a2..8008bc0a7c7a9b64a495f7d7a6ac930356258686 100644 (file)
--- a/deal.II/platforms/supported/fedora22.platform
+++ b/deal.II/platforms/supported/fedora22.platform
@@ -24,7 +24,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
-#once:boost
+skip:dealii-prepare
 once:parmetis
 once:superlu_dist
 once:hdf5

diff --git a/deal.II/platforms/supported/linux_cluster.platform b/deal.II/platforms/supported/linux_cluster.platform
index 9c626464471746caca97bd171dbfc82e32b59b71..95d154e6630f77a26fd15a7c22f7b3a27361b2a5 100644 (file)
--- a/deal.II/platforms/supported/linux_cluster.platform
+++ b/deal.II/platforms/supported/linux_cluster.platform
@@ -17,8 +17,9 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
-once:zlib 
-once:bzip2 
+skip:dealii-prepare
+once:zlib
+once:bzip2
 once:boost
 once:parmetis
 once:superlu_dist

diff --git a/deal.II/platforms/supported/opensuse12.platform b/deal.II/platforms/supported/opensuse12.platform
index fa623702aaea3c0ef5f8e090c37c06b84f622ac4..ad5431abe9b74025d698d18c8c888f86febf67d4 100644 (file)
--- a/deal.II/platforms/supported/opensuse12.platform
+++ b/deal.II/platforms/supported/opensuse12.platform
@@ -22,6 +22,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 #once:boost
 once:parmetis
 once:superlu_dist

diff --git a/deal.II/platforms/supported/opensuse13.platform b/deal.II/platforms/supported/opensuse13.platform
index 95c15c544e5fdec62b4e6b153278b89758394a1e..4404e42a22b60c7b80f17982dfdaaab7c297c640 100644 (file)
--- a/deal.II/platforms/supported/opensuse13.platform
+++ b/deal.II/platforms/supported/opensuse13.platform
@@ -17,6 +17,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 #once:boost
 once:parmetis
 once:superlu_dist

diff --git a/deal.II/platforms/supported/ubuntu14.platform b/deal.II/platforms/supported/ubuntu14.platform
index 0ecf40d7b0e23e0fac24ac15b7391a64596c3127..76045b42327969bb0ee64937b493dd15c3e0ed69 100644 (file)
--- a/deal.II/platforms/supported/ubuntu14.platform
+++ b/deal.II/platforms/supported/ubuntu14.platform
@@ -16,6 +16,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 once:parmetis
 once:superlu_dist
 once:hdf5

diff --git a/deal.II/platforms/supported/ubuntu15.platform b/deal.II/platforms/supported/ubuntu15.platform
index dd05b678f1bd62cc8e40d21b13e829793145f440..d9b5f204ed27d8d9f6cd7b250cd8240f09289b48 100644 (file)
--- a/deal.II/platforms/supported/ubuntu15.platform
+++ b/deal.II/platforms/supported/ubuntu15.platform
@@ -16,6 +16,7 @@
 #
 # Define the packages this platform needs
 PACKAGES=(
+skip:dealii-prepare
 once:parmetis
 once:superlu_dist
 once:hdf5

diff --git a/project-deal.II.cfg b/project-deal.II.cfg
index 3d66fc36ae658aa322b20293ed39aea65e5f1bf4..3de61cca1f1dbfaa2c50cb8472ce40112522ffdf 100644 (file)
--- a/project-deal.II.cfg
+++ b/project-deal.II.cfg
@@ -98,47 +98,3 @@ INSTALL_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER}
 STABLE_BUILD=true
 #STABLE_BUILD=false
 
-
-####################################
-### DO NOT MODIFY THE CODE BELOW ###
-####################################
-
-#########################################################################
-# Loop over the options in DEAL_CONFOPTS and if the package is turned off, add
-# it to the PACKAGES_OFF list.
-for PACKAGE in ${DEAL_CONFOPTS[@]}; do
-  case ${PACKAGE} in
-      *DEAL_II_WITH*:BOOL=OFF)
-      PACKAGE_NAME=${PACKAGE##*WITH_};
-      PACKAGE_NAME=${PACKAGE_NAME%%:BOOL*};
-      PACKAGES_OFF=${PACKAGE_NAME}' '${PACKAGES_OFF};;
-  esac
-done
-
-# Turn off ParMETIS and SuperLU_dist if metis is off.
-if [[ ${PACKAGES_OFF} =~ 'METIS' ]]; then
-  PACKAGES_OFF=${PACKAGES_OFF}' PARMETIS';
-  PACKAGES_OFF=${PACKAGES_OFF}' SUPERLU_DIST';
-  ParMetis=OFF
-  SuperLUDist=OFF
-else
-  ParMETIS=ON
-  SuperLUDist=ON
-fi
-
-# Transform upper case to lower case.
-PACKAGES_OFF=${PACKAGES_OFF,,}
-
-#########################################################################
-TRILINOS_CONFOPTS=" \
--D BLAS_LIBRARY_DIRS:STRING=${BLAS_DIR} \
--D LAPACK_LIBRARY_DIRS:STRING=${LAPACK_LIBRARY_DIRS} \
-"
-
-if [[ ${MKL} == ON ]]; then
-  TRILINOS_CONFOPTS=" \
-  ${TRILINOS_CONFOPTS} \
-  -D BLAS_LIBRARY_NAMES:STRING='mkl_core;mkl_sequential' \
-  -D LAPACK_LIBRARY_NAMES:STRING=mkl_intel_lp64 \
-  "
-fi