From 014c0010e7ff4983537e367bc73f10b292f1df83 Mon Sep 17 00:00:00 2001 From: eschnett Date: Tue, 12 Jun 2012 18:28:50 +0000 Subject: Rename configuration script git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/libjpeg/trunk@19 ba58616d-3abc-4c77-8745-3ba8ad4a582f --- configuration.ccl | 2 +- configure.sh | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ libjpeg.sh | 163 ------------------------------------------------------ 3 files changed, 164 insertions(+), 164 deletions(-) create mode 100755 configure.sh delete mode 100755 libjpeg.sh diff --git a/configuration.ccl b/configuration.ccl index 77d6354..fdea56c 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -2,7 +2,7 @@ PROVIDES libjpeg { - SCRIPT libjpeg.sh + SCRIPT configure.sh LANG bash OPTIONS LIBJPEG_INSTALL_DIR } diff --git a/configure.sh b/configure.sh new file mode 100755 index 0000000..c09ed73 --- /dev/null +++ b/configure.sh @@ -0,0 +1,163 @@ +#! /bin/bash + +################################################################################ +# Prepare +################################################################################ + +# Set up shell +if [ "$(echo ${VERBOSE} | tr '[:upper:]' '[:lower:]')" = 'yes' ]; then + set -x # Output commands +fi +set -e # Abort on errors + +if [ -z "${LIBJPEG_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "LIBJPEG selected, but LIBJPEG_DIR not set. Checking some places..." + echo "END MESSAGE" + + FILES="include/jpeglib.h" + DIRS="/usr /usr/local ${HOME}" + for dir in $DIRS; do + LIBJPEG_DIR="$dir" + for file in $FILES; do + if [ ! -r "$dir/$file" ]; then + unset LIBJPEG_DIR + break + fi + done + if [ -n "$LIBJPEG_DIR" ]; then + break + fi + done + + if [ -z "$LIBJPEG_DIR" ]; then + echo "BEGIN MESSAGE" + echo "LIBJPEG not found" + echo "END MESSAGE" + else + echo "BEGIN MESSAGE" + echo "Found LIBJPEG in ${LIBJPEG_DIR}" + echo "END MESSAGE" + fi +fi + + +################################################################################ +# Build +################################################################################ + +if [ -z "${LIBJPEG_DIR}" \ + -o "$(echo "${LIBJPEG_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ] +then + echo "BEGIN MESSAGE" + echo "Building libjpeg..." + echo "END MESSAGE" + + # Set locations + THORN=libjpeg + NAME=jpeg-8c + SRCDIR=$(dirname $0) + BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} + if [ -z "${LIBJPEG_INSTALL_DIR}" ]; then + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "Installing libjpeg into ${LIBJPEG_INSTALL_DIR}" + echo "END MESSAGE" + INSTALL_DIR=${LIBJPEG_INSTALL_DIR} + fi + DONE_FILE=${SCRATCH_BUILD}/done/${THORN} + LIBJPEG_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 "libjpeg has already been built; doing nothing" + echo "END MESSAGE" + else + echo "BEGIN MESSAGE" + echo "Building libjpeg library" + 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 "libjpeg: Preparing directory structure..." + mkdir build external done 2> /dev/null || true + rm -rf ${BUILD_DIR} ${INSTALL_DIR} + mkdir ${BUILD_DIR} ${INSTALL_DIR} + + echo "libjpeg: Unpacking archive..." + pushd ${BUILD_DIR} + ${TAR} xzf ${SRCDIR}/dist/${NAME}.tar.gz + + echo "libjpeg: Configuring..." + cd ${NAME} + ./configure --prefix=${LIBJPEG_DIR} + + echo "libjpeg: Building..." + ${MAKE} + + echo "libjpeg: Installing..." + ${MAKE} install + popd + + echo "libjpeg: Cleaning up..." + rm -rf ${BUILD_DIR} + + date > ${DONE_FILE} + echo "libjpeg: Done." + + ) + + if (( $? )); then + echo 'BEGIN ERROR' + echo 'Error while building libjpeg. Aborting.' + echo 'END ERROR' + exit 1 + fi + fi + +fi + + + +################################################################################ +# Configure Cactus +################################################################################ + +# Set options +if [ "${LIBJPEG_DIR}" = '/usr' -o "${LIBJPEG_DIR}" = '/usr/local' ]; then + LIBJPEG_INC_DIRS='' + LIBJPEG_LIB_DIRS='' +else + LIBJPEG_INC_DIRS="${LIBJPEG_DIR}/include" + LIBJPEG_LIB_DIRS="${LIBJPEG_DIR}/lib" +fi +LIBJPEG_LIBS='jpeg' + +# Pass options to Cactus +echo "BEGIN MAKE_DEFINITION" +echo "HAVE_LIBJPEG = 1" +echo "LIBJPEG_DIR = ${LIBJPEG_DIR}" +echo "LIBJPEG_INC_DIRS = ${LIBJPEG_INC_DIRS}" +echo "LIBJPEG_LIB_DIRS = ${LIBJPEG_LIB_DIRS}" +echo "LIBJPEG_LIBS = ${LIBJPEG_LIBS}" +echo "END MAKE_DEFINITION" + +echo 'INCLUDE_DIRECTORY $(LIBJPEG_INC_DIRS)' +echo 'LIBRARY_DIRECTORY $(LIBJPEG_LIB_DIRS)' +echo 'LIBRARY $(LIBJPEG_LIBS)' diff --git a/libjpeg.sh b/libjpeg.sh deleted file mode 100755 index 5ce35c7..0000000 --- a/libjpeg.sh +++ /dev/null @@ -1,163 +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 - -if [ -z "${LIBJPEG_DIR}" ]; then - echo "BEGIN MESSAGE" - echo "LIBJPEG selected, but LIBJPEG_DIR not set. Checking some places..." - echo "END MESSAGE" - - FILES="include/jpeglib.h" - DIRS="/usr /usr/local ${HOME}" - for dir in $DIRS; do - LIBJPEG_DIR="$dir" - for file in $FILES; do - if [ ! -r "$dir/$file" ]; then - unset LIBJPEG_DIR - break - fi - done - if [ -n "$LIBJPEG_DIR" ]; then - break - fi - done - - if [ -z "$LIBJPEG_DIR" ]; then - echo "BEGIN MESSAGE" - echo "LIBJPEG not found" - echo "END MESSAGE" - else - echo "BEGIN MESSAGE" - echo "Found LIBJPEG in ${LIBJPEG_DIR}" - echo "END MESSAGE" - fi -fi - - -################################################################################ -# Build -################################################################################ - -if [ -z "${LIBJPEG_DIR}" \ - -o "$(echo "${LIBJPEG_DIR}" | tr '[a-z]' '[A-Z]')" = 'BUILD' ] -then - echo "BEGIN MESSAGE" - echo "Building libjpeg..." - echo "END MESSAGE" - - # Set locations - THORN=libjpeg - NAME=jpeg-8c - SRCDIR=$(dirname $0) - BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - if [ -z "${LIBJPEG_INSTALL_DIR}" ]; then - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} - else - echo "BEGIN MESSAGE" - echo "Installing libjpeg into ${LIBJPEG_INSTALL_DIR}" - echo "END MESSAGE" - INSTALL_DIR=${LIBJPEG_INSTALL_DIR} - fi - DONE_FILE=${SCRATCH_BUILD}/done/${THORN} - LIBJPEG_DIR=${INSTALL_DIR} - - if [ -e ${DONE_FILE} -a ${DONE_FILE} -nt ${SRCDIR}/dist/${NAME}.tar.gz \ - -a ${DONE_FILE} -nt ${SRCDIR}/libjpeg.sh ] - then - echo "BEGIN MESSAGE" - echo "libjpeg has already been built; doing nothing" - echo "END MESSAGE" - else - echo "BEGIN MESSAGE" - echo "Building libjpeg library" - 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 "libjpeg: Preparing directory structure..." - mkdir build external done 2> /dev/null || true - rm -rf ${BUILD_DIR} ${INSTALL_DIR} - mkdir ${BUILD_DIR} ${INSTALL_DIR} - - echo "libjpeg: Unpacking archive..." - pushd ${BUILD_DIR} - ${TAR} xzf ${SRCDIR}/dist/${NAME}.tar.gz - - echo "libjpeg: Configuring..." - cd ${NAME} - ./configure --prefix=${LIBJPEG_DIR} - - echo "libjpeg: Building..." - ${MAKE} - - echo "libjpeg: Installing..." - ${MAKE} install - popd - - echo "libjpeg: Cleaning up..." - rm -rf ${BUILD_DIR} - - date > ${DONE_FILE} - echo "libjpeg: Done." - - ) - - if (( $? )); then - echo 'BEGIN ERROR' - echo 'Error while building libjpeg. Aborting.' - echo 'END ERROR' - exit 1 - fi - fi - -fi - - - -################################################################################ -# Configure Cactus -################################################################################ - -# Set options -if [ "${LIBJPEG_DIR}" = '/usr' -o "${LIBJPEG_DIR}" = '/usr/local' ]; then - LIBJPEG_INC_DIRS='' - LIBJPEG_LIB_DIRS='' -else - LIBJPEG_INC_DIRS="${LIBJPEG_DIR}/include" - LIBJPEG_LIB_DIRS="${LIBJPEG_DIR}/lib" -fi -LIBJPEG_LIBS='jpeg' - -# Pass options to Cactus -echo "BEGIN MAKE_DEFINITION" -echo "HAVE_LIBJPEG = 1" -echo "LIBJPEG_DIR = ${LIBJPEG_DIR}" -echo "LIBJPEG_INC_DIRS = ${LIBJPEG_INC_DIRS}" -echo "LIBJPEG_LIB_DIRS = ${LIBJPEG_LIB_DIRS}" -echo "LIBJPEG_LIBS = ${LIBJPEG_LIBS}" -echo "END MAKE_DEFINITION" - -echo 'INCLUDE_DIRECTORY $(LIBJPEG_INC_DIRS)' -echo 'LIBRARY_DIRECTORY $(LIBJPEG_LIB_DIRS)' -echo 'LIBRARY $(LIBJPEG_LIBS)' -- cgit v1.2.3