candi: deal.II: use of default.packages

diff --git a/candi.sh b/candi.sh
index 604b5d9a698a864ea045d0e7067614a67dfe7586..c4a9cda5b8e2dad81723920b0fd52c46c17cc47c 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -655,12 +655,11 @@ else
 fi
 
 # Source default PLATFORM variables, if present
-PLATFORM_DEFAULT=${PROJECT}/platforms/default.packages
-if [ -e ${PLATFORM_DEFAULT} ]; then
-    source ${PLATFORM_DEFAULT}
+DEFAULT_PACKAGES=${PROJECT}/packages/default.packages
+if [ -e ${DEFAULT_PACKAGES} ]; then
+    source ${DEFAULT_PACKAGES}
 fi
 
-
 # Source PLATFORM variables if set up correctly
 if [ -z ${PLATFORM} ]; then
     cecho ${BAD} "Please contact the authors, if you have not changed candi!"

diff --git a/deal.II-toolchain/packages/default.packages b/deal.II-toolchain/packages/default.packages
new file mode 100644 (file)
index 0000000..7e62724
--- /dev/null
+++ b/deal.II-toolchain/packages/default.packages
@@ -0,0 +1,12 @@
+PACKAGES=(
+load:dealii-prepare
+once:opencascade
+once:parmetis
+once:superlu_dist
+once:hdf5
+once:p4est
+once:trilinos
+once:petsc
+once:slepc
+dealii
+)

diff --git a/deal.II-toolchain/platforms/supported/centos7.platform b/deal.II-toolchain/platforms/supported/centos7.platform
index 58e01f837298550317cd5160603f7051c45d56a9..a47dfb46fe3224236b3119f0edee181ad54c67f9 100644 (file)
--- a/deal.II-toolchain/platforms/supported/centos7.platform
+++ b/deal.II-toolchain/platforms/supported/centos7.platform
@@ -20,16 +20,5 @@
 ##
 
 #
-# Define the packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
+# Define the additional packages for this platform.
+#PACKAGES="once:cmake ${PACKAGES}"

diff --git a/deal.II-toolchain/platforms/supported/fedora22.platform b/deal.II-toolchain/platforms/supported/fedora22.platform
index abc38a8fb36f2bc8b8f363dfcff342826790017d..290e91777744a2f70765a6bc03b9abca94bdc0e9 100644 (file)
--- a/deal.II-toolchain/platforms/supported/fedora22.platform
+++ b/deal.II-toolchain/platforms/supported/fedora22.platform
@@ -18,16 +18,5 @@
 ##
 
 #
-# Define the packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
+# Define the additional packages for this platform.
+#PACKAGES="once:cmake ${PACKAGES}"

diff --git a/deal.II-toolchain/platforms/supported/fedora23.platform b/deal.II-toolchain/platforms/supported/fedora23.platform
index ba41b1a5e7800d1d34b4e09911d866b8f643cc39..844000a0e62d7e1e65b254ced759953b3712bec6 100644 (file)
--- a/deal.II-toolchain/platforms/supported/fedora23.platform
+++ b/deal.II-toolchain/platforms/supported/fedora23.platform
@@ -18,16 +18,5 @@
 ##
 
 #
-# Define the packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
+# 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 7c86e4d9bedaebb1f4ba741441da0824b5ec4eca..50b297ee5b07032b44b45c5dfb74d9b8778e31b8 100644 (file)
--- a/deal.II-toolchain/platforms/supported/linux_cluster.platform
+++ b/deal.II-toolchain/platforms/supported/linux_cluster.platform
@@ -14,21 +14,11 @@
 # 
 ##
 
+
 #
