From 482c534790914ada9a7b667c77210dcc99e12911 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Tue, 6 Oct 2015 17:49:56 +0200 Subject: [PATCH] candi: introducing a new keyword 'load' for package handling. Details: preparation packages such as dealii-prepare were set to skip:dealii-prepare which is confusing the users. The patch of this branch introduces a new keyword load for optimising the user experience. --- candi.sh | 10 ++++++++-- deal.II/platforms/supported/centos7.platform | 2 +- deal.II/platforms/supported/fedora21.platform | 2 +- deal.II/platforms/supported/fedora22.platform | 2 +- deal.II/platforms/supported/linux_cluster.platform | 2 +- deal.II/platforms/supported/opensuse12.platform | 2 +- deal.II/platforms/supported/opensuse13.platform | 2 +- deal.II/platforms/supported/rhel6.platform | 1 + deal.II/platforms/supported/rhel7.platform | 1 + deal.II/platforms/supported/ubuntu14.platform | 2 +- deal.II/platforms/supported/ubuntu15.platform | 2 +- 11 files changed, 18 insertions(+), 10 deletions(-) diff --git a/candi.sh b/candi.sh index 45a6391..43c935e 100755 --- a/candi.sh +++ b/candi.sh @@ -680,6 +680,7 @@ for PACKAGE in ${PACKAGES[@]}; do # Skip building this package if the user requests it SKIP=false case ${PACKAGE} in + load:*) SKIP=true; LOAD=true; PACKAGE=${PACKAGE#*:};; skip:*) SKIP=true; PACKAGE=${PACKAGE#*:};; once:*) # If the package is turned off in the deal.II configuration, do not @@ -762,8 +763,13 @@ for PACKAGE in ${PACKAGES[@]}; do package_unpack package_build else - # Let the user know we're skipping the current package - cecho ${GOOD} "Skipping ${NAME}" + if [ ! -z "${LOAD}" ]; then + # Let the user know we're loading the current package + cecho ${GOOD} "Loading ${NAME}" + else + # Let the user know we're skipping the current package + cecho ${GOOD} "Skipping ${NAME}" + fi fi package_register package_conf diff --git a/deal.II/platforms/supported/centos7.platform b/deal.II/platforms/supported/centos7.platform index a9649a3..2f5c073 100644 --- a/deal.II/platforms/supported/centos7.platform +++ b/deal.II/platforms/supported/centos7.platform @@ -22,7 +22,7 @@ # # Define the packages this platform needs PACKAGES=( -skip:dealii-prepare +load:dealii-prepare once:parmetis once:superlu_dist once:hdf5 diff --git a/deal.II/platforms/supported/fedora21.platform b/deal.II/platforms/supported/fedora21.platform index 0bbf7f6..5e00d94 100644 --- a/deal.II/platforms/supported/fedora21.platform +++ b/deal.II/platforms/supported/fedora21.platform @@ -24,7 +24,7 @@ # # Define the packages this platform needs PACKAGES=( -skip:dealii-prepare +load: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 4e186cf..1a1038a 100644 --- 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=( -skip:dealii-prepare +load: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 95d154e..de9aba3 100644 --- a/deal.II/platforms/supported/linux_cluster.platform +++ b/deal.II/platforms/supported/linux_cluster.platform @@ -17,7 +17,7 @@ # # Define the packages this platform needs PACKAGES=( -skip:dealii-prepare +load:dealii-prepare once:zlib once:bzip2 once:boost diff --git a/deal.II/platforms/supported/opensuse12.platform b/deal.II/platforms/supported/opensuse12.platform index ad5431a..147170e 100644 --- a/deal.II/platforms/supported/opensuse12.platform +++ b/deal.II/platforms/supported/opensuse12.platform @@ -22,7 +22,7 @@ # # Define the packages this platform needs PACKAGES=( -skip:dealii-prepare +load: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 4404e42..0dbbfdb 100644 --- a/deal.II/platforms/supported/opensuse13.platform +++ b/deal.II/platforms/supported/opensuse13.platform @@ -17,7 +17,7 @@ # # Define the packages this platform needs PACKAGES=( -skip:dealii-prepare +load:dealii-prepare #once:boost once:parmetis once:superlu_dist diff --git a/deal.II/platforms/supported/rhel6.platform b/deal.II/platforms/supported/rhel6.platform index 5d1c2ee..861b85f 100644 --- a/deal.II/platforms/supported/rhel6.platform +++ b/deal.II/platforms/supported/rhel6.platform @@ -17,6 +17,7 @@ # # Define the packages this platform needs PACKAGES=( +load:dealii-prepare once:parmetis once:superlu_dist once:hdf5 diff --git a/deal.II/platforms/supported/rhel7.platform b/deal.II/platforms/supported/rhel7.platform index a12f393..2654aa0 100644 --- a/deal.II/platforms/supported/rhel7.platform +++ b/deal.II/platforms/supported/rhel7.platform @@ -19,6 +19,7 @@ # # Define the packages this platform needs PACKAGES=( +load:dealii-prepare once:parmetis once:superlu_dist once:hdf5 diff --git a/deal.II/platforms/supported/ubuntu14.platform b/deal.II/platforms/supported/ubuntu14.platform index fcf6cf5..1585b6e 100644 --- a/deal.II/platforms/supported/ubuntu14.platform +++ b/deal.II/platforms/supported/ubuntu14.platform @@ -11,7 +11,7 @@ # # Define the packages this platform needs PACKAGES=( -skip:dealii-prepare +load: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 e3905aa..097c1b7 100644 --- a/deal.II/platforms/supported/ubuntu15.platform +++ b/deal.II/platforms/supported/ubuntu15.platform @@ -11,7 +11,7 @@ # # Define the packages this platform needs PACKAGES=( -skip:dealii-prepare +load:dealii-prepare once:parmetis once:superlu_dist once:hdf5 -- 2.39.5