From: bangerth Date: Wed, 27 Oct 2010 18:40:39 +0000 (+0000) Subject: Update from Carsten's version. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=018ba6330f164416a05e42db21e2f6146117f7fa;p=dealii-svn.git Update from Carsten's version. git-svn-id: https://svn.dealii.org/trunk@22524 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/external-libs/p4est-setup.sh b/deal.II/doc/external-libs/p4est-setup.sh index 69b856284f..8129d7c63b 100755 --- a/deal.II/doc/external-libs/p4est-setup.sh +++ b/deal.II/doc/external-libs/p4est-setup.sh @@ -4,51 +4,50 @@ # unpack under current directory UNPACK=`pwd` + # choose names for fast and debug compilation directories -BUILD_FAST="$UNPACK/p4est-build/FAST" -BUILD_DEBUG="$UNPACK/p4est-build/DEBUG" +BUILD_DIR="$UNPACK/p4est-build" +BUILD_FAST="$BUILD_DIR/FAST" +BUILD_DEBUG="$BUILD_DIR/DEBUG" function busage() { - echo "Usage: `basename $0` " + echo "Usage: `basename $0` []" } function bdie () { - echo "Error: $@" - exit 1 + echo "Error: $@" + exit 1 } if test -z "$CFLAGS" -a -z "$P4EST_CFLAGS_FAST" ; then - export CFLAGS_FAST="-O2" + export CFLAGS_FAST="-O2" else - export CFLAGS_FAST="$CFLAGS $P4EST_CFLAGS_FAST" + export CFLAGS_FAST="$CFLAGS $P4EST_CFLAGS_FAST" fi echo "CFLAGS_FAST: $CFLAGS_FAST" if test -z "$CFLAGS" -a -z "$P4EST_CFLAGS_DEBUG" ; then - export CFLAGS_DEBUG="-O0 -g" + export CFLAGS_DEBUG="-O0 -g" else - export CFLAGS_DEBUG="$CFLAGS $P4EST_CFLAGS_DEBUG" + export CFLAGS_DEBUG="$CFLAGS $P4EST_CFLAGS_DEBUG" fi echo "CFLAGS_DEBUG: $CFLAGS_DEBUG" TGZ="$1"; shift if test ! -f "$TGZ" ; then - busage - bdie "File not found" + busage + bdie "File not found" fi if ! (echo "$TGZ" | grep -q 'p4est.*.tar.gz') ; then - busage - bdie "File name mismatch" + busage + bdie "File name mismatch" fi # choose names for fast and debug installation directories -INSTALL_DIR=$1 -shift +INSTALL_DIR="$1"; shift if test -z "$INSTALL_DIR" ; then - INSTALL_FAST="$UNPACK/p4est-install/FAST" - INSTALL_DEBUG="$UNPACK/p4est-install/DEBUG" -else - INSTALL_FAST="$INSTALL_DIR/FAST" - INSTALL_DEBUG="$INSTALL_DIR/DEBUG" + INSTALL_DIR="$UNPACK/p4est-install" fi +INSTALL_FAST="$INSTALL_DIR/FAST" +INSTALL_DEBUG="$INSTALL_DIR/DEBUG" echo echo "This script tries to unpack, configure and build the p4est library." @@ -58,53 +57,50 @@ echo "Install FAST: $INSTALL_FAST" echo "Install DEBUG: $INSTALL_DEBUG" echo "Checking environment: CFLAGS P4EST_CFLAGS_FAST P4EST_CFLAGS_DEBUG" - -if test -d $UNPACK/p4est-build ; then - rm -rf $UNPACK/p4est-build +# remove old versions +if test -d "$BUILD_DIR" ; then + rm -rf "$BUILD_DIR" fi DIR=`echo "$TGZ" | sed 's/\(p4est.*\).tar.gz/\1/'` DIR=`basename $DIR` echo "Unpack directory: $UNPACK/$DIR" if test -d "$UNPACK/$DIR" ; then - echo \ - "Directory found (remove it and also the build directories" \ - "to start over)" + echo "Source directory found (remove it to unpack anew)" else - echo -n "Unpacking... " - tar -xvz -f "$TGZ" -C "$UNPACK" >/dev/null - echo "done" + echo -n "Unpacking... " + tar -xvz -f "$TGZ" -C "$UNPACK" >/dev/null + echo "done" fi test -f "$UNPACK/$DIR/src/p4est.h" || bdie "Main header file missing" test -f "$UNPACK/$DIR/configure" || bdie "Configure script missing" -echo echo "See output in files .../config.output and .../make.output" +echo echo "Build FAST version in $BUILD_FAST" mkdir -p "$BUILD_FAST" cd "$BUILD_FAST" -("$UNPACK/$DIR/configure" --enable-mpi --enable-shared --disable-vtk-binary --without-blas \ - --prefix="$INSTALL_FAST" CFLAGS="$CFLAGS_FAST" \ - "$@" || bdie "Error in configure" ) | tee config.output -(make -C sc -j 8 || bdie "Error in make sc") | tee make.output -(make src/libp4est.la -j 8 \ - || bdie "Error in make p4est") | tee -a make.output -(make install || bdie "Error in make install") | tee -a make.output +"$UNPACK/$DIR/configure" --enable-mpi --enable-shared \ + --disable-vtk-binary --without-blas \ + --prefix="$INSTALL_FAST" CFLAGS="$CFLAGS_FAST" \ + CPPFLAGS="-DSC_LOG_PRIORITY=SC_LP_ESSENTIAL" \ + "$@" > config.output || bdie "Error in configure" +make -C sc -j 8 > make.output || bdie "Error in make sc" +make -j 8 >> make.output || bdie "Error in make p4est" +make install >> make.output || bdie "Error in make install" echo "FAST version installed in $INSTALL_FAST" echo echo "Build DEBUG version in $BUILD_DEBUG" mkdir -p "$BUILD_DEBUG" cd "$BUILD_DEBUG" -if test -z "$CFLAGS" ; then - export CFLAGS="-g -O0" -fi -("$UNPACK/$DIR/configure" --enable-mpi --enable-shared --disable-vtk-binary --without-blas --enable-debug \ - --prefix="$INSTALL_DEBUG" CFLAGS="$CFLAGS_DEBUG" \ - "$@" || bdie "Error in configure") | tee config.output -(make -C sc -j 8 || bdie "Error in make sc") | tee make.output -(make src/libp4est.la -j 8 \ - || bdie "Error in make p4est") | tee -a make.output -(make install || bdie "Error in make install") | tee -a make.output +"$UNPACK/$DIR/configure" --enable-debug --enable-mpi --enable-shared \ + --disable-vtk-binary --without-blas \ + --prefix="$INSTALL_DEBUG" CFLAGS="$CFLAGS_DEBUG" \ + CPPFLAGS="-DSC_LOG_PRIORITY=SC_LP_ESSENTIAL" \ + "$@" > config.output || bdie "Error in configure" +make -C sc -j 8 > make.output || bdie "Error in make sc" +make -j 8 >> make.output || bdie "Error in make p4est" +make install >> make.output || bdie "Error in make install" echo "DEBUG version installed in $INSTALL_DEBUG" echo