candi: adds creation of individual package configuration files

diff --git a/candi.sh b/candi.sh
index ef0ebd6351940860de339e93a536bc594335ce33..5c0396c6223fdaaa15c9de160cd69aee127f9d9c 100755 (executable)
--- a/candi.sh
+++ b/candi.sh
@@ -585,6 +585,7 @@ default DOWNLOAD_PATH=${PREFIX_PATH}/src
 default UNPACK_PATH=${PREFIX_PATH}/${PROJECT}-unpack
 default BUILD_PATH=${PREFIX_PATH}/${PROJECT}-build
 default INSTALL_PATH=${PREFIX_PATH}/${PROJECT}
+default CONFIGURATION_PATH=${PREFIX_PATH}/${PROJECT}/share/configuration
 
 default CLEAN_BUILD=false
 default STABLE_BUILD=true
@@ -710,10 +711,11 @@ cecho ${GOOD} "Platform: ${PLATFORM}"
 echo
 
 echo "-------------------------------------------------------------------------------"
-cecho ${INFO} "Downloading files to:   $(prettify_dir ${DOWNLOAD_PATH})"
-cecho ${INFO} "Unpacking files to:     $(prettify_dir ${UNPACK_PATH})"
-cecho ${INFO} "Building packages in:   $(prettify_dir ${BUILD_PATH})"
-cecho ${GOOD} "Installing packages in: $(prettify_dir ${INSTALL_PATH})"
+cecho ${INFO} "Downloading files to:     $(prettify_dir ${DOWNLOAD_PATH})"
+cecho ${INFO} "Unpacking files to:       $(prettify_dir ${UNPACK_PATH})"
+cecho ${INFO} "Building packages in:     $(prettify_dir ${BUILD_PATH})"
+cecho ${GOOD} "Installing packages in:   $(prettify_dir ${INSTALL_PATH})"
+cecho ${GOOD} "Package configuration in: $(prettify_dir ${CONFIGURATION_PATH})"
 echo
 
 echo "-------------------------------------------------------------------------------"
@@ -845,9 +847,11 @@ mkdir -p ${DOWNLOAD_PATH}
 mkdir -p ${UNPACK_PATH}
 mkdir -p ${BUILD_PATH}
 mkdir -p ${INSTALL_PATH}
+mkdir -p ${CONFIGURATION_PATH}
 
 
 ORIG_INSTALL_PATH=${INSTALL_PATH}
+ORIG_CONFIGURATION_PATH=${CONFIGURATION_PATH}
 ORIG_PROCS=${PROCS}
 guess_architecture
 
@@ -899,6 +903,7 @@ for PACKAGE in ${PACKAGES[@]}; do
     TARGETS=('' install)
     PROCS=${ORIG_PROCS}
     INSTALL_PATH=${ORIG_INSTALL_PATH}
+    CONFIGURATION_PATH=${ORIG_CONFIGURATION_PATH}
     
     # Reset package-specific functions
     package_specific_setup () { true; }