-# Define the packages this platform needs
-PACKAGES=(
-load:dealii-prepare
+# Define the additional packages for this platform.
+PACKAGES="
 once:zlib
 once:bzip2
 once:boost
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
-
+${PACKAGES}"

diff --git a/deal.II-toolchain/platforms/supported/opensuse12.platform b/deal.II-toolchain/platforms/supported/opensuse12.platform
index abde052006ef2381b915d8df33f7c2c693f19ee9..a8c47038ff477560444436cb05646fcea7e16404 100644 (file)
--- a/deal.II-toolchain/platforms/supported/opensuse12.platform
+++ b/deal.II-toolchain/platforms/supported/opensuse12.platform
@@ -20,18 +20,5 @@
 ##
 
 #
-# Define the packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-#once:boost
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
-
+# 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 ad8f52fdd2e90697ca98dbfd80e7850d76b0f04a..4d06c2da638200d398bfcf3a9248726508d489ef 100644 (file)
--- a/deal.II-toolchain/platforms/supported/opensuse13.platform
+++ b/deal.II-toolchain/platforms/supported/opensuse13.platform
@@ -15,18 +15,5 @@
 ##
 
 #
-# Define the packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-#once:boost
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
-
+# 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 3900fe8710677e376203ae64b5bc0a2370236f1f..1527a4ca72ab3f4aca111ed39a438f54e1df1bcd 100644 (file)
--- a/deal.II-toolchain/platforms/supported/rhel7.platform
+++ b/deal.II-toolchain/platforms/supported/rhel7.platform
@@ -19,16 +19,5 @@
 ##
 
 #
-# Define the packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
+# Define the additional packages for this platform.
+#PACKAGES="once:cmake ${PACKAGES}"

diff --git a/deal.II-toolchain/platforms/supported/ubuntu12.platform b/deal.II-toolchain/platforms/supported/ubuntu12.platform
index 16ebbc4c456c871b628d4bd5732117e811cfd5e7..c4a380af4944d96d229792c50ad8f959afefc983 100644 (file)
--- a/deal.II-toolchain/platforms/supported/ubuntu12.platform
+++ b/deal.II-toolchain/platforms/supported/ubuntu12.platform
@@ -1,6 +1,5 @@
 # ubuntu 12
-# 
-# 
+#
 # This build script assumes that you have several packages already
 # installed via ubuntu's apt-get using the following commands:
 #
@@ -8,33 +7,21 @@
 #        openmpi-bin openmpi-common libopenmpi-dev cmake subversion \
 #        git libblas-dev liblapack-dev libblas3gf liblapack3gf splint \
 #        tcl tcl-dev libsuitesparse-dev libtool libboost-all-dev qt4-dev-tools
-# 
+#
 # Then reboot.
-# 
+#
 # Afterwards, you should set your compilers safely:
 # > export CC=mpicc; export CXX=mpicxx; export FC=mpif90; export FF=mpif77
 # and rerun candi again.
-# 
+#
 # To compile deal.II applications, you need to set the following variables
 # > export DEAL_II_DIR=${INSTALL_PATH} (see below for your settings)
 # > export PATH=$DEAL_II_DIR/bin:$PATH
 ##
 
 #
-# Define the packages this platform needs
-PACKAGES=(
-once:cmake
-load:dealii-prepare
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
+# 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
@@ -44,4 +31,3 @@ dealii
 if [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then
   TRILINOS_MAJOR_VERSION=11
 fi
-

diff --git a/deal.II-toolchain/platforms/supported/ubuntu14.platform b/deal.II-toolchain/platforms/supported/ubuntu14.platform
index c4abc03cfabde9a160a37f62ba7cae411a583d2a..c09cc62ffaf1dcc0c663190c46ca506d166556d9 100644 (file)
--- a/deal.II-toolchain/platforms/supported/ubuntu14.platform
+++ b/deal.II-toolchain/platforms/supported/ubuntu14.platform
@@ -1,6 +1,5 @@
 # ubuntu 14
-# 
-# 
+#
 # This build script assumes that you have several packages already
 # installed via ubuntu's apt-get using the following commands:
 #
@@ -9,24 +8,13 @@
 #   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 packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
+# Define the additional packages for this platform.
+#PACKAGES="once:cmake ${PACKAGES}"
 
 # The default compiler on ubuntu14 does not support Trilinos 12
 # together with deal.II v8.3.0.
@@ -39,4 +27,3 @@ dealii
 if [ ${STABLE_BUILD} == "true" ] && [ ${DEAL_II_VERSION} == "v8.3.0" ] && [ ${TRILINOS_MAJOR_VERSION} == "AUTO" ]; then
   TRILINOS_MAJOR_VERSION=11
 fi
-

diff --git a/deal.II-toolchain/platforms/supported/ubuntu15.platform b/deal.II-toolchain/platforms/supported/ubuntu15.platform
index ce0ce4addb2fb5e983339f4d626f56d159af9cd7..bb207dab8a6b3238f8d2895ba7808866957ab245 100644 (file)
--- a/deal.II-toolchain/platforms/supported/ubuntu15.platform
+++ b/deal.II-toolchain/platforms/supported/ubuntu15.platform
@@ -1,25 +1,17 @@
 # ubuntu 15
-# 
+#
 # 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
-# 
+# > 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 packages this platform needs
-PACKAGES=(
-load:dealii-prepare
-once:opencascade
-once:parmetis
-once:superlu_dist
-once:hdf5
-once:p4est
-once:trilinos
-once:petsc
-once:slepc
-dealii
-)
-
+# Define the additional packages for this platform.
+#PACKAGES="once:cmake ${PACKAGES}"