Use new IRAF installer & environment setup scripts in the now-much-smaller conda build script.

1 files changed, 22 insertions, 172 deletions

diff --git a/iraf/build.sh b/iraf/build.sh
index bdf4804..09eb0e0 100644
--- a/iraf/build.sh
+++ b/iraf/build.sh
@@ -1,100 +1,41 @@
-# Make a log directory for "sm_logs"
-mkdir -p `pwd`/logs
-
 # Drop extraneous conda-set environment variables
-unset ARCH
-unset CFLAGS
-unset CXXFLAGS
-unset LDFLAGS
+unset ARCH CFLAGS CXXFLAGS LDFLAGS
 
 # Complement build script
-# ("UR_IRAFUSER" MUST BE SET OR BUILD WILL FAIL)
-export UR_IRAFUSER=1
-export UR_DIR_PKG=$PREFIX/variants/common/
-export sm_logs=`pwd`/logs
 export TERM=xterm
 
-# Minimal architecture detection
-# (We don't care about 64-bit)
-export IRAFARCH=
-export target=`uname`.32
-case "$target" in
-    Linux.32)
-        export IRAFARCH='linux'
-    ;;
-    Darwin.32)
-        export IRAFARCH='macosx'
-    ;;
-    *)
-        echo "UNSUPPORTED ARCHITECTURE (64-bit disabled, by the way...)"
-        exit 1
-    ;;
-esac
-
-
-# For UR_DIR_PKG to use (though I don't think we really need it anymore)
-mkdir -p $UR_DIR_PKG
-echo keep > $UR_DIR_PKG/extern.pkg
-
-# Copy working directory into PREFIX
-export iraf=$PREFIX/iraf/
-#mkdir -p $iraf
-rsync -aH `pwd`/ $iraf
-cd $iraf
-
 # Execute build
 printenv
-./build 32
+if ! ./build 32; then
+    echo "The main IRAF build failed" 2>&1
+    exit 1
+fi
 
-# General tasks below
+echo
 
