From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Fri, 6 Nov 2015 17:11:20 +0000 (+0100)
Subject: deal.II: sets quit_if_fail for specific builds
X-Git-Tag: v0.8~4^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d19034fc4154329e6a7218820038277adb4211c;p=candi.git

deal.II: sets quit_if_fail for specific builds
---

diff --git a/candi.sh b/candi.sh
index 9058143..f78402e 100755
--- a/candi.sh
+++ b/candi.sh
@@ -205,7 +205,7 @@ download_archive () {
             # Remove the file and check if that was successful
             rm -f ${ARCHIVE_FILE}
             if [ $? = 0 ]; then
-                cecho ${GOOD} "corrupted ${ARCHIVE_FILE} has been removed"
+                cecho ${INFO} "corrupted ${ARCHIVE_FILE} has been removed"
             else
                 cecho ${BAD} "corrupted ${ARCHIVE_FILE} could not be removed."
                 cecho ${INFO} "Please remove the file ${DOWNLOAD_PATH}/${ARCHIVE_FILE} on your own!"
@@ -216,7 +216,7 @@ download_archive () {
         
         # Set up complete url
         url=${source}${ARCHIVE_FILE}
-        cecho ${GOOD} "Trying to download ${url}"
+        cecho ${INFO} "Trying to download ${url}"
         
         # Download.
         # If curl or wget is failing, continue this loop for trying an other mirror.
diff --git a/deal.II-toolchain/packages/boost.package b/deal.II-toolchain/packages/boost.package
index 2557879..dd1f7ac 100644
--- a/deal.II-toolchain/packages/boost.package
+++ b/deal.II-toolchain/packages/boost.package
@@ -9,8 +9,11 @@ INSTALL_PATH=${INSTALL_PATH}/${NAME}
 package_specific_build () {
     cp -rf ${UNPACK_PATH}/${NAME}/* .
     ./bootstrap.sh --prefix=${INSTALL_PATH}
+    quit_if_fail "boost build ./bootstrap.sh failed"
+    
     echo "using mpi ;" > user-config.jam
     ./b2 -j ${PROCS} --user-config=user-config.jam --build-dir=candi_build_dir link=shared install ${CONFOPTS}
+    quit_if_fail "boost build ./b2 failed"
 }
 
 package_specific_register () {
diff --git a/deal.II-toolchain/packages/bzip2.package b/deal.II-toolchain/packages/bzip2.package
index ef4d77e..0482cf1 100644
--- a/deal.II-toolchain/packages/bzip2.package
+++ b/deal.II-toolchain/packages/bzip2.package
@@ -1,5 +1,6 @@
-NAME=bzip2-1.0.6
-SOURCE=http://www.bzip.org/1.0.6/
+VERSION=1.0.6
+NAME=bzip2-${VERSION}
+SOURCE=http://www.bzip.org/${VERSION}/
 PACKING=.tar.gz
 CHECKSUM=00b516f4704d4a7cb50a1d97e6e8e15b
 BUILDCHAIN=custom
@@ -10,7 +11,7 @@ package_specific_build () {
     cp -rf ${UNPACK_PATH}/${NAME}/* .
     
     # patch the Makefile
-    patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/bzip2-1.0.6.patch || true
+    patch -p1 --forward < ${ORIG_DIR}/${PROJECT}/patches/bzip2-${VERSION}.patch || true
     
     # compile bzip2
     make install
diff --git a/deal.II-toolchain/packages/dealii-prepare.package b/deal.II-toolchain/packages/dealii-prepare.package
index 75cc33f..fa3df42 100644
--- a/deal.II-toolchain/packages/dealii-prepare.package
+++ b/deal.II-toolchain/packages/dealii-prepare.package
@@ -27,7 +27,6 @@ if [ -z "${SuperLUDist}" ]; then
     SuperLUDist=ON
 fi
 
-
 # Transform upper case to lower case.
 PACKAGES_OFF=${PACKAGES_OFF,,}
 
diff --git a/deal.II-toolchain/packages/hdf5.package b/deal.II-toolchain/packages/hdf5.package
index e3be378..1be6113 100644
--- a/deal.II-toolchain/packages/hdf5.package
+++ b/deal.II-toolchain/packages/hdf5.package
@@ -12,4 +12,3 @@ INSTALL_PATH=${INSTALL_PATH}/${NAME}
 package_specific_register () {
     export HDF5_DIR=${INSTALL_PATH}
 }
-
diff --git a/deal.II-toolchain/packages/p4est.package b/deal.II-toolchain/packages/p4est.package
index 5f867b9..8782bfb 100644
--- a/deal.II-toolchain/packages/p4est.package
+++ b/deal.II-toolchain/packages/p4est.package
@@ -31,7 +31,7 @@ package_specific_setup () {
     # choose names for fast and debug build directories
     BUILD_FAST="${BUILD_PATH}/${NAME}/FAST"
     BUILD_DEBUG="${BUILD_PATH}/${NAME}/DEBUG"
-
+    
     # choose names for fast and debug installation directories
     INSTALL_FAST="${INSTALL_PATH}/FAST"
     INSTALL_DEBUG="${INSTALL_PATH}/DEBUG"
@@ -43,7 +43,7 @@ package_specific_setup () {
     echo "Install FAST: $INSTALL_FAST"
     echo "Install DEBUG: $INSTALL_DEBUG"
     echo "Checking environment: CFLAGS P4EST_CFLAGS_FAST P4EST_CFLAGS_DEBUG"
-
+    
     test -f "${UNPACK_PATH}/${EXTRACTSTO}/src/p4est.h" || bdie "Main header file missing"
     test -f "${UNPACK_PATH}/${EXTRACTSTO}/configure" || bdie "Configure script missing"
     
@@ -53,8 +53,9 @@ package_specific_setup () {
     # remove old versions
     if test -d "${BUILD_PATH}/${NAME}"; then
         rm -rf "${BUILD_PATH}/${NAME}"
+        quit_if_fail "p4est: rm -rf ${BUILD_PATH}/${NAME} failed"
     fi
-
+    
     echo "Build FAST version in $BUILD_FAST"
     mkdir -p "$BUILD_FAST"
     cd "$BUILD_FAST"
@@ -87,7 +88,6 @@ package_specific_setup () {
     touch candi_successful_build
 }
 
-
 package_specific_register () {
     export P4EST_DIR=${INSTALL_PATH}
 }
diff --git a/deal.II-toolchain/packages/parmetis.package b/deal.II-toolchain/packages/parmetis.package
index 57ae8b2..055ad28 100644
--- a/deal.II-toolchain/packages/parmetis.package
+++ b/deal.II-toolchain/packages/parmetis.package
@@ -8,14 +8,30 @@ INSTALL_PATH=${INSTALL_PATH}/${NAME}
 
 package_specific_build() {
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
+    
+    # Firstly build metis
     cd metis
+    
     make config prefix=${INSTALL_PATH} shared=1
+    quit_if_fail "parmetis/metis make config failed"
+    
     make -j ${PROCS}
+    quit_if_fail "parmetis/metis make failed"
+    
     make install
+    quit_if_fail "parmetis/metis make install failed"
+    
+    # Secondly build parmetis
     cd ..
+    
     make config prefix=${INSTALL_PATH} shared=1
+    quit_if_fail "parmetis make config failed"
+    
     make -j ${PROCS}
+    quit_if_fail "parmetis make failed"
+    
     make install
+    quit_if_fail "parmetis make install failed"
 }
 
 package_specific_register () {
diff --git a/deal.II-toolchain/packages/petsc.package b/deal.II-toolchain/packages/petsc.package
index fffaeff..e07a24a 100644
--- a/deal.II-toolchain/packages/petsc.package
+++ b/deal.II-toolchain/packages/petsc.package
@@ -20,23 +20,23 @@ for external_pkg in hypre; do
     CONFOPTS="${CONFOPTS} --download-${external_pkg}=1"
 done
 
-if [ "$CC" ]; then
+if [ ! -z "$CC" ]; then
     CONFOPTS="${CONFOPTS} CC=$CC"
 fi
 
-if [ "$CXX" ]; then
+if [ ! -z "$CXX" ]; then
     CONFOPTS="${CONFOPTS} CXX=$CXX"
 fi
 
-if [ "$FC" ]; then
+if [ ! -z "$FC" ]; then
     CONFOPTS="${CONFOPTS} FC=$FC"
 fi
 
-if [ "$F77" ]; then
+if [ ! -z "$F77" ]; then
     CONFOPTS="${CONFOPTS} F77=$F77"
 fi
 
-if [ "$F90" ]; then
+if [ ! -z "$F90" ]; then
     CONFOPTS="${CONFOPTS} F90=$F90"
 fi
 
@@ -51,10 +51,12 @@ package_specific_setup () {
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
     
     ./configure --prefix=${INSTALL_PATH} ${CONFOPTS}
+    quit_if_fail "petsc ./configure failed"
+    
     make all install
+    quit_if_fail "petsc make all install failed"
 }
 
 package_specific_register () {
     export PETSC_DIR=${INSTALL_PATH}
 }
-
diff --git a/deal.II-toolchain/packages/slepc.package b/deal.II-toolchain/packages/slepc.package
index dbae55b..5222527 100644
--- a/deal.II-toolchain/packages/slepc.package
+++ b/deal.II-toolchain/packages/slepc.package
@@ -12,7 +12,10 @@ package_specific_setup () {
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
     
     ./configure --prefix=${INSTALL_PATH} ${CONFOPTS}
+    quit_if_fail "slepc ./configure failed"
+    
     make SLEPC_DIR=$PWD PETSC_DIR=${PETSC_DIR} all install
+    quit_if_fail "slepc make all install failed"
 }
 
 package_specific_register () {
diff --git a/deal.II-toolchain/packages/superlu_dist.package b/deal.II-toolchain/packages/superlu_dist.package
index b4911e4..017e7d6 100644
--- a/deal.II-toolchain/packages/superlu_dist.package
+++ b/deal.II-toolchain/packages/superlu_dist.package
@@ -78,6 +78,8 @@ CDEFS        = -DAdd_
     
     # now compile superlu_dist
     make superlulib
+    quit_if_fail "superlu_dist make superlulib failed"
+    
     mkdir -p ${INSTALL_PATH}/include/superlu
     cp SRC/*.h ${INSTALL_PATH}/include/superlu
 }
@@ -85,4 +87,3 @@ CDEFS        = -DAdd_
 package_specific_register () {
     export SUPERLU_DIR=${INSTALL_PATH}
 }
-
diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index 7859dac..5e7e9ee 100644
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -1,3 +1,7 @@
+if [ -z "${TRILINOS_MAJOR_VERSION}" ]; then
+    TRILINOS_MAJOR_VERSION=AUTO
+fi
+
 if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ] || [ ${TRILINOS_MAJOR_VERSION} = "12" ]; then
     SOURCE=http://trilinos.csbsju.edu/download/files/
     VERSION=12.2.1
diff --git a/deal.II-toolchain/packages/zlib.package b/deal.II-toolchain/packages/zlib.package
index 7e0f3cb..afffeb6 100644
--- a/deal.II-toolchain/packages/zlib.package
+++ b/deal.II-toolchain/packages/zlib.package
@@ -9,10 +9,12 @@ INSTALL_PATH=${INSTALL_PATH}/${NAME}
 package_specific_build () {
     cp -rf ${UNPACK_PATH}/${NAME}/* .
     ./configure --prefix=${INSTALL_PATH}
+    quit_if_fail "zlib configure failed"
+    
     make install
+    quit_if_fail "zlib make install failed"
 }
 
-
 package_specific_register () {
     export ZLIB_DIR=${INSTALL_PATH}/
     export ZLIB_INCLUDE=${INSTALL_PATH}/include