From 1b692ff57abb5c8886b50ace321d65924fea1f74 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee>
Date: Tue, 12 Jun 2012 18:28:17 +0000
Subject: Rename configuration script

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@37 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
---
 LORENE.sh         | 208 ------------------------------------------------------
 configuration.ccl |   2 +-
 configure.sh      | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 209 insertions(+), 209 deletions(-)
 delete mode 100644 LORENE.sh
 create mode 100644 configure.sh

diff --git a/LORENE.sh b/LORENE.sh
deleted file mode 100644
index 6cf047b..0000000
--- a/LORENE.sh
+++ /dev/null
@@ -1,208 +0,0 @@
-#! /bin/bash
-
-################################################################################
-# Prepare
-################################################################################
-
-# Set up shell
-if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then
-    set -x                      # Output commands
-fi
-set -e                          # Abort on errors
-
-
-
-################################################################################
-# Search
-################################################################################
-
-if [ -z "${LORENE_DIR}" ]; then
-    echo "BEGIN MESSAGE"
-    echo "LORENE selected, but LORENE_DIR not set."
-    echo "END MESSAGE"
-else
-    echo "BEGIN MESSAGE"
-    echo "Using LORENE in ${LORENE_DIR}"
-    echo "END MESSAGE"
-fi
-
-
-
-################################################################################
-# Build
-################################################################################
-
-if [ -z "${LORENE_DIR}"                                                 \
-     -o "$(echo "${LORENE_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ]
-then
-    echo "BEGIN MESSAGE"
-    echo "Using bundled LORENE..."
-    echo "END MESSAGE"
-    
-    # Set locations
-    THORN=LORENE
-    NAME=Lorene
-    SRCDIR=$(dirname $0)
-    BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
-    if [ -z "${LORENE_INSTALL_DIR}" ]; then
-        INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
-    else
-        echo "BEGIN MESSAGE"
-        echo "Installing LORENE into ${LORENE_INSTALL_DIR}"
-        echo "END MESSAGE"
-        INSTALL_DIR=${LORENE_INSTALL_DIR}
-    fi
-    DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
-    LORENE_DIR=${INSTALL_DIR}
-    
-    if [ -e ${DONE_FILE} -a ${DONE_FILE} -nt ${SRCDIR}/dist/${NAME}.tar.gz \
-                         -a ${DONE_FILE} -nt ${SRCDIR}/LORENE.sh ]
-    then
-        echo "BEGIN MESSAGE"
-        echo "LORENE has already been built; doing nothing"
-        echo "END MESSAGE"
-    else
-        echo "BEGIN MESSAGE"
-        echo "Building LORENE"
-        echo "END MESSAGE"
-        
-        # Build in a subshell
-        (
-        exec >&2                # Redirect stdout to stderr
-        if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then
-            set -x              # Output commands
-        fi
-        set -e                  # Abort on errors
-        cd ${SCRATCH_BUILD}
-        
-        # Set up environment
-        unset LIBS
-        if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
-            export OBJECT_MODE=64
-        fi
-        
-        echo "HDF5: Preparing directory structure..."
-        mkdir build external done 2> /dev/null || true
-        rm -rf ${BUILD_DIR} ${INSTALL_DIR}
-        mkdir ${BUILD_DIR} ${INSTALL_DIR}
-        
-        echo "LORENE: Unpacking archive..."
-        pushd ${BUILD_DIR}
-        ${TAR} xzf ${SRCDIR}/dist/${NAME}.tar.gz
-        ${PATCH} -p0 < ${SRCDIR}/dist/des.patch
-        ${PATCH} -p0 < ${SRCDIR}/dist/makesystem.patch
-        ${PATCH} -p0 < ${SRCDIR}/dist/pgplot.patch
-        ${PATCH} -p0 < ${SRCDIR}/dist/openmp.patch
-        ${PATCH} -p0 < ${SRCDIR}/dist/check_fopen_error.patch
-        # Some (ancient but still used) versions of patch don't support the
-        # patch format used here but also don't report an error using the
-        # exit code. So we use this patch to test for this
-        ${PATCH} -p0 < ${SRCDIR}/dist/patchtest.patch
-        if [ ! -e Lorene/.patch_tmp ]; then
-          echo 'BEGIN ERROR'
-          echo 'The version of patch is too old to understand this patch format.'
-          echo 'Please set the PATCH environment variable to a more recent '
-          echo 'version of the patch command.'
-          echo 'END ERROR'
-          exit 1
-        fi
-        rm -f Lorene/.patch_tmp
-        # Prevent overly long lines
-        for file in $(find ${NAME} -name '*.f'); do
-            # Remove CVS Header comments
-            perl -pi -e 's{\$Header.*\$}{\$Header\$}g' $file
-            # Replace tabs with eight blanks
-            perl -pi -e 's{\t}{        }' $file
-            # Remove in-line comments (in lines without quotes)
-            perl -pi -e 's{^([^'\''"]*?)!.*$}{$1}' $file
-            # Break long lines
-            perl -pi -e 's{^([ 0-9].{71})(.+)}{$1\n     \$$2}' $file
-        done
-        
-        echo "LORENE: Configuring..."
-        cd ${NAME}
-        if echo ${F77} | grep -i xlf > /dev/null 2>&1; then
-            FIXEDF77FLAGS=-qfixed
-        fi
-        export HOME_LORENE=${BUILD_DIR}/${NAME}
-        cat > local_settings <<EOF
-CXX = ${CXX}
-CXXFLAGS = ${CXXFLAGS} ${CPPFLAGS} ${CPP_OPENMP_FLAGS}
-CXXFLAGS_G = ${CXXFLAGS} ${CPPFLAGS}
-F77 = ${F77}
-F77FLAGS = ${F77FLAGS} ${FIXEDF77FLAGS}
-F77FLAGS_G = ${F77FLAGS} ${FIXEDF77FLAGS}
-INC = -I\$(HOME_LORENE)/C++/Include -I\$(HOME_LORENE)/C++/Include_extra \$(addprefix -I,${GSL_INC_DIRS})
-RANLIB = ${RANLIB}
-# We don't need dependencies since we always build from scratch
-#MAKEDEPEND = ${CXX_DEPEND} \$(INC) \$< ${CXX_DEPEND_OUT} && mv \$@ \$(df).d
-MAKEDEPEND = : > \$(df).d
-DEPDIR = .deps
-FFT_DIR = FFT991
-LIB_CXX = ${LIBS}
-LIB_LAPACK = ${LAPACK_LIBS} ${BLAS_LIBS}
-LIB_PGPLOT =
-LIB_GSL = ${GSL_LIBS}
-DONTBUILDDEBUGLIB = yes
-EOF
-        if [ -n "$XARGS" ]; then echo "XARGS = $XARGS" >> local_settings; fi
-        if [ -n "$FIND"  ]; then echo "FIND = $FIND"   >> local_settings; fi
-        
-        echo "LORENE: Building..."
-        # Note that this builds two versions of the library, a
-        # "regular" version and a "debug" version.  Both are identical
-        # (since we specified identical build options above), and we
-        # ignore the "debug" version.
-        ${MAKE} cpp fortran export
-
-        echo "LORENE: Installing..."
-        mv ${BUILD_DIR}/${NAME}/Lib                ${INSTALL_DIR}
-        mkdir ${INSTALL_DIR}/C++
-        mv ${BUILD_DIR}/${NAME}/C++/Include        ${INSTALL_DIR}/C++
-        mkdir ${INSTALL_DIR}/Export
-        mkdir ${INSTALL_DIR}/Export/C++
-        mv ${BUILD_DIR}/${NAME}/Export/C++/Include ${INSTALL_DIR}/Export/C++
-        popd
-
-        echo "LORENE: Cleaning up..."
-        rm -rf ${BUILD_DIR}
-
-        date > ${DONE_FILE}
-        echo "LORENE: Done."
-        
-        )
-        
-        if (( $? )); then
-            echo 'BEGIN ERROR'
-            echo 'Error while building LORENE. Aborting.'
-            echo 'END ERROR'
-            exit 1
-        fi
-    fi
-    
-fi
-
-
-
-################################################################################
-# Configure Cactus
-################################################################################
-
-# Set options
-LORENE_INC_DIRS="${LORENE_DIR}/Export/C++/Include ${LORENE_DIR}/C++/Include"
-LORENE_LIB_DIRS="${LORENE_DIR}/Lib ${LORENE_EXTRA_LIB_DIRS}"
-LORENE_LIBS="lorene_export lorene lorenef77 ${LORENE_EXTRA_LIBS}"
-
-# Pass options to Cactus
-echo "BEGIN MAKE_DEFINITION"
-echo "HAVE_LORENE     = 1"
-echo "LORENE_DIR      = ${LORENE_DIR}"
-echo "LORENE_INC_DIRS = ${LORENE_INC_DIRS}"
-echo "LORENE_LIB_DIRS = ${LORENE_LIB_DIRS}"
-echo "LORENE_LIBS     = ${LORENE_LIBS}"
-echo "HOME_LORENE     = ${LORENE_DIR}"
-echo "END MAKE_DEFINITION"
-
-echo 'INCLUDE_DIRECTORY $(LORENE_INC_DIRS)'
-echo 'LIBRARY_DIRECTORY $(LORENE_LIB_DIRS)'
-echo 'LIBRARY           $(LORENE_LIBS)'
diff --git a/configuration.ccl b/configuration.ccl
index ecfbf8c..241a44d 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -2,7 +2,7 @@
 
 PROVIDES LORENE
 {
-  SCRIPT LORENE.sh
+  SCRIPT configure.sh
   LANG bash
   OPTIONS LORENE_DIR LORENE_INSTALL_DIR LORENE_EXTRA_LIB_DIRS LORENE_EXTRA_LIBS
 }
diff --git a/configure.sh b/configure.sh
new file mode 100644
index 0000000..04bd849
--- /dev/null
+++ b/configure.sh
@@ -0,0 +1,208 @@
+#! /bin/bash
+
+################################################################################
+# Prepare
+################################################################################
+
+# Set up shell
+if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then
+    set -x                      # Output commands
+fi
+set -e                          # Abort on errors
+
+
+
+################################################################################
+# Search
+################################################################################
+
+if [ -z "${LORENE_DIR}" ]; then
+    echo "BEGIN MESSAGE"
+    echo "LORENE selected, but LORENE_DIR not set."
+    echo "END MESSAGE"
+else
+    echo "BEGIN MESSAGE"
+    echo "Using LORENE in ${LORENE_DIR}"
+    echo "END MESSAGE"
+fi
+
+
+
+################################################################################
+# Build
+################################################################################
+
+if [ -z "${LORENE_DIR}"                                                 \
+     -o "$(echo "${LORENE_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ]
+then
+    echo "BEGIN MESSAGE"
+    echo "Using bundled LORENE..."
+    echo "END MESSAGE"
+    
+    # Set locations
+    THORN=LORENE
+    NAME=Lorene
+    SRCDIR=$(dirname $0)
+    BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
+    if [ -z "${LORENE_INSTALL_DIR}" ]; then
+        INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    else
+        echo "BEGIN MESSAGE"
+        echo "Installing LORENE into ${LORENE_INSTALL_DIR}"
+        echo "END MESSAGE"
+        INSTALL_DIR=${LORENE_INSTALL_DIR}
+    fi
+    DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
+    LORENE_DIR=${INSTALL_DIR}
+    
+    if [ -e ${DONE_FILE} -a ${DONE_FILE} -nt ${SRCDIR}/dist/${NAME}.tar.gz \
+                         -a ${DONE_FILE} -nt ${SRCDIR}/configure.sh ]
+    then
+        echo "BEGIN MESSAGE"
+        echo "LORENE has already been built; doing nothing"
+        echo "END MESSAGE"
+    else
+        echo "BEGIN MESSAGE"
+        echo "Building LORENE"
+        echo "END MESSAGE"
+        
+        # Build in a subshell
+        (
+        exec >&2                # Redirect stdout to stderr
+        if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then
+            set -x              # Output commands
+        fi
+        set -e                  # Abort on errors
+        cd ${SCRATCH_BUILD}
+        
+        # Set up environment
+        unset LIBS
+        if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
+            export OBJECT_MODE=64
+        fi
+        
+        echo "HDF5: Preparing directory structure..."
+        mkdir build external done 2> /dev/null || true
+        rm -rf ${BUILD_DIR} ${INSTALL_DIR}
+        mkdir ${BUILD_DIR} ${INSTALL_DIR}
+        
+        echo "LORENE: Unpacking archive..."
+        pushd ${BUILD_DIR}
+        ${TAR} xzf ${SRCDIR}/dist/${NAME}.tar.gz
+        ${PATCH} -p0 < ${SRCDIR}/dist/des.patch
+        ${PATCH} -p0 < ${SRCDIR}/dist/makesystem.patch
+        ${PATCH} -p0 < ${SRCDIR}/dist/pgplot.patch
+        ${PATCH} -p0 < ${SRCDIR}/dist/openmp.patch
+        ${PATCH} -p0 < ${SRCDIR}/dist/check_fopen_error.patch
+        # Some (ancient but still used) versions of patch don't support the
+        # patch format used here but also don't report an error using the
+        # exit code. So we use this patch to test for this
+        ${PATCH} -p0 < ${SRCDIR}/dist/patchtest.patch
+        if [ ! -e Lorene/.patch_tmp ]; then
+          echo 'BEGIN ERROR'
+          echo 'The version of patch is too old to understand this patch format.'
+          echo 'Please set the PATCH environment variable to a more recent '
+          echo 'version of the patch command.'
+          echo 'END ERROR'
+          exit 1
+        fi
+        rm -f Lorene/.patch_tmp
+        # Prevent overly long lines
+        for file in $(find ${NAME} -name '*.f'); do
+            # Remove CVS Header comments
+            perl -pi -e 's{\$Header.*\$}{\$Header\$}g' $file
+            # Replace tabs with eight blanks
+            perl -pi -e 's{\t}{        }' $file
+            # Remove in-line comments (in lines without quotes)
+            perl -pi -e 's{^([^'\''"]*?)!.*$}{$1}' $file
+            # Break long lines
+            perl -pi -e 's{^([ 0-9].{71})(.+)}{$1\n     \$$2}' $file
+        done
+        
+        echo "LORENE: Configuring..."
+        cd ${NAME}
+        if echo ${F77} | grep -i xlf > /dev/null 2>&1; then
+            FIXEDF77FLAGS=-qfixed
+        fi
+        export HOME_LORENE=${BUILD_DIR}/${NAME}
+        cat > local_settings <<EOF
+CXX = ${CXX}
+CXXFLAGS = ${CXXFLAGS} ${CPPFLAGS} ${CPP_OPENMP_FLAGS}
+CXXFLAGS_G = ${CXXFLAGS} ${CPPFLAGS}
+F77 = ${F77}
+F77FLAGS = ${F77FLAGS} ${FIXEDF77FLAGS}
+F77FLAGS_G = ${F77FLAGS} ${FIXEDF77FLAGS}
+INC = -I\$(HOME_LORENE)/C++/Include -I\$(HOME_LORENE)/C++/Include_extra \$(addprefix -I,${GSL_INC_DIRS})
+RANLIB = ${RANLIB}
+# We don't need dependencies since we always build from scratch
+#MAKEDEPEND = ${CXX_DEPEND} \$(INC) \$< ${CXX_DEPEND_OUT} && mv \$@ \$(df).d
+MAKEDEPEND = : > \$(df).d
+DEPDIR = .deps
+FFT_DIR = FFT991
+LIB_CXX = ${LIBS}
+LIB_LAPACK = ${LAPACK_LIBS} ${BLAS_LIBS}
+LIB_PGPLOT =
+LIB_GSL = ${GSL_LIBS}
+DONTBUILDDEBUGLIB = yes
+EOF
+        if [ -n "$XARGS" ]; then echo "XARGS = $XARGS" >> local_settings; fi
+        if [ -n "$FIND"  ]; then echo "FIND = $FIND"   >> local_settings; fi
+        
+        echo "LORENE: Building..."
+        # Note that this builds two versions of the library, a
+        # "regular" version and a "debug" version.  Both are identical
+        # (since we specified identical build options above), and we
+        # ignore the "debug" version.
+        ${MAKE} cpp fortran export
+
+        echo "LORENE: Installing..."
+        mv ${BUILD_DIR}/${NAME}/Lib                ${INSTALL_DIR}
+        mkdir ${INSTALL_DIR}/C++
+        mv ${BUILD_DIR}/${NAME}/C++/Include        ${INSTALL_DIR}/C++
+        mkdir ${INSTALL_DIR}/Export
+        mkdir ${INSTALL_DIR}/Export/C++
+        mv ${BUILD_DIR}/${NAME}/Export/C++/Include ${INSTALL_DIR}/Export/C++
+        popd
+
+        echo "LORENE: Cleaning up..."
+        rm -rf ${BUILD_DIR}
+
+        date > ${DONE_FILE}
+        echo "LORENE: Done."
+        
+        )
+        
+        if (( $? )); then
+            echo 'BEGIN ERROR'
+            echo 'Error while building LORENE. Aborting.'
+            echo 'END ERROR'
+            exit 1
+        fi
+    fi
+    
+fi
+
+
+
+################################################################################
+# Configure Cactus
+################################################################################
+
+# Set options
+LORENE_INC_DIRS="${LORENE_DIR}/Export/C++/Include ${LORENE_DIR}/C++/Include"
+LORENE_LIB_DIRS="${LORENE_DIR}/Lib ${LORENE_EXTRA_LIB_DIRS}"
+LORENE_LIBS="lorene_export lorene lorenef77 ${LORENE_EXTRA_LIBS}"
+
+# Pass options to Cactus
+echo "BEGIN MAKE_DEFINITION"
+echo "HAVE_LORENE     = 1"
+echo "LORENE_DIR      = ${LORENE_DIR}"
+echo "LORENE_INC_DIRS = ${LORENE_INC_DIRS}"
+echo "LORENE_LIB_DIRS = ${LORENE_LIB_DIRS}"
+echo "LORENE_LIBS     = ${LORENE_LIBS}"
+echo "HOME_LORENE     = ${LORENE_DIR}"
+echo "END MAKE_DEFINITION"
+
+echo 'INCLUDE_DIRECTORY $(LORENE_INC_DIRS)'
+echo 'LIBRARY_DIRECTORY $(LORENE_LIB_DIRS)'
+echo 'LIBRARY           $(LORENE_LIBS)'
-- 
cgit v1.2.3