-# Link binaries
-mkdir -p $PREFIX/bin
-for exe in $iraf/bin_directory/*
-do
-    ( cd $PREFIX/bin && ln -s -f $exe )
-done
+# Install into PREFIX
+if ! ./install $PREFIX; then
+    echo "IRAF installation into $PREFIX failed" 2>&1
+    exit 1
+fi
 
-# Fix symlink loop in VO (can't figure it out based on the mkpkg files)
-rm -rfv "$iraf/vo/bin.generic"
-mkdir -p "$iraf/vo/bin.generic"
-rm -fv "$iraf/vo/bin"
-( cd $iraf/vo && ln -s bin.$IRAFARCH bin )
+# "Register" the IRAF environment setup with conda activate:
+mkdir -p $PREFIX/etc/conda/{activate.d,deactivate.d}
 
-# Not used... ?
+echo "source \$CONDA_ENV_PATH/bin/setup_iraf.sh" > \
+    $PREFIX/etc/conda/activate.d/iraf.sh
+chmod 755 $PREFIX/etc/conda/activate.d/iraf.sh
 
-#echo "Fixing c headers..."
-#find . -type f -name "*.h" | xargs sed -i -e "s|/iraf/iraf/|$iraf|"
+echo "source \$CONDA_ENV_PATH/bin/forget_iraf.sh" > \
+    $PREFIX/etc/conda/deactivate.d/iraf.sh
+chmod 755 $PREFIX/etc/conda/deactivate.d/iraf.sh
 
-#echo "Fixing c sources..."
-#find . -type f -name "*.c" | xargs sed -i -e "s|/iraf/iraf/|$iraf|"
 
-#mkdir -p $iraf
-#rsync -aH `pwd`/ $iraf
+# JT: the following are some commented bits from Joe's original build.sh that I
+# think are no longer needed but have no replacement in the new install script.
 
 #cd $iraf
 
-#rm -rf bin_directory
-#rm -rf $iraf/vo/bin.generic/bin.macosx
-
-
-
-#( cd $PREFIX/bin && \
-#ln -s -f $iraf/unix/hlib/cl.sh cl && \
-#ln -s -f $iraf/unix/hlib/mkiraf.sh mkiraf && \
-#ln -s -f $iraf/unix/hlib/mkmlist.csh mkmlist && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/generic.e generic && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/mkpkg.e mkpkg && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/rmbin.e rmbin && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/rmfiles.e rmfiles && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/rpp.e rpp && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/rtar.e rtar &&\
-#ln -s -f $iraf/unix/bin.$IRAFARCH/sgidispatch.e sgidispatch && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/wtar.e wtar && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/xc.e xc && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/xpp.e && \
-#ln -s -f $iraf/unix/bin.$IRAFARCH/xyacc.e xyacc )
-
 #UR_BUILTIN=/Users/Shared/ureka.iraf/ur_work/iraf
 #find . -lname "$UR_BUILTIN/*" \
 #-exec sh -c 'echo Re-linking builtin paths "$0" ;\
@@ -105,99 +46,8 @@ rm -fv "$iraf/vo/bin"
 #-exec sh -c 'echo Re-linking "$0" ;\
 #ln -snf "$(readlink "$0" \
 #| sed -e "s|/iraf/iraf|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \;
-#
-#
+
 #echo "Removing dead symlinks..."
 #find $iraf $iraf/../variants -type l | xargs -n 1 -I'{}' \
 #sh -c 'file {} | grep broken | cut -f 1 -d :' | xargs rm -f
 
-
-
-mkdir -p $PREFIX/etc/conda/{activate.d,deactivate.d}
-
-echo "
-export IRAFARCH=$IRAFARCH
-export iraf=\$CONDA_ENV_PATH/iraf/
-export MACH=\$IRAFARCH
-export hostid=unix
-export host=\$iraf/\$hostid/
-export hbin=\$host/bin.\$IRAFARCH/
-export IMTOOLRC=\$iraf/dev/imtoolrc
-export tmp=/tmp/
-
-export CC=gcc
-export F2C=\$hbin/f2c.e
-export F77=\$hbin/f77.sh
-export RANLIB=ranlib
-
-case "$IRAFARCH" in
-macosx)
-export XC_CFLAGS="-Wno-return-type"
-export HSI_CF=\"-O -DMACOSX -w -Wunused -arch i386 -m32 -mmacosx-version-min=10.4 -Wno-return-type\"
-export HSI_XF=\"-Inolibc -/DMACOSX -w -/Wunused -/m32 -/arch -//i386 -/mmacosx-version-min=10.4 -/Wno-return-type\"
-export HSI_FF=\"-O -arch i386 -m32 -DBLD_KERNEL -mmacosx-version-min=10.4 -Wno-return-type\"
-export HSI_LF=\"-arch i386 -m32 -mmacosx-version-min=10.4\"
-;;
-
-linux)
-export XC_CFLAGS="-Wno-return-type"
-export HSI_CF=\"-I\$iraf/include -O -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused -Wno-return-type\"
-export HSI_FF=\"-I\$iraf/include -O -DBLD_KERNEL -m32 -Wno-return-type\"
-export HSI_LF=\"-I\$iraf/include -m32 -Wno-return-type\"
-export HSI_XF=\"-I\$iraf/include -Inolibc -w -/Wunused -/m32\"
-;;
-
-*)
-echo "Unknown IRAFARCH. Dying."
-exit 1
-;;
-
-esac
-
-export HSI_F77LIBS=
-export HSI_LIBS=\"\$iraf/unix/hlib/libboot.a \$iraf/lib/libsys.a \$iraf/lib/libvops.a \$iraf/unix/hlib/libos.a\"
-export HSI_OSLIBS=
-
-export UR_BITS=64
-export UR_CPU=x86_64
-export UR_DIR=\$CONDA_ENV_PATH
-export UR_VARIANT=common
-export UR_OS=$PLATFORM
-export UR_TMP=/tmp
-export UR_DIR_PKG=\$UR_DIR/variants/\$UR_VARIANT/
-" > $PREFIX/etc/conda/activate.d/iraf.sh
-chmod 755 $PREFIX/etc/conda/activate.d/iraf.sh
-
-echo '
-unset iraf
-unset IRAFARCH
-unset IMTOOLRC
-unset F2C
-unset F77
-unset hbin
-unset hlib
-unset host
-unset CC
-unset CC_f2c
-unset HSI_CF
-unset HSI_F77LIBS
-unset HSI_FF
-unset HSI_LF
-unset HSI_LFLAGS
-unset HSI_LIBS
-unset HSI_OSLIBS
-unset HSI_XF
-unset MACH
-unset OS_MACH
-unset RANLIB
-unset hostid
-unset tmp
-unset UR_BITS
-unset UR_CPU
-unset UR_DIR
-unset UR_VARIANT
-unset UR_OS
-unset UR_TMP
-unset UR_DIR_PKG
-' > $PREFIX/etc/conda/deactivate.d/iraf.sh
-chmod 755 $PREFIX/etc/conda/deactivate.d/iraf.sh