diff --git a/deal.II-toolchain/packages/boost.package b/deal.II-toolchain/packages/boost.package
index c24ed3cddb2ae25d2235cabeaa395e42ad660e4a..93001e862e545717befaaa94a616f16a09d64395 100644 (file)
--- a/deal.II-toolchain/packages/boost.package
+++ b/deal.II-toolchain/packages/boost.package
@@ -23,3 +23,15 @@ package_specific_register () {
     export BOOST_LIBRARYDIR=${INSTALL_PATH}/lib
     export BOOST_USE_MULTITHREADED=OFF
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export BOOST_ROOT=${INSTALL_PATH}
+export BOOST_INCLUDEDIR=${INSTALL_PATH}/include
+export BOOST_LIBRARYDIR=${INSTALL_PATH}/lib
+export BOOST_USE_MULTITHREADED=OFF
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/bzip2.package b/deal.II-toolchain/packages/bzip2.package
index c08c919f24611046739879ab642cfddb637a30a3..38c118680d91503aefb9ace9563006ea643e204d 100644 (file)
--- a/deal.II-toolchain/packages/bzip2.package
+++ b/deal.II-toolchain/packages/bzip2.package
@@ -21,3 +21,13 @@ package_specific_register () {
     export BZIP2_INCLUDE=${INSTALL_PATH}/include
     export BZIP2_LIBPATH=${INSTALL_PATH}/lib
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export BZIP2_INCLUDE=${INSTALL_PATH}/include
+export BZIP2_LIBPATH=${INSTALL_PATH}/lib
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/cmake.package b/deal.II-toolchain/packages/cmake.package
index 63a967d6ecaa6906591acedf3921f2a301a99804..7d73c1dba1fd5f419d2aae24aecb116b95597005 100644 (file)
--- a/deal.II-toolchain/packages/cmake.package
+++ b/deal.II-toolchain/packages/cmake.package
@@ -12,3 +12,12 @@ package_specific_install () {
 package_specific_register () {
     export PATH=${INSTALL_PATH}/${EXTRACTSTO}/bin:${PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export PATH=${INSTALL_PATH}/${EXTRACTSTO}/bin:\${PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/dealii.package b/deal.II-toolchain/packages/dealii.package
index 444d75de33dfad0afc0f9016dcb099b3ec833a26..bc21b2f8ba1ff1a13966a5b82ce2d79df7d46b14 100644 (file)
--- a/deal.II-toolchain/packages/dealii.package
+++ b/deal.II-toolchain/packages/dealii.package
@@ -177,9 +177,10 @@ if [ ! -z "${OPENCASCADE_DIR}" ]; then
 fi
 
 ################################################################################
-################################################################################
-# **********************************************************************************
+
 package_specific_conf() {
+    ############################################################################
+    # Generate modulefile
 
 # Prepare modulefile path and config file name
 if [ -z "${COMPILER}" ]; then
@@ -192,9 +193,7 @@ if [ -z "${MODULEFILE_PATH}" ]; then
     MODULEFILE_PATH=${INSTALL_PATH}/share/modulefiles${MODULEFILE_PATH}
 fi
 
-if [ -z "${CONFIG_FILE}" ]; then
-    CONFIG_FILE=${MODULEFILE_PATH}/${COMPILER}
-fi
+CONFIG_FILE=${MODULEFILE_PATH}/${COMPILER}
 
 CURRENT_MODULES=$(echo ${LOADEDMODULES} | sed 's/:/\ /g')
 
@@ -224,4 +223,14 @@ setenv                  DEAL_II_DIR         ${INSTALL_PATH}
     echo
 
     export DEAL_II_DIR=${INSTALL_PATH}
+    
+    ############################################################################
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export DEAL_II_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
 }
+
+

diff --git a/deal.II-toolchain/packages/hdf5.package b/deal.II-toolchain/packages/hdf5.package
index 1be6113ee524bb2b7a2b3718fb3089711739eb62..772c550db804358e41805d8faad8c71841c3756f 100644 (file)
--- a/deal.II-toolchain/packages/hdf5.package
+++ b/deal.II-toolchain/packages/hdf5.package
@@ -12,3 +12,12 @@ INSTALL_PATH=${INSTALL_PATH}/${NAME}
 package_specific_register () {
     export HDF5_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export HDF5_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package
index 3a5649915c92efb7ee23dad78452667bfac96fe2..52fe279831143cf39ec5f011cb073b0d1ac07e59 100644 (file)
--- a/deal.II-toolchain/packages/opencascade.package
+++ b/deal.II-toolchain/packages/opencascade.package
@@ -37,3 +37,12 @@ CONFOPTS="-D OCE_INSTALL_PREFIX=${INSTALL_PATH} \
 package_specific_register () {
     export OPENCASCADE_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export OPENCASCADE_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/p4est.package b/deal.II-toolchain/packages/p4est.package
index 8782bfb4249dcb3d6a505340dc3cf7238ddd2cc4..3af2a5214b6186e663af2028b5c837ed51cd20a3 100644 (file)
--- a/deal.II-toolchain/packages/p4est.package
+++ b/deal.II-toolchain/packages/p4est.package
@@ -91,3 +91,12 @@ package_specific_setup () {
 package_specific_register () {
     export P4EST_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export P4EST_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/parmetis.package b/deal.II-toolchain/packages/parmetis.package
index 1cff76bccfdfd8e3be08b5d1e29c7f279a340de9..833991b285d7eaef36d1acbdac3b9442e849472d 100644 (file)
--- a/deal.II-toolchain/packages/parmetis.package
+++ b/deal.II-toolchain/packages/parmetis.package
@@ -39,3 +39,13 @@ package_specific_register () {
     export METIS_DIR=${INSTALL_PATH}
     export PARMETIS_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export METIS_DIR=${INSTALL_PATH}
+export PARMETIS_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/petsc.package b/deal.II-toolchain/packages/petsc.package
index 2054b1c5c797d586741936184ce13ed9dc290c18..27baac28040f18fc920c5d8d067d535cfe0bbcae 100644 (file)
--- a/deal.II-toolchain/packages/petsc.package
+++ b/deal.II-toolchain/packages/petsc.package
@@ -62,3 +62,12 @@ package_specific_setup () {
 package_specific_register () {
     export PETSC_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export PETSC_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/slepc.package b/deal.II-toolchain/packages/slepc.package
index f469b650a8baf9cd919246eec6b03410a90f77d4..d503a6f0ffea491880cbc495f7ace300f3143662 100644 (file)
--- a/deal.II-toolchain/packages/slepc.package
+++ b/deal.II-toolchain/packages/slepc.package
@@ -26,3 +26,12 @@ package_specific_setup () {
 package_specific_register () {
     export SLEPC_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export SLEPC_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/superlu_dist.package b/deal.II-toolchain/packages/superlu_dist.package
index 017e7d6aa94c92b4f28bdb5482d69cbe47fb844d..68834a785ddfd0846b4c23b076fad05a80a0c44b 100644 (file)
--- a/deal.II-toolchain/packages/superlu_dist.package
+++ b/deal.II-toolchain/packages/superlu_dist.package
@@ -87,3 +87,12 @@ CDEFS        = -DAdd_
 package_specific_register () {
     export SUPERLU_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export SUPERLU_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index 701e3e7506f3e1570fa5965bf21b0a57dc980263..85996ddec151413605a8cf01d0604a2cc45a3d87 100644 (file)
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -141,3 +141,12 @@ CONFOPTS="${TRILINOS_CONFOPTS} \
 package_specific_register () {
     export TRILINOS_DIR=${INSTALL_PATH}
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export TRILINOS_DIR=${INSTALL_PATH}
+" >> $CONFIG_FILE
+}

diff --git a/deal.II-toolchain/packages/zlib.package b/deal.II-toolchain/packages/zlib.package
index dd3544f822779f38738e694def1a3c5aeeeda93a..5436c3a35f93c12d3f8c072ee4a8444c05a8580c 100644 (file)
--- a/deal.II-toolchain/packages/zlib.package
+++ b/deal.II-toolchain/packages/zlib.package
@@ -21,3 +21,14 @@ package_specific_register () {
     export ZLIB_INCLUDE=${INSTALL_PATH}/include
     export ZLIB_LIBPATH=${INSTALL_PATH}/lib
 }
+
+package_specific_conf () {
+    # Generate configuration file
+    CONFIG_FILE=${CONFIGURATION_PATH}/${NAME}
+    rm -f $CONFIG_FILE
+    echo "
+export ZLIB_DIR=${INSTALL_PATH}/
+export ZLIB_INCLUDE=${INSTALL_PATH}/include
+export ZLIB_LIBPATH=${INSTALL_PATH}/lib
+" >> $CONFIG_FILE
+}

diff --git a/project-deal.II-toolchain.cfg b/project-deal.II-toolchain.cfg
index 72f611dc560d33df4436c2f824d30f3ee3b3b3cc..4c4f1a037df739cfa39f0f00e73723f9dcae6d1c 100644 (file)
--- a/project-deal.II-toolchain.cfg
+++ b/project-deal.II-toolchain.cfg
@@ -18,6 +18,9 @@ CLEAN_BUILD=false
 # Where do you want the compiled software installed?
 INSTALL_PATH=${PREFIX_PATH}/${PROJECT}
 
+# Where do you want the configuration files placed?
+CONFIGURATION_PATH=${PREFIX_PATH}/${PROJECT}/share/configuration
+
 #########################################################################
 # Set up mirror server url(s), to speed up downloads, e.g.
 #   MIRROR="${MIRROR} http://server1.org/package_mirror_dir/"