From 189987d64713de08d1e7a13e04d6c5dc67d8daa2 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 23 Mar 2016 17:00:53 -0400 Subject: Initial commit --- decorators/bld.bat | 3 + decorators/build.sh | 2 + decorators/meta.yaml | 20 ++++++ iraf/bld.bat | 3 + iraf/build.sh | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++ iraf/meta.yaml | 16 +++++ 6 files changed, 234 insertions(+) create mode 100644 decorators/bld.bat create mode 100644 decorators/build.sh create mode 100644 decorators/meta.yaml create mode 100644 iraf/bld.bat create mode 100644 iraf/build.sh create mode 100644 iraf/meta.yaml diff --git a/decorators/bld.bat b/decorators/bld.bat new file mode 100644 index 0000000..b290566 --- /dev/null +++ b/decorators/bld.bat @@ -0,0 +1,3 @@ + +python setup.py install +if errorlevel 1 exit 1 \ No newline at end of file diff --git a/decorators/build.sh b/decorators/build.sh new file mode 100644 index 0000000..4b71885 --- /dev/null +++ b/decorators/build.sh @@ -0,0 +1,2 @@ + +python setup.py install || exit 1 \ No newline at end of file diff --git a/decorators/meta.yaml b/decorators/meta.yaml new file mode 100644 index 0000000..917aa4b --- /dev/null +++ b/decorators/meta.yaml @@ -0,0 +1,20 @@ +about: + home: https://github.com/micheles/decorator + license: BSD + summary: Better living through Python with decorators +build: + number: '0' +package: + name: decorators + version: 4.0.9 +requirements: + build: + - setuptools + - python x.x + run: + - python x.x +source: + fn: decorators-4.0.9.tar.gz + md5: f12c5651ccd707e12a0abaa4f76cd69a + url: + - https://pypi.python.org/packages/source/d/decorators/decorators-4.0.9.tar.gz diff --git a/iraf/bld.bat b/iraf/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf/build.sh b/iraf/build.sh new file mode 100644 index 0000000..43aa71f --- /dev/null +++ b/iraf/build.sh @@ -0,0 +1,190 @@ + +set -x + +export IRAFARCH='' +export target=`uname`.32 +export PLATFORM= +case "$target" in +Linux.32) +export IRAFARCH='linux' +export CFLAGS="-m32" +export LDFLAGS="-m32" +export PLATFORM='linux' +;; +Darwin.32) +export IRAFARCH='macosx' +export CFLAGS="-m32 -arch i386" +export LDFLAGS="-m32 -arch i386" +export PLATFORM='osx' +;; +*) +echo "UNSUPPORTED ARCHITECTURE (64-bit disabled, by the way...)" +exit 1 +;; +esac + + +VARIANTS=http://ssb.stsci.edu/stripped/$PLATFORM/variants.tar.gz +curl -O $VARIANTS +tar xf variants.tar.gz -C $PREFIX +rm -f variants.tar.gz + +mkdir -p $PREFIX/bin \ +$PREFIX/share/man + +for binary in $PREFIX/variants/common/bin/*.e +do +( cd $PREFIX/bin && ln -s -f $binary ) +done + +X11IRAF=http://ssb.stsci.edu/stripped/$PLATFORM/x11iraf.tar.gz +curl -O $X11IRAF +tar xf x11iraf.tar.gz +rm -f x11iraf.tar.gz + +rsync -aH x11iraf/bin/ $PREFIX/bin +rsync -aH x11iraf/man/ $PREFIX/share/man +rm -rf x11iraf + +export TERM=xterm +if [[ $PLATFORM == "osx" ]]; then +test -d /sw && export PATH=`purge_path /sw` +fi +export iraf=$PREFIX/iraf/ + +echo "Fixing c headers..." +find . -type f -name "*.h" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" + +echo "Fixing c sources..." +find . -type f -name "*.c" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" + +mkdir -p $iraf +rsync -aH `pwd`/ $iraf + +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" ;\ +ln -snf "$(readlink "$0" \ +| sed -e "s|$UR_BUILTIN|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \; + +find . -lname '/iraf/iraf/*' \ +-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 HSI_CF=\"-O -DMACOSX -w -Wunused -arch i386 -m32 -mmacosx-version-min=10.4\" +export HSI_XF=\"-Inolibc -/DMACOSX -w -/Wunused -/m32 -/arch -//i386 -/mmacosx-version-min=10.4\" +export HSI_FF=\"-O -arch i386 -m32 -DBLD_KERNEL -mmacosx-version-min=10.4\" +export HSI_LF=\"-arch i386 -m32 -mmacosx-version-min=10.4\" +;; + +linux) +export HSI_CF=\"-I\$iraf/include -O -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused\" +export HSI_FF=\"-I\$iraf/include -O -DBLD_KERNEL -m32\" +export HSI_LF=\"-I\$iraf/include -m32\" +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 \ No newline at end of file diff --git a/iraf/meta.yaml b/iraf/meta.yaml new file mode 100644 index 0000000..39c05dc --- /dev/null +++ b/iraf/meta.yaml @@ -0,0 +1,16 @@ +about: + home: http://iraf.noao.edu + license: MIT + summary: NOAO Image Reduction and Analysis Facility +build: + binary_relocation: False [osx] + detect_binary_files_with_prefix: False [osx] + number: '0' +package: + name: iraf + version: 2.16.1 +source: + fn: iraf.tar.gz + url: + - http://ssb.stsci.edu/stripped/linux/iraf.tar.gz [linux] + - http://ssb.stsci.edu/stripped/osx/iraf.tar.gz [osx] -- cgit From bc9742f7905e94bb36a54e3c357f057c548f7129 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 30 Mar 2016 13:25:01 -0400 Subject: Initial commit --- recon/bld.bat | 2 ++ recon/build.sh | 1 + recon/meta.yaml | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 recon/bld.bat create mode 100644 recon/build.sh create mode 100644 recon/meta.yaml diff --git a/recon/bld.bat b/recon/bld.bat new file mode 100644 index 0000000..2d6c912 --- /dev/null +++ b/recon/bld.bat @@ -0,0 +1,2 @@ +python setup.py install +if errorlevel 1 exit 1 diff --git a/recon/build.sh b/recon/build.sh new file mode 100644 index 0000000..5c61be1 --- /dev/null +++ b/recon/build.sh @@ -0,0 +1 @@ +python setup.py install || exit 1 diff --git a/recon/meta.yaml b/recon/meta.yaml new file mode 100644 index 0000000..515002d --- /dev/null +++ b/recon/meta.yaml @@ -0,0 +1,23 @@ +about: + home: http://github.com/jhunkeler/recon + license: BSD + summary: Release control for git +build: + number: '0' +package: + name: recon + version: '1.0.2' +requirements: + build: + - setuptools + - python x.x + run: + - python x.x +source: + git_url: https://github.com/jhunkeler/recon.git + git_tag: '1.0.2' +test: + imports: + - recon + - recon.release + - recon.git -- cgit From cd07f3215f64c0a8bdec9a239eee39d9aa443d7b Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Fri, 29 Apr 2016 10:45:31 -0400 Subject: Remove deprecated dependency --- recon/bld.bat | 2 -- recon/build.sh | 1 - recon/meta.yaml | 23 ----------------------- 3 files changed, 26 deletions(-) delete mode 100644 recon/bld.bat delete mode 100644 recon/build.sh delete mode 100644 recon/meta.yaml diff --git a/recon/bld.bat b/recon/bld.bat deleted file mode 100644 index 2d6c912..0000000 --- a/recon/bld.bat +++ /dev/null @@ -1,2 +0,0 @@ -python setup.py install -if errorlevel 1 exit 1 diff --git a/recon/build.sh b/recon/build.sh deleted file mode 100644 index 5c61be1..0000000 --- a/recon/build.sh +++ /dev/null @@ -1 +0,0 @@ -python setup.py install || exit 1 diff --git a/recon/meta.yaml b/recon/meta.yaml deleted file mode 100644 index 515002d..0000000 --- a/recon/meta.yaml +++ /dev/null @@ -1,23 +0,0 @@ -about: - home: http://github.com/jhunkeler/recon - license: BSD - summary: Release control for git -build: - number: '0' -package: - name: recon - version: '1.0.2' -requirements: - build: - - setuptools - - python x.x - run: - - python x.x -source: - git_url: https://github.com/jhunkeler/recon.git - git_tag: '1.0.2' -test: - imports: - - recon - - recon.release - - recon.git -- cgit From b884be63c0fb89c51f80a57c41134d9041252d45 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sat, 30 Apr 2016 19:06:49 -0400 Subject: Redo completely broken decorator recipe --- decorators/bld.bat | 3 --- decorators/build.sh | 2 -- decorators/meta.yaml | 20 -------------------- 3 files changed, 25 deletions(-) delete mode 100644 decorators/bld.bat delete mode 100644 decorators/build.sh delete mode 100644 decorators/meta.yaml diff --git a/decorators/bld.bat b/decorators/bld.bat deleted file mode 100644 index b290566..0000000 --- a/decorators/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -python setup.py install -if errorlevel 1 exit 1 \ No newline at end of file diff --git a/decorators/build.sh b/decorators/build.sh deleted file mode 100644 index 4b71885..0000000 --- a/decorators/build.sh +++ /dev/null @@ -1,2 +0,0 @@ - -python setup.py install || exit 1 \ No newline at end of file diff --git a/decorators/meta.yaml b/decorators/meta.yaml deleted file mode 100644 index 917aa4b..0000000 --- a/decorators/meta.yaml +++ /dev/null @@ -1,20 +0,0 @@ -about: - home: https://github.com/micheles/decorator - license: BSD - summary: Better living through Python with decorators -build: - number: '0' -package: - name: decorators - version: 4.0.9 -requirements: - build: - - setuptools - - python x.x - run: - - python x.x -source: - fn: decorators-4.0.9.tar.gz - md5: f12c5651ccd707e12a0abaa4f76cd69a - url: - - https://pypi.python.org/packages/source/d/decorators/decorators-4.0.9.tar.gz -- cgit From 734f3d5e30f2a1baba9441ac33ef498cf385db7f Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 24 May 2016 09:35:44 -0400 Subject: Refactor recipe to support source build (in progress) --- iraf/build.sh | 183 ++++++++++++++++++++++++++++++--------------------------- iraf/meta.yaml | 9 +-- 2 files changed, 101 insertions(+), 91 deletions(-) diff --git a/iraf/build.sh b/iraf/build.sh index 43aa71f..b53692c 100644 --- a/iraf/build.sh +++ b/iraf/build.sh @@ -1,104 +1,115 @@ +# Make a log directory for "sm_logs" +mkdir -p `pwd`/logs + +# Drop extraneous conda-set environment variables +unset CFLAGS +unset CXXFLAGS +unset LDFLAGS + +# Complement build script +# ("UR_IRAFUSER" MUST BE SET OR BUILD WILL FAIL) +export UR_IRAFUSER=1 +export sm_logs=`pwd`/logs +export TERM=xterm +export FAKE_IRAF="../iraf" -set -x - -export IRAFARCH='' +# Minimal architecture detection +# (We don't care about 64-bit) +export IRAFARCH= export target=`uname`.32 -export PLATFORM= case "$target" in -Linux.32) -export IRAFARCH='linux' -export CFLAGS="-m32" -export LDFLAGS="-m32" -export PLATFORM='linux' -;; -Darwin.32) -export IRAFARCH='macosx' -export CFLAGS="-m32 -arch i386" -export LDFLAGS="-m32 -arch i386" -export PLATFORM='osx' -;; -*) -echo "UNSUPPORTED ARCHITECTURE (64-bit disabled, by the way...)" -exit 1 -;; + Linux.32) + export IRAFARCH='linux' + ;; + Darwin.32) + export IRAFARCH='macosx' + ;; + *) + echo "UNSUPPORTED ARCHITECTURE (64-bit disabled, by the way...)" + exit 1 + ;; esac -VARIANTS=http://ssb.stsci.edu/stripped/$PLATFORM/variants.tar.gz -curl -O $VARIANTS -tar xf variants.tar.gz -C $PREFIX -rm -f variants.tar.gz +# Copy working directory into PREFIX +export iraf=$PREFIX/iraf +#mkdir -p $iraf +rsync -aH `pwd`/ $iraf +cd $iraf + +# Execute build +printenv +./build 32 -mkdir -p $PREFIX/bin \ -$PREFIX/share/man +# Creating it made no sense... now we remove it +#rm -rfv $FAKE_IRAF -for binary in $PREFIX/variants/common/bin/*.e +# General tasks below + +# Link binaries +mkdir -p $PREFIX/bin +for exe in $iraf/bin_directory/* do -( cd $PREFIX/bin && ln -s -f $binary ) + ( cd $PREFIX/bin && ln -s -f $exe ) done -X11IRAF=http://ssb.stsci.edu/stripped/$PLATFORM/x11iraf.tar.gz -curl -O $X11IRAF -tar xf x11iraf.tar.gz -rm -f x11iraf.tar.gz - -rsync -aH x11iraf/bin/ $PREFIX/bin -rsync -aH x11iraf/man/ $PREFIX/share/man -rm -rf x11iraf +# 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 ) -export TERM=xterm -if [[ $PLATFORM == "osx" ]]; then -test -d /sw && export PATH=`purge_path /sw` -fi -export iraf=$PREFIX/iraf/ - -echo "Fixing c headers..." -find . -type f -name "*.h" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" -echo "Fixing c sources..." -find . -type f -name "*.c" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" -mkdir -p $iraf -rsync -aH `pwd`/ $iraf +# Not used... ? -cd $iraf +#echo "Fixing c headers..." +#find . -type f -name "*.h" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" -rm -rf bin_directory -rm -rf $iraf/vo/bin.generic/bin.macosx +#echo "Fixing c sources..." +#find . -type f -name "*.c" | xargs sed -i -e "s|/iraf/iraf/|$iraf|" +#mkdir -p $iraf +#rsync -aH `pwd`/ $iraf +#cd $iraf -( 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 ) +#rm -rf bin_directory +#rm -rf $iraf/vo/bin.generic/bin.macosx -UR_BUILTIN=/Users/Shared/ureka.iraf/ur_work/iraf -find . -lname "$UR_BUILTIN/*" \ --exec sh -c 'echo Re-linking builtin paths "$0" ;\ -ln -snf "$(readlink "$0" \ -| sed -e "s|$UR_BUILTIN|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \; -find . -lname '/iraf/iraf/*' \ --exec sh -c 'echo Re-linking "$0" ;\ -ln -snf "$(readlink "$0" \ -| sed -e "s|/iraf/iraf|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \; +#( 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 ) -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 +#UR_BUILTIN=/Users/Shared/ureka.iraf/ur_work/iraf +#find . -lname "$UR_BUILTIN/*" \ +#-exec sh -c 'echo Re-linking builtin paths "$0" ;\ +#ln -snf "$(readlink "$0" \ +#| sed -e "s|$UR_BUILTIN|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \; +# +#find . -lname '/iraf/iraf/*' \ +#-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 @@ -121,16 +132,18 @@ export RANLIB=ranlib case "$IRAFARCH" in macosx) -export HSI_CF=\"-O -DMACOSX -w -Wunused -arch i386 -m32 -mmacosx-version-min=10.4\" -export HSI_XF=\"-Inolibc -/DMACOSX -w -/Wunused -/m32 -/arch -//i386 -/mmacosx-version-min=10.4\" -export HSI_FF=\"-O -arch i386 -m32 -DBLD_KERNEL -mmacosx-version-min=10.4\" +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 HSI_CF=\"-I\$iraf/include -O -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused\" -export HSI_FF=\"-I\$iraf/include -O -DBLD_KERNEL -m32\" -export HSI_LF=\"-I\$iraf/include -m32\" +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\" ;; @@ -187,4 +200,4 @@ 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 \ No newline at end of file +chmod 755 $PREFIX/etc/conda/deactivate.d/iraf.sh diff --git a/iraf/meta.yaml b/iraf/meta.yaml index 39c05dc..495b647 100644 --- a/iraf/meta.yaml +++ b/iraf/meta.yaml @@ -3,14 +3,11 @@ about: license: MIT summary: NOAO Image Reduction and Analysis Facility build: - binary_relocation: False [osx] - detect_binary_files_with_prefix: False [osx] + #binary_relocation: False [osx] + #detect_binary_files_with_prefix: False [osx] number: '0' package: name: iraf version: 2.16.1 source: - fn: iraf.tar.gz - url: - - http://ssb.stsci.edu/stripped/linux/iraf.tar.gz [linux] - - http://ssb.stsci.edu/stripped/osx/iraf.tar.gz [osx] + git_url: /eng/ssb/jhunk/git-repos/iraf.git -- cgit From 57b060589ecdeb4e4bcd82e0cc456d1484c908b4 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 24 May 2016 09:36:16 -0400 Subject: Initial commit of x11iraf: iraf-x11 --- iraf-x11/bld.bat | 3 +++ iraf-x11/build.sh | 23 +++++++++++++++++++++++ iraf-x11/meta.yaml | 18 ++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 iraf-x11/bld.bat create mode 100644 iraf-x11/build.sh create mode 100644 iraf-x11/meta.yaml diff --git a/iraf-x11/bld.bat b/iraf-x11/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf-x11/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf-x11/build.sh b/iraf-x11/build.sh new file mode 100644 index 0000000..f4dad04 --- /dev/null +++ b/iraf-x11/build.sh @@ -0,0 +1,23 @@ +# Drop extraneous conda-set environment variables +unset CFLAGS +unset CXXFLAGS +unset LDFLAGS + +# Complement build script +# ("UR_IRAFUSER" MUST BE SET OR BUILD WILL FAIL) +export UR_IRAFUSER=1 +export TERM=xterm + + +# Copy working directory into PREFIX +export iraf=$PREFIX/iraf/ + +# Execute build +printenv +./build 32 + +mkdir -p $PREFIX/{bin,include,lib,share} +./install.bin $PREFIX +./install.lib $PREFIX +./install.man $PREFIX/share + diff --git a/iraf-x11/meta.yaml b/iraf-x11/meta.yaml new file mode 100644 index 0000000..024e5c5 --- /dev/null +++ b/iraf-x11/meta.yaml @@ -0,0 +1,18 @@ +about: + home: http://iraf.noao.edu + license: MIT + summary: X11 support for IRAF +build: + #binary_relocation: False [osx] + #detect_binary_files_with_prefix: False [osx] + number: '0' +package: + name: iraf-x11 + version: 2.0 +requirements: + build: + - iraf + run: + - iraf +source: + git_url: /eng/ssb/jhunk/git-repos/x11iraf.git -- cgit From 586b0ca31224ee8817dceb6a185bfe9dbf5f037d Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 26 May 2016 13:52:17 -0400 Subject: Ensure UR_PKG_DIR exists with a blank extern.pkg --- iraf/build.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/iraf/build.sh b/iraf/build.sh index b53692c..c500e74 100644 --- a/iraf/build.sh +++ b/iraf/build.sh @@ -9,9 +9,9 @@ unset 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 -export FAKE_IRAF="../iraf" # Minimal architecture detection # (We don't care about 64-bit) @@ -31,8 +31,12 @@ case "$target" in 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 +export iraf=$PREFIX/iraf/ #mkdir -p $iraf rsync -aH `pwd`/ $iraf cd $iraf @@ -41,9 +45,6 @@ cd $iraf printenv ./build 32 -# Creating it made no sense... now we remove it -#rm -rfv $FAKE_IRAF - # General tasks below # Link binaries @@ -59,8 +60,6 @@ mkdir -p "$iraf/vo/bin.generic" rm -fv "$iraf/vo/bin" ( cd $iraf/vo && ln -s bin.$IRAFARCH bin ) - - # Not used... ? #echo "Fixing c headers..." -- cgit From 2a3119dc73fce3ed647f227bc95fdad9c61bccfe Mon Sep 17 00:00:00 2001 From: RTF User Date: Tue, 7 Jun 2016 20:58:35 -0400 Subject: Work with my IRAF SVN branch for now. Correct version number and license info. Don't patch IRAF binary paths. Unset conda ARCH variable for the IRAF build (it didn't seem to break mine but I believe IRAF uses it differently & Joe has been having some arch-related issues). --- iraf/build.sh | 1 + iraf/meta.yaml | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/iraf/build.sh b/iraf/build.sh index c500e74..bdf4804 100644 --- a/iraf/build.sh +++ b/iraf/build.sh @@ -2,6 +2,7 @@ mkdir -p `pwd`/logs # Drop extraneous conda-set environment variables +unset ARCH unset CFLAGS unset CXXFLAGS unset LDFLAGS diff --git a/iraf/meta.yaml b/iraf/meta.yaml index 495b647..1719e86 100644 --- a/iraf/meta.yaml +++ b/iraf/meta.yaml @@ -1,13 +1,15 @@ about: home: http://iraf.noao.edu - license: MIT + license: MIT (and third-party licenses) summary: NOAO Image Reduction and Analysis Facility build: - #binary_relocation: False [osx] + binary_relocation: False #detect_binary_files_with_prefix: False [osx] number: '0' package: name: iraf - version: 2.16.1 + version: 2.16_UR source: - git_url: /eng/ssb/jhunk/git-repos/iraf.git + # svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/branches/jhunk-patches + # svn_rev: 4156 + svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/branches/conda_patches -- cgit From 5b43a4317256fb2be1a703b12224e44d0e385777 Mon Sep 17 00:00:00 2001 From: jturner Date: Wed, 29 Jun 2016 20:42:06 -0400 Subject: Use new IRAF installer & environment setup scripts in the now-much-smaller conda build script. --- iraf/build.sh | 194 +++++++--------------------------------------------------- 1 file 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 -- cgit From d8414f80d621961f6cc007d52b898d097efec72a Mon Sep 17 00:00:00 2001 From: jturner Date: Mon, 4 Jul 2016 13:23:07 -0400 Subject: Support new path prefix in Conda 4.1.2 (or 4.2.1?) and remove some commented-out bits that Joe agrees probably aren't needed. --- iraf/build.sh | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/iraf/build.sh b/iraf/build.sh index 09eb0e0..3392de1 100644 --- a/iraf/build.sh +++ b/iraf/build.sh @@ -1,3 +1,5 @@ +set -x + # Drop extraneous conda-set environment variables unset ARCH CFLAGS CXXFLAGS LDFLAGS @@ -22,32 +24,21 @@ fi # "Register" the IRAF environment setup with conda activate: mkdir -p $PREFIX/etc/conda/{activate.d,deactivate.d} -echo "source \$CONDA_ENV_PATH/bin/setup_iraf.sh" > \ - $PREFIX/etc/conda/activate.d/iraf.sh +echo ' +if [ -n "$CONDA_PREFIX" ]; then + source $CONDA_PREFIX/bin/setup_iraf.sh +else + source $CONDA_ENV_PATH/bin/setup_iraf.sh +fi +' > $PREFIX/etc/conda/activate.d/iraf.sh chmod 755 $PREFIX/etc/conda/activate.d/iraf.sh -echo "source \$CONDA_ENV_PATH/bin/forget_iraf.sh" > \ - $PREFIX/etc/conda/deactivate.d/iraf.sh +echo ' +if [ -n "$CONDA_PREFIX" ]; then + source $CONDA_PREFIX/bin/forget_iraf.sh +else + source $CONDA_ENV_PATH/bin/forget_iraf.sh +fi +' > $PREFIX/etc/conda/deactivate.d/iraf.sh chmod 755 $PREFIX/etc/conda/deactivate.d/iraf.sh - -# 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 - -#UR_BUILTIN=/Users/Shared/ureka.iraf/ur_work/iraf -#find . -lname "$UR_BUILTIN/*" \ -#-exec sh -c 'echo Re-linking builtin paths "$0" ;\ -#ln -snf "$(readlink "$0" \ -#| sed -e "s|$UR_BUILTIN|../..|" -e "s|/as/|/as.$IRAFARCH/|")" "$0"' {} \; -# -#find . -lname '/iraf/iraf/*' \ -#-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 - -- cgit From d675e052fbc0b4f9e373d9cd1b7b2d1b473d7d9a Mon Sep 17 00:00:00 2001 From: jturner Date: Wed, 17 Aug 2016 20:01:52 -0300 Subject: Add recipe for new astroconda-utils package, containing build & run-time helper scripts (currently for IRAF). --- astroconda-utils/bld.bat | 3 +++ astroconda-utils/build.sh | 4 ++++ astroconda-utils/meta.yaml | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 astroconda-utils/bld.bat create mode 100644 astroconda-utils/build.sh create mode 100644 astroconda-utils/meta.yaml diff --git a/astroconda-utils/bld.bat b/astroconda-utils/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/astroconda-utils/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/astroconda-utils/build.sh b/astroconda-utils/build.sh new file mode 100644 index 0000000..7abeef0 --- /dev/null +++ b/astroconda-utils/build.sh @@ -0,0 +1,4 @@ +# Copy scripts to the installation: +dest="$PREFIX/bin" +mkdir -p "$dest" && cp -p scripts/* "$dest/" + diff --git a/astroconda-utils/meta.yaml b/astroconda-utils/meta.yaml new file mode 100644 index 0000000..e45a6c2 --- /dev/null +++ b/astroconda-utils/meta.yaml @@ -0,0 +1,18 @@ +about: + home: https://github.com/jehturner/astroconda-utils + license: BSD + summary: Build and run time utilities for AstroConda +build: + binary_relocation: True + #detect_binary_files_with_prefix: False [osx] + number: '0' +package: + name: astroconda-utils + version: "0.1" +source: + git_url: https://github.com/jehturner/astroconda-utils.git +requirements: + run: + - iraf ==2.16_UR + - pyraf + -- cgit From 94daaa0781d856cb8b47f06b61d343addee3cfc1 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Thu, 1 Sep 2016 12:48:55 -0300 Subject: Unset another environment variable that could potentially cause trouble. --- iraf/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iraf/build.sh b/iraf/build.sh index 3392de1..0ce0b6e 100644 --- a/iraf/build.sh +++ b/iraf/build.sh @@ -1,7 +1,7 @@ set -x # Drop extraneous conda-set environment variables -unset ARCH CFLAGS CXXFLAGS LDFLAGS +unset ARCH CFLAGS CXXFLAGS LDFLAGS MACOSX_DEPLOYMENT_TARGET # Complement build script export TERM=xterm -- cgit From 761c66b60631b1b2b74ddf44b277ea904a87fd3e Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Tue, 6 Sep 2016 16:47:56 -0300 Subject: Add a prototype external IRAF package (TABLES) for AstroConda. --- iraf.tables/ac.iraf.stsci.patch | 100 ++++++++++++++++++++++++++++++++++++++++ iraf.tables/bld.bat | 3 ++ iraf.tables/build.sh | 17 +++++++ iraf.tables/meta.yaml | 28 +++++++++++ iraf.tables/post-link.sh | 4 ++ iraf.tables/ur_extern.pkg | 7 +++ iraf.tables/ur_manifest | 11 +++++ iraf.tables/ur_mkpkg_cmd | 36 +++++++++++++++ iraf.tables/ur_mkpkg_patterns | 58 +++++++++++++++++++++++ 9 files changed, 264 insertions(+) create mode 100644 iraf.tables/ac.iraf.stsci.patch create mode 100644 iraf.tables/bld.bat create mode 100644 iraf.tables/build.sh create mode 100644 iraf.tables/meta.yaml create mode 100644 iraf.tables/post-link.sh create mode 100644 iraf.tables/ur_extern.pkg create mode 100644 iraf.tables/ur_manifest create mode 100644 iraf.tables/ur_mkpkg_cmd create mode 100644 iraf.tables/ur_mkpkg_patterns diff --git a/iraf.tables/ac.iraf.stsci.patch b/iraf.tables/ac.iraf.stsci.patch new file mode 100644 index 0000000..355d347 --- /dev/null +++ b/iraf.tables/ac.iraf.stsci.patch @@ -0,0 +1,100 @@ +diff -ur ../original/stsdas/apropos.cl ./stsdas/apropos.cl +--- ../original/stsdas/apropos.cl 2014-03-14 14:21:23.000000000 -0300 ++++ ./stsdas/apropos.cl 2016-08-10 17:47:39.000000000 -0300 +@@ -1,13 +1,66 @@ + procedure apropos ( topic ) + + string topic {prompt = ">Apropos ? ", mode="ql"} +-file index = "stsdas$lib/apropos.db" {prompt=">index to search"} ++file index = "aproposdb" {prompt=">index to search"} + + begin +-string csubject + +- # remove case sensitivity ++string csubject, dblist, fname, pvar ++int len, n, iend ++bool var_ok ++ ++ # Remove case sensitivity + csubject = "{"//topic//"}" +- match ( csubject, index, stop=no, meta=yes, print_file_names=no) ++ ++ # As a special case, if we're given the name of the "aproposdb" ++ # environment variable then get the list of database filenames ++ # from that: ++ if (index == "aproposdb") { ++ if (defvar("aproposdb")) { ++ dblist = envget("aproposdb") ++ } else { ++ error(1, "variable aproposdb is not set!") ++ } ++ } else { ++ dblist = index ++ } ++ ++ len = strlen(dblist) ++ ++ # Loop over the database filenames in the list: ++ while (len > 0) { ++ ++ # Parse next name and remove it from the start of the list: ++ iend = stridx(",", dblist) - 1 ++ if (iend < 0) iend = len # no more commas; use what's left ++ fname = substr(dblist, 1, iend) # parse next filename ++ if (iend > len-2) { # no more filenames; empty list ++ dblist="" ++ } else { # still have another file ++ dblist = substr(dblist, iend+2, len) ++ } ++ len = strlen(dblist) ++ ++ # Extract any path variable and check that it exists, ++ # otherwise IRAF will complain: ++ var_ok = yes ++ iend = stridx("$", fname) - 1 ++ if (iend > -1) { ++ pvar = substr(fname, 1, iend) ++ if (!defvar(pvar)) ++ var_ok = no ++ } ++ ++ # Try to match the query if the database file exists: ++ if (var_ok) ++ if (access(fname)) { ++ ++ # Print any matches in this database file: ++ match ( csubject, fname, stop=no, meta=yes, \ ++ print_file_names=no) ++ ++ } ++ ++ } # while loop over database files + + end +diff -ur ../original/tables/lib/tbtables/mkpkg ./tables/lib/tbtables/mkpkg +--- ../original/tables/lib/tbtables/mkpkg 2014-03-14 14:21:28.000000000 -0300 ++++ ./tables/lib/tbtables/mkpkg 2016-08-10 17:47:39.000000000 -0300 +@@ -233,12 +233,10 @@ + $ifdef (SPPFITSIO) + $echo "NOTE: SPP FITSIO will be used for FITS tables." + tbfhp_f.x tbtables.h tblfits.h +- @fitsio + $else + $echo "NOTE: CFITSIO will be used for FITS tables." + $echo "NOTE: CFITSIO does not support IRAF networking." + tbfhp.x tbtables.h tblfits.h + tbfxff.c fitsio_spp.h underscore.h +- @cfitsio + $endif + ; +diff -ur ../original/tables/lib/tbtables/tbfxff.c ./tables/lib/tbtables/tbfxff.c +--- ../original/tables/lib/tbtables/tbfxff.c 2014-03-14 14:21:28.000000000 -0300 ++++ ./tables/lib/tbtables/tbfxff.c 2016-08-10 17:47:39.000000000 -0300 +@@ -1,5 +1,5 @@ + # include +-# include "cfitsio/fitsio.h" /* CFITSIO include file */ ++# include /* CFITSIO include file */ + # include "fitsio_spp.h" /* sizes of SPP strings and Fortran FITSIO */ + # include "underscore.h" /* appends underscore, if needed */ + diff --git a/iraf.tables/bld.bat b/iraf.tables/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf.tables/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf.tables/build.sh b/iraf.tables/build.sh new file mode 100644 index 0000000..58cd9c8 --- /dev/null +++ b/iraf.tables/build.sh @@ -0,0 +1,17 @@ +name=tables + +# Configure the environment for IRAF, since conda build appears not to do +# "source activate" after installing dependencies (this would instead need to +# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying): +. setup_iraf.sh + +# Copy list of proprietary files to remove, from ../stsci_iraf/release_tools +# (conda build stops if this fails, due to "set -e"): +sed -ne "s|^$name/||p" release_tools/numrec_list.txt > $name/numrec_list.txt + +# Change to the package subdir (special case for STScI IRAF): +cd $name + +# Build from source in envs/_build (using build script from astroconda-utils): +ac_build_iraf_pkg + diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml new file mode 100644 index 0000000..cf775af --- /dev/null +++ b/iraf.tables/meta.yaml @@ -0,0 +1,28 @@ +about: + home: http://www.stsci.edu/institute/software_hardware/stsdas + license: US government notice (and third-party licenses) + summary: STScI TABLES package for IRAF +build: + binary_relocation: False + number: '0' + # These must be copied from astroconda-utils, since conda unhelpfully + # disallows the post-install step from depending on other packages: + always_include_files: + - bin/ac_config_iraf_pkg + - bin/ac_update_extern_pkg +package: + name: iraf.tables + version: 3.17 +source: + fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url + # Need to figure out a site-agnostic way to specify this (conda-build #567): + url: file:///rtfperm/ur_packages/stsci_iraf-3.17-local.tar.gz + patches: + - ac.iraf.stsci.patch +requirements: + build: + - iraf ==2.16_UR + - astroconda-utils + run: + - iraf ==2.16_UR + diff --git a/iraf.tables/post-link.sh b/iraf.tables/post-link.sh new file mode 100644 index 0000000..6165d02 --- /dev/null +++ b/iraf.tables/post-link.sh @@ -0,0 +1,4 @@ +# Call a common script that updates extern.pkg for the new IRAF package: + +"$PREFIX/bin/ac_config_iraf_pkg" tables + diff --git a/iraf.tables/ur_extern.pkg b/iraf.tables/ur_extern.pkg new file mode 100644 index 0000000..b092f30 --- /dev/null +++ b/iraf.tables/ur_extern.pkg @@ -0,0 +1,7 @@ +reset tables = UR_VDIR +task tables.pkg = tables$tables.cl +if (access("tables$lib")) { + reset helpdb= ( envget("helpdb") + ",tables$lib/helpdb.mip" ) + reset aproposdb= ( envget("aproposdb") + ",tables$lib/apropos.db" ) +} + diff --git a/iraf.tables/ur_manifest b/iraf.tables/ur_manifest new file mode 100644 index 0000000..6cd6f55 --- /dev/null +++ b/iraf.tables/ur_manifest @@ -0,0 +1,11 @@ +bin/libdisplay.a +bin/libgflib.a +bin/libgilib.a +bin/libstxtools.a +bin/libtbtables.a +bin/libuttables.a +bin/trename.e +bin/x_fitsio.e +bin/x_tbplot.e +bin/x_threed.e +bin/x_ttools.e diff --git a/iraf.tables/ur_mkpkg_cmd b/iraf.tables/ur_mkpkg_cmd new file mode 100644 index 0000000..16f9e19 --- /dev/null +++ b/iraf.tables/ur_mkpkg_cmd @@ -0,0 +1,36 @@ +# In Ureka, this script used to call make_all from the stsci_iraf tarball but +# in AstroConda, the applicable parts of make_all are instead included here, to +# accommodate stsci_iraf being split into separate conda packages: + +status=0 + +ls -la +pwd + +# (JT: I think stsci_iraf just does this to log the path to the version that +# gets picked up, for troubleshooting purposes:) +( +( +env | sort + +cl << ARF +tables +cd tables$ +! pwd +logout +ARF +) 2>&1 +) | sed 's/^/report: /' || status=1 + +# Execute the build. We probably don't need a subshell now that we're working +# directly in the tables subdirectory: +echo report: TABLES +mkpkg $IRAFARCH || status=1 +mkpkg -p tables update || status=1 +chmod g+r */*.e || status=1 + +# Proprietary code now gets removed by build_iraf_package. For stsci_iraf the +# conda recipe copies the (separately-maintained) list to the right place first. + +exit $status + diff --git a/iraf.tables/ur_mkpkg_patterns b/iraf.tables/ur_mkpkg_patterns new file mode 100644 index 0000000..c540e81 --- /dev/null +++ b/iraf.tables/ur_mkpkg_patterns @@ -0,0 +1,58 @@ +^gcc: -headerpad_max_install_names: linker input file unused because linking not done +^ld: warning +^libtool: file: +^libtool: warning same member name +^report: +^total[ ][0-9] +^[drwxl-]{10} +^/.*/iraf_extern/tables +^/.*/iraf_extern/stsdas +^/.*/iraf_extern/stecf +^_= +^[A-Za-z0-9_]*= +^Warning: +^ apropos +^ dataio +^ dbms +^ fitsio +^ecl> +^ [+]-*[+][ ]*$ +^ [|].*[|][ ]*$ +^ [+]-*[+][ ]*$ +^tables> +^TABLES[ ]*$ +^STSDAS[ ]*$ +^Warning, mkpkg line +^-- creating a new uparm directory +^Terminal types: +^Enter terminal type +^You may +^setting terminal type +^mH. +^[ ]*NOAO/IRAF +^[ ]*This is the EXPORT version +^[ ]*Welcome to IRAF +^[ ]*detailed information about +^[ ]*command[ ]*or[ ]*load +^[ ]*package, or `logout' +^[ ]*what is new in +^[ ]*Visit http://iraf.net +^[ ]*The following commands +^stsdas> +^ analysis +^ contrib +^ catfits +^ fits_exampl +^ Fits_file +^fitsio> +^foc.fits +^AFTER RFT_READ_FITS +^STECF +^Fits_file[ ] +^[ ]*[A-Za-z0-9_.-]*[.]fits[ ] +^[ ]*[A-Za-z0-9_.-]*[.]hhh[ ] +^[ ]*hhh[ ] +^[ ]*[.]{2}/scidata/ +^[ ]*renamed to +^0a1$ +^\+ export -- cgit From 2df08922e281c00a78b76875c6b6005f5a44ccfd Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Wed, 28 Sep 2016 21:44:32 -0300 Subject: Obtain IRAF package source tarballs from a locally-served URL that can be the same across sites. --- iraf.tables/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index cf775af..abbe74f 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -15,8 +15,7 @@ package: version: 3.17 source: fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url - # Need to figure out a site-agnostic way to specify this (conda-build #567): - url: file:///rtfperm/ur_packages/stsci_iraf-3.17-local.tar.gz + url: https://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz patches: - ac.iraf.stsci.patch requirements: -- cgit From 125a2feb45eaa3202cbda597259b7cdedb287876 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Thu, 29 Sep 2016 10:27:53 -0300 Subject: Retrieve local source tarballs for IRAF packages using plain HTTP for now. --- iraf.tables/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index abbe74f..6273e32 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -15,7 +15,7 @@ package: version: 3.17 source: fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url - url: https://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz + url: http://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz patches: - ac.iraf.stsci.patch requirements: -- cgit From 4ee8301df6891df89ede6aa3012f9a984ab5623c Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Thu, 29 Sep 2016 12:24:49 -0300 Subject: Change IRAF version spec to make conda use our updated IRAF build without being tied to a single version number and to allow for adding a running number more naturally. --- astroconda-utils/meta.yaml | 2 +- iraf.tables/meta.yaml | 4 ++-- iraf/meta.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/astroconda-utils/meta.yaml b/astroconda-utils/meta.yaml index e45a6c2..9a84ac3 100644 --- a/astroconda-utils/meta.yaml +++ b/astroconda-utils/meta.yaml @@ -13,6 +13,6 @@ source: git_url: https://github.com/jehturner/astroconda-utils.git requirements: run: - - iraf ==2.16_UR + - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 - pyraf diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index 6273e32..1e7836f 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -20,8 +20,8 @@ source: - ac.iraf.stsci.patch requirements: build: - - iraf ==2.16_UR + - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 - astroconda-utils run: - - iraf ==2.16_UR + - iraf !=2.16.1,>=2.16.UR diff --git a/iraf/meta.yaml b/iraf/meta.yaml index 1719e86..2bd7031 100644 --- a/iraf/meta.yaml +++ b/iraf/meta.yaml @@ -8,7 +8,7 @@ build: number: '0' package: name: iraf - version: 2.16_UR + version: 2.16.UR source: # svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/branches/jhunk-patches # svn_rev: 4156 -- cgit From a32e82dd68e48216723ab26caeca2d07efc52aa6 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Thu, 29 Sep 2016 12:39:27 -0300 Subject: Rename astroconda-utils to astroconda-build-utils. --- astroconda-build-utils/bld.bat | 3 +++ astroconda-build-utils/build.sh | 4 ++++ astroconda-build-utils/meta.yaml | 18 ++++++++++++++++++ astroconda-utils/bld.bat | 3 --- astroconda-utils/build.sh | 4 ---- astroconda-utils/meta.yaml | 18 ------------------ iraf.tables/meta.yaml | 6 +++--- 7 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 astroconda-build-utils/bld.bat create mode 100644 astroconda-build-utils/build.sh create mode 100644 astroconda-build-utils/meta.yaml delete mode 100644 astroconda-utils/bld.bat delete mode 100644 astroconda-utils/build.sh delete mode 100644 astroconda-utils/meta.yaml diff --git a/astroconda-build-utils/bld.bat b/astroconda-build-utils/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/astroconda-build-utils/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/astroconda-build-utils/build.sh b/astroconda-build-utils/build.sh new file mode 100644 index 0000000..7abeef0 --- /dev/null +++ b/astroconda-build-utils/build.sh @@ -0,0 +1,4 @@ +# Copy scripts to the installation: +dest="$PREFIX/bin" +mkdir -p "$dest" && cp -p scripts/* "$dest/" + diff --git a/astroconda-build-utils/meta.yaml b/astroconda-build-utils/meta.yaml new file mode 100644 index 0000000..cff4145 --- /dev/null +++ b/astroconda-build-utils/meta.yaml @@ -0,0 +1,18 @@ +about: + home: https://github.com/jehturner/astroconda-build-utils + license: BSD + summary: Utilities to help build and install AstroConda packages +build: + binary_relocation: True + #detect_binary_files_with_prefix: False [osx] + number: '0' +package: + name: astroconda-build-utils + version: "0.1" +source: + git_url: https://github.com/jehturner/astroconda-build-utils.git +requirements: + run: + - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 + - pyraf + diff --git a/astroconda-utils/bld.bat b/astroconda-utils/bld.bat deleted file mode 100644 index fa5316a..0000000 --- a/astroconda-utils/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -echo Not supported on Windows -exit 1 \ No newline at end of file diff --git a/astroconda-utils/build.sh b/astroconda-utils/build.sh deleted file mode 100644 index 7abeef0..0000000 --- a/astroconda-utils/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -# Copy scripts to the installation: -dest="$PREFIX/bin" -mkdir -p "$dest" && cp -p scripts/* "$dest/" - diff --git a/astroconda-utils/meta.yaml b/astroconda-utils/meta.yaml deleted file mode 100644 index 9a84ac3..0000000 --- a/astroconda-utils/meta.yaml +++ /dev/null @@ -1,18 +0,0 @@ -about: - home: https://github.com/jehturner/astroconda-utils - license: BSD - summary: Build and run time utilities for AstroConda -build: - binary_relocation: True - #detect_binary_files_with_prefix: False [osx] - number: '0' -package: - name: astroconda-utils - version: "0.1" -source: - git_url: https://github.com/jehturner/astroconda-utils.git -requirements: - run: - - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 - - pyraf - diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index 1e7836f..b5bd1c7 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -5,7 +5,7 @@ about: build: binary_relocation: False number: '0' - # These must be copied from astroconda-utils, since conda unhelpfully + # These must be copied from astroconda-build-utils, since conda unhelpfully # disallows the post-install step from depending on other packages: always_include_files: - bin/ac_config_iraf_pkg @@ -20,8 +20,8 @@ source: - ac.iraf.stsci.patch requirements: build: - - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 - - astroconda-utils + - iraf !=2.16.1,>=2.16.UR + - astroconda-build-utils run: - iraf !=2.16.1,>=2.16.UR -- cgit From 708688dfa7293de3f7a93192a19721580fc54c84 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Thu, 29 Sep 2016 21:00:15 -0300 Subject: Add STSDAS package. --- iraf.stsdas/ac.iraf.stsci.patch | 100 ++++++++++++++++++++++++++++++++++++++++ iraf.stsdas/bld.bat | 3 ++ iraf.stsdas/build.sh | 22 +++++++++ iraf.stsdas/meta.yaml | 29 ++++++++++++ iraf.stsdas/post-link.sh | 4 ++ iraf.stsdas/ur_extern.pkg | 8 ++++ iraf.stsdas/ur_manifest | 91 ++++++++++++++++++++++++++++++++++++ iraf.stsdas/ur_mkpkg_cmd | 44 ++++++++++++++++++ iraf.stsdas/ur_mkpkg_patterns | 60 ++++++++++++++++++++++++ iraf.tables/meta.yaml | 2 +- 10 files changed, 362 insertions(+), 1 deletion(-) create mode 100644 iraf.stsdas/ac.iraf.stsci.patch create mode 100644 iraf.stsdas/bld.bat create mode 100644 iraf.stsdas/build.sh create mode 100644 iraf.stsdas/meta.yaml create mode 100644 iraf.stsdas/post-link.sh create mode 100644 iraf.stsdas/ur_extern.pkg create mode 100644 iraf.stsdas/ur_manifest create mode 100644 iraf.stsdas/ur_mkpkg_cmd create mode 100644 iraf.stsdas/ur_mkpkg_patterns diff --git a/iraf.stsdas/ac.iraf.stsci.patch b/iraf.stsdas/ac.iraf.stsci.patch new file mode 100644 index 0000000..355d347 --- /dev/null +++ b/iraf.stsdas/ac.iraf.stsci.patch @@ -0,0 +1,100 @@ +diff -ur ../original/stsdas/apropos.cl ./stsdas/apropos.cl +--- ../original/stsdas/apropos.cl 2014-03-14 14:21:23.000000000 -0300 ++++ ./stsdas/apropos.cl 2016-08-10 17:47:39.000000000 -0300 +@@ -1,13 +1,66 @@ + procedure apropos ( topic ) + + string topic {prompt = ">Apropos ? ", mode="ql"} +-file index = "stsdas$lib/apropos.db" {prompt=">index to search"} ++file index = "aproposdb" {prompt=">index to search"} + + begin +-string csubject + +- # remove case sensitivity ++string csubject, dblist, fname, pvar ++int len, n, iend ++bool var_ok ++ ++ # Remove case sensitivity + csubject = "{"//topic//"}" +- match ( csubject, index, stop=no, meta=yes, print_file_names=no) ++ ++ # As a special case, if we're given the name of the "aproposdb" ++ # environment variable then get the list of database filenames ++ # from that: ++ if (index == "aproposdb") { ++ if (defvar("aproposdb")) { ++ dblist = envget("aproposdb") ++ } else { ++ error(1, "variable aproposdb is not set!") ++ } ++ } else { ++ dblist = index ++ } ++ ++ len = strlen(dblist) ++ ++ # Loop over the database filenames in the list: ++ while (len > 0) { ++ ++ # Parse next name and remove it from the start of the list: ++ iend = stridx(",", dblist) - 1 ++ if (iend < 0) iend = len # no more commas; use what's left ++ fname = substr(dblist, 1, iend) # parse next filename ++ if (iend > len-2) { # no more filenames; empty list ++ dblist="" ++ } else { # still have another file ++ dblist = substr(dblist, iend+2, len) ++ } ++ len = strlen(dblist) ++ ++ # Extract any path variable and check that it exists, ++ # otherwise IRAF will complain: ++ var_ok = yes ++ iend = stridx("$", fname) - 1 ++ if (iend > -1) { ++ pvar = substr(fname, 1, iend) ++ if (!defvar(pvar)) ++ var_ok = no ++ } ++ ++ # Try to match the query if the database file exists: ++ if (var_ok) ++ if (access(fname)) { ++ ++ # Print any matches in this database file: ++ match ( csubject, fname, stop=no, meta=yes, \ ++ print_file_names=no) ++ ++ } ++ ++ } # while loop over database files + + end +diff -ur ../original/tables/lib/tbtables/mkpkg ./tables/lib/tbtables/mkpkg +--- ../original/tables/lib/tbtables/mkpkg 2014-03-14 14:21:28.000000000 -0300 ++++ ./tables/lib/tbtables/mkpkg 2016-08-10 17:47:39.000000000 -0300 +@@ -233,12 +233,10 @@ + $ifdef (SPPFITSIO) + $echo "NOTE: SPP FITSIO will be used for FITS tables." + tbfhp_f.x tbtables.h tblfits.h +- @fitsio + $else + $echo "NOTE: CFITSIO will be used for FITS tables." + $echo "NOTE: CFITSIO does not support IRAF networking." + tbfhp.x tbtables.h tblfits.h + tbfxff.c fitsio_spp.h underscore.h +- @cfitsio + $endif + ; +diff -ur ../original/tables/lib/tbtables/tbfxff.c ./tables/lib/tbtables/tbfxff.c +--- ../original/tables/lib/tbtables/tbfxff.c 2014-03-14 14:21:28.000000000 -0300 ++++ ./tables/lib/tbtables/tbfxff.c 2016-08-10 17:47:39.000000000 -0300 +@@ -1,5 +1,5 @@ + # include +-# include "cfitsio/fitsio.h" /* CFITSIO include file */ ++# include /* CFITSIO include file */ + # include "fitsio_spp.h" /* sizes of SPP strings and Fortran FITSIO */ + # include "underscore.h" /* appends underscore, if needed */ + diff --git a/iraf.stsdas/bld.bat b/iraf.stsdas/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf.stsdas/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf.stsdas/build.sh b/iraf.stsdas/build.sh new file mode 100644 index 0000000..c5b339c --- /dev/null +++ b/iraf.stsdas/build.sh @@ -0,0 +1,22 @@ +name=stsdas + +# Configure the environment for IRAF, since conda build appears not to do +# "source activate" after installing dependencies (this would instead need to +# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying): +. setup_iraf.sh + +# Copy list of proprietary files to remove, from ../stsci_iraf/release_tools +# (conda build stops if this fails, due to "set -e"): +sed -ne "s|^$name/||p" release_tools/numrec_list.txt > $name/numrec_list.txt + +# Copy a couple of files used by the build into the package dir: +mkdir -p $name/build_check +cp -p release_tools/read_data_files.grep $name/build_check/ +cp -p release_tools/read_data_files.expect $name/build_check/ + +# Change to the package subdir (special case for STScI IRAF): +cd $name + +# Build from source in envs/_build (using build script from astroconda-utils): +ac_build_iraf_pkg + diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml new file mode 100644 index 0000000..39f2ff9 --- /dev/null +++ b/iraf.stsdas/meta.yaml @@ -0,0 +1,29 @@ +about: + home: http://www.stsci.edu/institute/software_hardware/stsdas + license: US government notice (and third-party licenses) + summary: STScI STSDAS package for IRAF +build: + binary_relocation: False + number: '0' + # These must be copied from astroconda-build-utils, since conda unhelpfully + # disallows the post-install step from depending on other packages: + always_include_files: + - bin/ac_config_iraf_pkg + - bin/ac_update_extern_pkg +package: + name: iraf.stsdas + version: 3.17 +source: + fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url + url: http://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz + patches: + - ac.iraf.stsci.patch +requirements: + build: + - astroconda-build-utils + - iraf !=2.16.1,>=2.16.UR + - iraf.tables + run: + - iraf !=2.16.1,>=2.16.UR + - iraf.tables + diff --git a/iraf.stsdas/post-link.sh b/iraf.stsdas/post-link.sh new file mode 100644 index 0000000..5b6d8b2 --- /dev/null +++ b/iraf.stsdas/post-link.sh @@ -0,0 +1,4 @@ +# Call a common script that updates extern.pkg for the new IRAF package: + +"$PREFIX/bin/ac_config_iraf_pkg" stsdas + diff --git a/iraf.stsdas/ur_extern.pkg b/iraf.stsdas/ur_extern.pkg new file mode 100644 index 0000000..63ab4ec --- /dev/null +++ b/iraf.stsdas/ur_extern.pkg @@ -0,0 +1,8 @@ +reset stsdas = UR_VDIR +task stsdas.pkg = stsdas$stsdas.cl +task apropos = stsdas$apropos.cl +if (access("stsdas$lib")) { + reset helpdb= ( envget("helpdb") + ",stsdas$lib/helpdb.mip" ) + reset aproposdb= ( envget("aproposdb") + ",stsdas$lib/apropos.db" ) +} + diff --git a/iraf.stsdas/ur_manifest b/iraf.stsdas/ur_manifest new file mode 100644 index 0000000..3b16102 --- /dev/null +++ b/iraf.stsdas/ur_manifest @@ -0,0 +1,91 @@ +bin/cs0.e +bin/cs1.e +bin/cs11.e +bin/cs12.e +bin/cs2.e +bin/cs4.e +bin/cs6.e +bin/cs7.e +bin/cs8.e +bin/inttag.e +bin/libapplib.a +bin/libcvos.a +bin/libf77util.a +bin/libhstio.a +bin/libiraf77.a +bin/libsynphot.a +bin/slitless.e +bin/x_acoadd.e +bin/x_asnexpand.e +bin/x_biaseq.e +bin/x_blot.e +bin/x_calfoc.e +bin/x_calfos.e +bin/x_calhrs.e +bin/x_calnica.e +bin/x_calnicb.e +bin/x_calpar.e +bin/x_calwfp.e +bin/x_calwp2.e +bin/x_cdgasp.e +bin/x_ctools.e +bin/x_dither.e +bin/x_doppinfo.e +bin/x_drizzle.e +bin/x_echscript.e +bin/x_fitting.e +bin/x_focprism.e +bin/x_fos.e +bin/x_fourier.e +bin/x_fquot.e +bin/x_fweight.e +bin/x_gcombine.e +bin/x_headers.e +bin/x_hrs.e +bin/x_imgtools.e +bin/x_infostis.e +bin/x_isophote.e +bin/x_msarith.e +bin/x_msbadpix.e +bin/x_mscopy.e +bin/x_msreadnoise.e +bin/x_msstatistics.e +bin/x_msstreakflat.e +bin/x_nebular.e +bin/x_newgeom.e +bin/x_nicmos.e +bin/x_odelaytime.e +bin/x_ovac2air.e +bin/x_paperprod.e +bin/x_pedsky.e +bin/x_pedsub.e +bin/x_playpen.e +bin/x_pltsol.e +bin/x_plucy.e +bin/x_psikern.e +bin/x_pweight.e +bin/x_restore.e +bin/x_sdisplay.e +bin/x_sharp.e +bin/x_simulators.e +bin/x_spec_polar.e +bin/x_spfitpkg.e +bin/x_splice.e +bin/x_statistics.e +bin/x_stplot.e +bin/x_synphot.e +bin/x_tastis.e +bin/x_tools.e +bin/x_tranback.e +bin/x_traxy.e +bin/x_treqxy.e +bin/x_trxyeq.e +bin/x_ucrpix.e +bin/x_w_calib.e +bin/x_wblot.e +bin/x_wcs2dr.e +bin/x_wdrizzle.e +bin/x_wfpc.e +bin/x_wtranback.e +bin/x_wtraxy.e +bin/x_xcor.e diff --git a/iraf.stsdas/ur_mkpkg_cmd b/iraf.stsdas/ur_mkpkg_cmd new file mode 100644 index 0000000..2554a0b --- /dev/null +++ b/iraf.stsdas/ur_mkpkg_cmd @@ -0,0 +1,44 @@ +# In Ureka, this script used to call make_all from the stsci_iraf tarball but +# in AstroConda, the applicable parts of make_all are instead included here, to +# accommodate stsci_iraf being split into separate conda packages: + +status=0 + +#ls -la +pwd + +# Execute the build: +echo report: STSDAS +mkpkg $IRAFARCH || status=1 +mkpkg -p tables -p stsdas update || status=1 +chmod g+r */*.e || status=1 + +# Do the additional steps from the tarball's make_all: +echo report: STSDAS READ DATA FILES +cd build_check # created by build.sh in iraf.stsdas +rm -rf iraf +mkdir iraf +cd iraf +echo xterm | mkiraf > mkiraf_tmp 2>&1 +sed 's/^/report: /' < mkiraf_tmp +touch .hushiraf +cl > tmp << ARF +stsdas +fitsio +cd stsdas +cd data/fits +cl < read_fits.cl +logout +ARF +cd .. +grep -v -f read_data_files.grep < iraf/tmp > result || status=1 +diff -b read_data_files.expect result || status=1 + +# Proprietary code now gets removed by build_iraf_package. For stsci_iraf the +# conda recipe copies the (separately-maintained) list to the right place first. + +# Tidy up a bit (unless something failed detectably): +[ $status = 0 ] && rm -fr iraf/ + +exit $status + diff --git a/iraf.stsdas/ur_mkpkg_patterns b/iraf.stsdas/ur_mkpkg_patterns new file mode 100644 index 0000000..d2c0861 --- /dev/null +++ b/iraf.stsdas/ur_mkpkg_patterns @@ -0,0 +1,60 @@ +^gcc: -headerpad_max_install_names: linker input file unused because linking not done +^ld: warning +^libtool: file: +^libtool: warning same member name +^report: +^total[ ][0-9] +^[drwxl-]{10} +^/.*/iraf_extern/tables +^/.*/iraf_extern/stsdas +^/.*/iraf_extern/stecf +^_= +^[A-Za-z0-9_]*= +^Warning: +^ apropos +^ dataio +^ dbms +^ fitsio +^(>.*)?ecl>[ \t]*$ +^ [+]-*[+][ ]*$ +^ [|].*[|][ ]*$ +^ [+]-*[+][ ]*$ +^tables> +^TABLES[ ]*$ +^STSDAS[ ]*$ +^Warning, mkpkg line +^-- creating a new uparm directory +^Terminal types: +^Enter terminal type +^You may +^setting terminal type +^mH. +^[ ]*NOAO/IRAF +^[ ]*This is the EXPORT version +^[ ]*Welcome to IRAF +^[ ]*detailed information about +^[ ]*command[ ]*or[ ]*load +^[ ]*package, or `logout' +^[ ]*what is new in +^[ ]*Visit http://iraf.net +^[ ]*The following commands +^stsdas> +^ analysis +^ contrib +^ catfits +^ fits_exampl +^ Fits_file +^fitsio> +^foc.fits +^AFTER RFT_READ_FITS +^STECF +^Fits_file[ ] +^[ ]*[A-Za-z0-9_.-]*[.]fits[ ] +^[ ]*[A-Za-z0-9_.-]*[.]hhh[ ] +^[ ]*hhh[ ] +^[ ]*[.]{2}/scidata/ +^[ ]*renamed to +^0a1$ +^\+ export +^rm +^unable to remove diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index b5bd1c7..6c78f9c 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -20,8 +20,8 @@ source: - ac.iraf.stsci.patch requirements: build: - - iraf !=2.16.1,>=2.16.UR - astroconda-build-utils + - iraf !=2.16.1,>=2.16.UR run: - iraf !=2.16.1,>=2.16.UR -- cgit From a66143a3e1d020f1beb93ae3731ca2557a00f4c2 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Fri, 30 Sep 2016 14:38:44 -0300 Subject: Add STECF package (similar to TABLES & STSDAS). --- iraf.stecf/bld.bat | 3 +++ iraf.stecf/build.sh | 17 +++++++++++++ iraf.stecf/meta.yaml | 29 +++++++++++++++++++++ iraf.stecf/post-link.sh | 4 +++ iraf.stecf/ur_extern.pkg | 7 ++++++ iraf.stecf/ur_manifest | 4 +++ iraf.stecf/ur_mkpkg_cmd | 21 ++++++++++++++++ iraf.stecf/ur_mkpkg_patterns | 60 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 145 insertions(+) create mode 100644 iraf.stecf/bld.bat create mode 100644 iraf.stecf/build.sh create mode 100644 iraf.stecf/meta.yaml create mode 100644 iraf.stecf/post-link.sh create mode 100644 iraf.stecf/ur_extern.pkg create mode 100644 iraf.stecf/ur_manifest create mode 100644 iraf.stecf/ur_mkpkg_cmd create mode 100644 iraf.stecf/ur_mkpkg_patterns diff --git a/iraf.stecf/bld.bat b/iraf.stecf/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf.stecf/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf.stecf/build.sh b/iraf.stecf/build.sh new file mode 100644 index 0000000..ff620d5 --- /dev/null +++ b/iraf.stecf/build.sh @@ -0,0 +1,17 @@ +name=stecf + +# Configure the environment for IRAF, since conda build appears not to do +# "source activate" after installing dependencies (this would instead need to +# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying): +. setup_iraf.sh + +# Copy list of proprietary files to remove, from ../stsci_iraf/release_tools +# (conda build stops if this fails, due to "set -e"): +sed -ne "s|^$name/||p" release_tools/numrec_list.txt > $name/numrec_list.txt + +# Change to the package subdir (special case for STScI IRAF): +cd $name + +# Build from source in envs/_build (using build script from astroconda-utils): +ac_build_iraf_pkg + diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml new file mode 100644 index 0000000..ea56c03 --- /dev/null +++ b/iraf.stecf/meta.yaml @@ -0,0 +1,29 @@ +about: + home: http://www.stsci.edu/institute/software_hardware/stsdas + license: US government notice (and third-party licenses) + summary: STECF package for IRAF +build: + binary_relocation: False + number: '0' + # These must be copied from astroconda-build-utils, since conda unhelpfully + # disallows the post-install step from depending on other packages: + always_include_files: + - bin/ac_config_iraf_pkg + - bin/ac_update_extern_pkg +package: + name: iraf.stecf + version: 3.17 +source: + fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url + url: http://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz +requirements: + build: + - astroconda-build-utils + - iraf !=2.16.1,>=2.16.UR + - iraf.tables + - iraf.stsdas + run: + - iraf !=2.16.1,>=2.16.UR + - iraf.tables + - iraf.stsdas + diff --git a/iraf.stecf/post-link.sh b/iraf.stecf/post-link.sh new file mode 100644 index 0000000..b7e6898 --- /dev/null +++ b/iraf.stecf/post-link.sh @@ -0,0 +1,4 @@ +# Call a common script that updates extern.pkg for the new IRAF package: + +"$PREFIX/bin/ac_config_iraf_pkg" stecf + diff --git a/iraf.stecf/ur_extern.pkg b/iraf.stecf/ur_extern.pkg new file mode 100644 index 0000000..e7b3186 --- /dev/null +++ b/iraf.stecf/ur_extern.pkg @@ -0,0 +1,7 @@ +reset stecf = UR_VDIR +task stecf.pkg = stecf$stecf.cl +if (access("stecf$lib")) { + reset helpdb= ( envget("helpdb") + ",stecf$lib/helpdb.mip" ) + reset aproposdb= ( envget("aproposdb") + ",stecf$lib/apropos.db" ) +} + diff --git a/iraf.stecf/ur_manifest b/iraf.stecf/ur_manifest new file mode 100644 index 0000000..9a25083 --- /dev/null +++ b/iraf.stecf/ur_manifest @@ -0,0 +1,4 @@ +bin/x_driztools.e +bin/x_impol.e +bin/x_imres.e +bin/x_specres.e diff --git a/iraf.stecf/ur_mkpkg_cmd b/iraf.stecf/ur_mkpkg_cmd new file mode 100644 index 0000000..2216941 --- /dev/null +++ b/iraf.stecf/ur_mkpkg_cmd @@ -0,0 +1,21 @@ +# In Ureka, this script used to call make_all from the stsci_iraf tarball but +# in AstroConda, the applicable parts of make_all are instead included here, to +# accommodate stsci_iraf being split into separate conda packages: + +status=0 + +#ls -la +pwd + +# Execute the build. We probably don't need a subshell now that we're working +# directly in the subdirectory: +echo report: STECF +mkpkg $IRAFARCH || status=1 +mkpkg -p tables -p stsdas update || status=1 +chmod g+r */*.e || status=1 + +# Proprietary code now gets removed by build_iraf_package. For stsci_iraf the +# conda recipe copies the (separately-maintained) list to the right place first. + +exit $status + diff --git a/iraf.stecf/ur_mkpkg_patterns b/iraf.stecf/ur_mkpkg_patterns new file mode 100644 index 0000000..d2c0861 --- /dev/null +++ b/iraf.stecf/ur_mkpkg_patterns @@ -0,0 +1,60 @@ +^gcc: -headerpad_max_install_names: linker input file unused because linking not done +^ld: warning +^libtool: file: +^libtool: warning same member name +^report: +^total[ ][0-9] +^[drwxl-]{10} +^/.*/iraf_extern/tables +^/.*/iraf_extern/stsdas +^/.*/iraf_extern/stecf +^_= +^[A-Za-z0-9_]*= +^Warning: +^ apropos +^ dataio +^ dbms +^ fitsio +^(>.*)?ecl>[ \t]*$ +^ [+]-*[+][ ]*$ +^ [|].*[|][ ]*$ +^ [+]-*[+][ ]*$ +^tables> +^TABLES[ ]*$ +^STSDAS[ ]*$ +^Warning, mkpkg line +^-- creating a new uparm directory +^Terminal types: +^Enter terminal type +^You may +^setting terminal type +^mH. +^[ ]*NOAO/IRAF +^[ ]*This is the EXPORT version +^[ ]*Welcome to IRAF +^[ ]*detailed information about +^[ ]*command[ ]*or[ ]*load +^[ ]*package, or `logout' +^[ ]*what is new in +^[ ]*Visit http://iraf.net +^[ ]*The following commands +^stsdas> +^ analysis +^ contrib +^ catfits +^ fits_exampl +^ Fits_file +^fitsio> +^foc.fits +^AFTER RFT_READ_FITS +^STECF +^Fits_file[ ] +^[ ]*[A-Za-z0-9_.-]*[.]fits[ ] +^[ ]*[A-Za-z0-9_.-]*[.]hhh[ ] +^[ ]*hhh[ ] +^[ ]*[.]{2}/scidata/ +^[ ]*renamed to +^0a1$ +^\+ export +^rm +^unable to remove -- cgit From 43d8db3f431ce1dbd3a73e2359bddd503b54ac46 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Mon, 3 Oct 2016 20:43:23 -0300 Subject: Add FITSUTIL IRAF package. --- iraf.fitsutil/ac.iraf.fitsutil.patch | 17 +++++++++++++++++ iraf.fitsutil/bld.bat | 3 +++ iraf.fitsutil/build.sh | 8 ++++++++ iraf.fitsutil/meta.yaml | 27 +++++++++++++++++++++++++++ iraf.fitsutil/post-link.sh | 4 ++++ iraf.fitsutil/ur_extern.pkg | 6 ++++++ iraf.fitsutil/ur_manifest | 7 +++++++ iraf.fitsutil/ur_mkpkg_patterns | 24 ++++++++++++++++++++++++ 8 files changed, 96 insertions(+) create mode 100644 iraf.fitsutil/ac.iraf.fitsutil.patch create mode 100644 iraf.fitsutil/bld.bat create mode 100644 iraf.fitsutil/build.sh create mode 100644 iraf.fitsutil/meta.yaml create mode 100644 iraf.fitsutil/post-link.sh create mode 100644 iraf.fitsutil/ur_extern.pkg create mode 100644 iraf.fitsutil/ur_manifest create mode 100644 iraf.fitsutil/ur_mkpkg_patterns diff --git a/iraf.fitsutil/ac.iraf.fitsutil.patch b/iraf.fitsutil/ac.iraf.fitsutil.patch new file mode 100644 index 0000000..1831961 --- /dev/null +++ b/iraf.fitsutil/ac.iraf.fitsutil.patch @@ -0,0 +1,17 @@ +diff -ur ../original/lib/cfitsio/mkpkg ./lib/cfitsio/mkpkg +--- ../original/lib/cfitsio/mkpkg 2011-03-28 02:28:46.000000000 -0300 ++++ ./lib/cfitsio/mkpkg 2016-08-10 17:47:41.000000000 -0300 +@@ -8,10 +8,10 @@ + ; + + libcfitsio.a: +- # cheat and use Makefile.... +- !(CFLAGS='$(HSI_CF) $(HSI_LF)' ; ./configure) ++ # cheat and use Makefile.... ++ !sh -c 'CFLAGS="$(HSI_CF) $(HSI_LF)" ./configure' + !make + !make fpack funpack +- !/bin/cp libcfitsio.a ../ ++ !/bin/cp libcfitsio.a ../../bin/ + !/bin/cp fpack funpack ../../bin/ + ; diff --git a/iraf.fitsutil/bld.bat b/iraf.fitsutil/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf.fitsutil/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf.fitsutil/build.sh b/iraf.fitsutil/build.sh new file mode 100644 index 0000000..2353907 --- /dev/null +++ b/iraf.fitsutil/build.sh @@ -0,0 +1,8 @@ +# Configure the environment for IRAF, since conda build appears not to do +# "source activate" after installing dependencies (this would instead need to +# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying): +. setup_iraf.sh + +# Build from source in envs/_build (using build script from astroconda-utils): +ac_build_iraf_pkg + diff --git a/iraf.fitsutil/meta.yaml b/iraf.fitsutil/meta.yaml new file mode 100644 index 0000000..6c6911e --- /dev/null +++ b/iraf.fitsutil/meta.yaml @@ -0,0 +1,27 @@ +about: + home: http://iraf.noao.edu/ + license: IRAF MIT/X11 variant, CFITSIO government notice & GPL + summary: FITSUTIL package for IRAF +build: + binary_relocation: False + number: '0' + # These must be copied from astroconda-build-utils, since conda unhelpfully + # disallows the post-install step from depending on other packages: + always_include_files: + - bin/ac_config_iraf_pkg + - bin/ac_update_extern_pkg +package: + name: iraf.fitsutil + version: 2011_02_22 +source: + fn: fitsutil-src-2011-02-22.tar.gz + url: http://astroconda-source:4440/fitsutil-src-2011-02-22.tar.gz + patches: + - ac.iraf.fitsutil.patch +requirements: + build: + - astroconda-build-utils + - iraf !=2.16.1,>=2.16.UR + run: + - iraf !=2.16.1,>=2.16.UR + diff --git a/iraf.fitsutil/post-link.sh b/iraf.fitsutil/post-link.sh new file mode 100644 index 0000000..fb060b5 --- /dev/null +++ b/iraf.fitsutil/post-link.sh @@ -0,0 +1,4 @@ +# Call a common script that updates extern.pkg for the new IRAF package: + +"$PREFIX/bin/ac_config_iraf_pkg" fitsutil + diff --git a/iraf.fitsutil/ur_extern.pkg b/iraf.fitsutil/ur_extern.pkg new file mode 100644 index 0000000..9d314ee --- /dev/null +++ b/iraf.fitsutil/ur_extern.pkg @@ -0,0 +1,6 @@ +# ftp://iraf.noao.edu/iraf/v215/REPO +reset fitsutil = UR_VDIR +task fitsutil.pkg = fitsutil$fitsutil.cl +reset helpdb= ( envget("helpdb") + ",fitsutil$lib/helpdb.mip" ) +reset aproposdb= ( envget("aproposdb") + ",fitsutil$lib/apropos.db" ) + diff --git a/iraf.fitsutil/ur_manifest b/iraf.fitsutil/ur_manifest new file mode 100644 index 0000000..be6c519 --- /dev/null +++ b/iraf.fitsutil/ur_manifest @@ -0,0 +1,7 @@ +bin/fgread.e +bin/fgwrite.e +bin/fpack +bin/funpack +bin/libmef.a +bin/sum32 +bin/x_fitsutil.e diff --git a/iraf.fitsutil/ur_mkpkg_patterns b/iraf.fitsutil/ur_mkpkg_patterns new file mode 100644 index 0000000..dad5ca8 --- /dev/null +++ b/iraf.fitsutil/ur_mkpkg_patterns @@ -0,0 +1,24 @@ +^gcc: -headerpad_max_install_names: linker input file unused because linking not done +^cfitsio: == Adding +^cfitsio: == Using +^[ ]*Congratulations +^[ ]*You may want +^!*make +^drvrfile[.]c: In function .stream_open.: +^drvrfile[.]c: In function .stream_create.: +^[A-Za-z0-9_-]*[.]c:[0-9][0-9]*: warning: +^ar[ ] +^fpackutil.o: In function .fp_pack_hdu': +^[ ]*yes[ ]*$ +^[ ]*done[ ]*$ +^no[ ]*$ +^eval_f.c: In function .parse_data.: +^fpack.c: In function .fp_get_param.: +^fpackutil.c: In function .fp_init.: +^fpackutil.c: In function .fp_info_hdu.: +^fpackutil.c: In function .fp_test.: +^funpack.c: In function .fu_get_param.: +^!sh -c +^fpackutil.c: +^configure:.* cfitsio:.*No acceptable Fortran compiler +^configure:.* cfitsio:.*Adding wrapper support -- cgit From 6e9b90e5c1cc5603de6966c3aab5bbfd59845f56 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Tue, 4 Oct 2016 14:22:45 -0300 Subject: Quote version numbers as recommended in the conda build docs. --- iraf.fitsutil/meta.yaml | 2 +- iraf.stecf/meta.yaml | 2 +- iraf.stsdas/meta.yaml | 2 +- iraf.tables/meta.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iraf.fitsutil/meta.yaml b/iraf.fitsutil/meta.yaml index 6c6911e..efcee83 100644 --- a/iraf.fitsutil/meta.yaml +++ b/iraf.fitsutil/meta.yaml @@ -12,7 +12,7 @@ build: - bin/ac_update_extern_pkg package: name: iraf.fitsutil - version: 2011_02_22 + version: "2011_02_22" source: fn: fitsutil-src-2011-02-22.tar.gz url: http://astroconda-source:4440/fitsutil-src-2011-02-22.tar.gz diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml index ea56c03..d348cad 100644 --- a/iraf.stecf/meta.yaml +++ b/iraf.stecf/meta.yaml @@ -12,7 +12,7 @@ build: - bin/ac_update_extern_pkg package: name: iraf.stecf - version: 3.17 + version: "3.17" source: fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url url: http://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml index 39f2ff9..530e6ee 100644 --- a/iraf.stsdas/meta.yaml +++ b/iraf.stsdas/meta.yaml @@ -12,7 +12,7 @@ build: - bin/ac_update_extern_pkg package: name: iraf.stsdas - version: 3.17 + version: "3.17" source: fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url url: http://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index 6c78f9c..283f6e2 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -12,7 +12,7 @@ build: - bin/ac_update_extern_pkg package: name: iraf.tables - version: 3.17 + version: "3.17" source: fn: stsci_iraf-3.17-local.tar.gz # quirky requirement in addition to url url: http://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz -- cgit From 6173807e3dcc404d7c8b5343b57f78158e9e9046 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Tue, 4 Oct 2016 14:23:29 -0300 Subject: Add latest public Gemini IRAF package (1.13.1). --- iraf.gemini/ac.iraf.gemini.patch | 39 +++++++++++++++++++++++++++++++++++++++ iraf.gemini/bld.bat | 3 +++ iraf.gemini/build.sh | 8 ++++++++ iraf.gemini/meta.yaml | 34 ++++++++++++++++++++++++++++++++++ iraf.gemini/post-link.sh | 4 ++++ iraf.gemini/ur_extern.pkg | 6 ++++++ iraf.gemini/ur_manifest | 10 ++++++++++ iraf.gemini/ur_mkpkg_patterns | 1 + 8 files changed, 105 insertions(+) create mode 100644 iraf.gemini/ac.iraf.gemini.patch create mode 100644 iraf.gemini/bld.bat create mode 100644 iraf.gemini/build.sh create mode 100644 iraf.gemini/meta.yaml create mode 100644 iraf.gemini/post-link.sh create mode 100644 iraf.gemini/ur_extern.pkg create mode 100644 iraf.gemini/ur_manifest create mode 100644 iraf.gemini/ur_mkpkg_patterns diff --git a/iraf.gemini/ac.iraf.gemini.patch b/iraf.gemini/ac.iraf.gemini.patch new file mode 100644 index 0000000..297c7b8 --- /dev/null +++ b/iraf.gemini/ac.iraf.gemini.patch @@ -0,0 +1,39 @@ +diff -ur ../original/gemini.cl ./gemini.cl +--- ../original/gemini.cl 2015-11-30 20:26:51.000000000 -0300 ++++ ./gemini.cl 2016-10-03 21:17:44.000000000 -0300 +@@ -23,7 +23,9 @@ + # Dec 7, 2015 KL Release v1.13.1 + # + # The latest version of the Gemini IRAF package is only compatible with +-# versions of IRAF between v2.14.1 and v2.16 in Ureka ++# versions of IRAF between v2.14.1-v2.15.1a and v2.16 in Ureka or Astroconda ++# -- but that requirement is enforced by installing as a conda package, so the ++# version-check logic has been removed here (avoiding annoying pauses): + if (defpar ("release")) { + if (release >= "2.16") { + # There appear to be several issues related to the new image template +@@ -31,24 +33,7 @@ + if (defvar("use_new_imt")) { + set use_new_imt = "no" + } +- if (!access("iraf$../bin/ur-setup-real")) { +- printf ("WARNING: The Gemini IRAF package is not compatible \n") +- printf (" with IRAF v2.16, unless installed using Ureka\n") +- printf ("Tested with IRAF 2.16 from Ureka\n") +- sleep 10 +- } +- } else if ((release < "2.14.1") || (release > "2.15.1a")) { +- printf ("WARNING: The Gemini IRAF package is only compatible with\n") +- printf (" versions of IRAF between v2.14.1 and v2.15.1a\n") +- printf (" and v2.16 in Ureka\n") +- printf ("Tested with IRAF 2.16 from Ureka\n") +- sleep 10 + } +-} else { +- printf ("WARNING: The Gemini IRAF package is only compatible with\n") +- printf (" versions of IRAF v2.14.1 and v2.16 in Ureka\n") +- printf ("Tested with IRAF 2.16 from Ureka\n") +- sleep 10 + } + ; + diff --git a/iraf.gemini/bld.bat b/iraf.gemini/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf.gemini/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf.gemini/build.sh b/iraf.gemini/build.sh new file mode 100644 index 0000000..2353907 --- /dev/null +++ b/iraf.gemini/build.sh @@ -0,0 +1,8 @@ +# Configure the environment for IRAF, since conda build appears not to do +# "source activate" after installing dependencies (this would instead need to +# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying): +. setup_iraf.sh + +# Build from source in envs/_build (using build script from astroconda-utils): +ac_build_iraf_pkg + diff --git a/iraf.gemini/meta.yaml b/iraf.gemini/meta.yaml new file mode 100644 index 0000000..d12ec38 --- /dev/null +++ b/iraf.gemini/meta.yaml @@ -0,0 +1,34 @@ +about: + home: http://www.gemini.edu/sciops/data-and-results/processing-software + license: Fee-free redistribution only (& 3rd-party non-commercial licenses) + license_file: COPYRIGHT + summary: Gemini IRAF package +build: + binary_relocation: False + number: '0' + # These must be copied from astroconda-build-utils, since conda unhelpfully + # disallows the post-install step from depending on other packages: + always_include_files: + - bin/ac_config_iraf_pkg + - bin/ac_update_extern_pkg +package: + name: iraf.gemini + version: "1.13.1" +source: + fn: gemini_v1131_for_iraf_2.16.tar.gz + url: http://astroconda-source:4440/gemini_v1131_for_iraf_2.16.tar.gz + patches: + - ac.iraf.gemini.patch +requirements: + build: + - astroconda-build-utils + - iraf !=2.16.1,>=2.16.UR + - iraf.tables + - iraf.stsdas + - iraf.fitsutil + run: + - iraf !=2.16.1,>=2.16.UR + - iraf.tables + - iraf.stsdas + - iraf.fitsutil + diff --git a/iraf.gemini/post-link.sh b/iraf.gemini/post-link.sh new file mode 100644 index 0000000..df12253 --- /dev/null +++ b/iraf.gemini/post-link.sh @@ -0,0 +1,4 @@ +# Call a common script that updates extern.pkg for the new IRAF package: + +"$PREFIX/bin/ac_config_iraf_pkg" gemini + diff --git a/iraf.gemini/ur_extern.pkg b/iraf.gemini/ur_extern.pkg new file mode 100644 index 0000000..363f018 --- /dev/null +++ b/iraf.gemini/ur_extern.pkg @@ -0,0 +1,6 @@ +# http://www.gemini.edu/sciops/data-and-results/processing-software/releases/downloads +reset gemini = UR_VDIR +task gemini.pkg = gemini$gemini.cl +reset helpdb= ( envget("helpdb") + ",gemini$lib/helpdb.mip" ) +reset aproposdb= ( envget("aproposdb") + ",gemini$lib/apropos.db" ) + diff --git a/iraf.gemini/ur_manifest b/iraf.gemini/ur_manifest new file mode 100644 index 0000000..19b462f --- /dev/null +++ b/iraf.gemini/ur_manifest @@ -0,0 +1,10 @@ +bin/libdbc.a +bin/libgemini.a +bin/libgslalib.a +bin/libirafdb.a +bin/libmefio.a +bin/libpdainterp.a +bin/x_gemexpr.e +bin/x_gemtools.e +bin/x_gmos.e +bin/x_gnirs.e diff --git a/iraf.gemini/ur_mkpkg_patterns b/iraf.gemini/ur_mkpkg_patterns new file mode 100644 index 0000000..6f18567 --- /dev/null +++ b/iraf.gemini/ur_mkpkg_patterns @@ -0,0 +1 @@ +^!ln -s -- cgit From 26e9edead94cfb61b791bc7717b4c7c4957cc879 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Wed, 12 Oct 2016 14:28:54 -0300 Subject: Package containing the core IRAF help & apropos databases (separated because the script to build help depends on pyraf). --- iraf-help/bld.bat | 3 +++ iraf-help/build.sh | 14 ++++++++++++++ iraf-help/meta.yaml | 16 ++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 iraf-help/bld.bat create mode 100644 iraf-help/build.sh create mode 100644 iraf-help/meta.yaml diff --git a/iraf-help/bld.bat b/iraf-help/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf-help/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf-help/build.sh b/iraf-help/build.sh new file mode 100644 index 0000000..4ff47c8 --- /dev/null +++ b/iraf-help/build.sh @@ -0,0 +1,14 @@ +# Configure the environment for IRAF, since conda build appears not to do +# "source activate" after installing dependencies (this would instead need to +# eval $PREFIX/iraf/unix/hlib/setup directly if "--level" needs specifying): +. setup_iraf.sh + +logname=help_log + +make_iraf_help iraf > $logname 2>&1 +make_iraf_help noao >> $logname 2>&1 +make_iraf_help color >> $logname 2>&1 +make_iraf_help vol >> $logname 2>&1 + +cp -p $logname "$PREFIX/iraf/" + diff --git a/iraf-help/meta.yaml b/iraf-help/meta.yaml new file mode 100644 index 0000000..382284a --- /dev/null +++ b/iraf-help/meta.yaml @@ -0,0 +1,16 @@ +about: + home: http://iraf.noao.edu + license: MIT (and third-party licenses) + summary: Core IRAF help & apropos databases (built separately) +build: + binary_relocation: False + number: '0' +package: + name: iraf-help + version: "2.16.UR" +requirements: + build: + - astroconda-build-utils # depends on PyRAF, hence why separate + - iraf !=2.16.1,>=2.16.UR + run: + - iraf !=2.16.1,>=2.16.UR -- cgit From 3b006f1563a48fc879d21237aac8a52b177bfccf Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Wed, 12 Oct 2016 16:52:03 -0300 Subject: Moved astroconda-build-utils to astroconda github org and renamed to astroconda-iraf-helpers. --- astroconda-build-utils/bld.bat | 3 --- astroconda-build-utils/build.sh | 4 ---- astroconda-build-utils/meta.yaml | 18 ------------------ astroconda-iraf-helpers/bld.bat | 3 +++ astroconda-iraf-helpers/build.sh | 4 ++++ astroconda-iraf-helpers/meta.yaml | 18 ++++++++++++++++++ 6 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 astroconda-build-utils/bld.bat delete mode 100644 astroconda-build-utils/build.sh delete mode 100644 astroconda-build-utils/meta.yaml create mode 100644 astroconda-iraf-helpers/bld.bat create mode 100644 astroconda-iraf-helpers/build.sh create mode 100644 astroconda-iraf-helpers/meta.yaml diff --git a/astroconda-build-utils/bld.bat b/astroconda-build-utils/bld.bat deleted file mode 100644 index fa5316a..0000000 --- a/astroconda-build-utils/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -echo Not supported on Windows -exit 1 \ No newline at end of file diff --git a/astroconda-build-utils/build.sh b/astroconda-build-utils/build.sh deleted file mode 100644 index 7abeef0..0000000 --- a/astroconda-build-utils/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -# Copy scripts to the installation: -dest="$PREFIX/bin" -mkdir -p "$dest" && cp -p scripts/* "$dest/" - diff --git a/astroconda-build-utils/meta.yaml b/astroconda-build-utils/meta.yaml deleted file mode 100644 index cff4145..0000000 --- a/astroconda-build-utils/meta.yaml +++ /dev/null @@ -1,18 +0,0 @@ -about: - home: https://github.com/jehturner/astroconda-build-utils - license: BSD - summary: Utilities to help build and install AstroConda packages -build: - binary_relocation: True - #detect_binary_files_with_prefix: False [osx] - number: '0' -package: - name: astroconda-build-utils - version: "0.1" -source: - git_url: https://github.com/jehturner/astroconda-build-utils.git -requirements: - run: - - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 - - pyraf - diff --git a/astroconda-iraf-helpers/bld.bat b/astroconda-iraf-helpers/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/astroconda-iraf-helpers/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/astroconda-iraf-helpers/build.sh b/astroconda-iraf-helpers/build.sh new file mode 100644 index 0000000..7abeef0 --- /dev/null +++ b/astroconda-iraf-helpers/build.sh @@ -0,0 +1,4 @@ +# Copy scripts to the installation: +dest="$PREFIX/bin" +mkdir -p "$dest" && cp -p scripts/* "$dest/" + diff --git a/astroconda-iraf-helpers/meta.yaml b/astroconda-iraf-helpers/meta.yaml new file mode 100644 index 0000000..e5a4a2b --- /dev/null +++ b/astroconda-iraf-helpers/meta.yaml @@ -0,0 +1,18 @@ +about: + home: https://github.com/jehturner/astroconda-iraf-helpers + license: BSD + summary: Utilities to help build and install AstroConda packages +build: + binary_relocation: True + #detect_binary_files_with_prefix: False [osx] + number: '0' +package: + name: astroconda-iraf-helpers + version: "0.1" +source: + git_url: https://github.com/astroconda/astroconda-iraf-helpers.git +requirements: + run: + - iraf !=2.16.1,>=2.16.UR # conda oddly considers 2.16.1 > 2.16.UR/UR_2.16 + - pyraf + -- cgit From b4046c3cf7e7f8aaa7803d0fbdad89ba9b09b6a1 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Wed, 12 Oct 2016 17:25:59 -0300 Subject: Use renamed astroconda-iraf-helpers. --- iraf-help/meta.yaml | 2 +- iraf.fitsutil/meta.yaml | 4 ++-- iraf.gemini/meta.yaml | 4 ++-- iraf.stecf/meta.yaml | 4 ++-- iraf.stsdas/meta.yaml | 4 ++-- iraf.tables/meta.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/iraf-help/meta.yaml b/iraf-help/meta.yaml index 382284a..b6fad01 100644 --- a/iraf-help/meta.yaml +++ b/iraf-help/meta.yaml @@ -10,7 +10,7 @@ package: version: "2.16.UR" requirements: build: - - astroconda-build-utils # depends on PyRAF, hence why separate + - astroconda-iraf-helpers # depends on PyRAF, hence why separate - iraf !=2.16.1,>=2.16.UR run: - iraf !=2.16.1,>=2.16.UR diff --git a/iraf.fitsutil/meta.yaml b/iraf.fitsutil/meta.yaml index efcee83..b1d2114 100644 --- a/iraf.fitsutil/meta.yaml +++ b/iraf.fitsutil/meta.yaml @@ -5,7 +5,7 @@ about: build: binary_relocation: False number: '0' - # These must be copied from astroconda-build-utils, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, since conda unhelpfully # disallows the post-install step from depending on other packages: always_include_files: - bin/ac_config_iraf_pkg @@ -20,7 +20,7 @@ source: - ac.iraf.fitsutil.patch requirements: build: - - astroconda-build-utils + - astroconda-iraf-helpers - iraf !=2.16.1,>=2.16.UR run: - iraf !=2.16.1,>=2.16.UR diff --git a/iraf.gemini/meta.yaml b/iraf.gemini/meta.yaml index d12ec38..9ae937d 100644 --- a/iraf.gemini/meta.yaml +++ b/iraf.gemini/meta.yaml @@ -6,7 +6,7 @@ about: build: binary_relocation: False number: '0' - # These must be copied from astroconda-build-utils, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, since conda unhelpfully # disallows the post-install step from depending on other packages: always_include_files: - bin/ac_config_iraf_pkg @@ -21,7 +21,7 @@ source: - ac.iraf.gemini.patch requirements: build: - - astroconda-build-utils + - astroconda-iraf-helpers - iraf !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml index d348cad..6c0447f 100644 --- a/iraf.stecf/meta.yaml +++ b/iraf.stecf/meta.yaml @@ -5,7 +5,7 @@ about: build: binary_relocation: False number: '0' - # These must be copied from astroconda-build-utils, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, since conda unhelpfully # disallows the post-install step from depending on other packages: always_include_files: - bin/ac_config_iraf_pkg @@ -18,7 +18,7 @@ source: url: http://astroconda-source:4440/stsci_iraf-3.17-local.tar.gz requirements: build: - - astroconda-build-utils + - astroconda-iraf-helpers - iraf !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml index 530e6ee..fd8d9f0 100644 --- a/iraf.stsdas/meta.yaml +++ b/iraf.stsdas/meta.yaml @@ -5,7 +5,7 @@ about: build: binary_relocation: False number: '0' - # These must be copied from astroconda-build-utils, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, since conda unhelpfully # disallows the post-install step from depending on other packages: always_include_files: - bin/ac_config_iraf_pkg @@ -20,7 +20,7 @@ source: - ac.iraf.stsci.patch requirements: build: - - astroconda-build-utils + - astroconda-iraf-helpers - iraf !=2.16.1,>=2.16.UR - iraf.tables run: diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index 283f6e2..5a5a36b 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -5,7 +5,7 @@ about: build: binary_relocation: False number: '0' - # These must be copied from astroconda-build-utils, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, since conda unhelpfully # disallows the post-install step from depending on other packages: always_include_files: - bin/ac_config_iraf_pkg @@ -20,7 +20,7 @@ source: - ac.iraf.stsci.patch requirements: build: - - astroconda-build-utils + - astroconda-iraf-helpers - iraf !=2.16.1,>=2.16.UR run: - iraf !=2.16.1,>=2.16.UR -- cgit From 21c4ce119913c20c0b31b172b3780ff620baf259 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Wed, 12 Oct 2016 18:05:01 -0300 Subject: Rework x11iraf build slightly, as for iraf, to use new unix/hlib/setup and log the main build output. --- iraf-x11/build.sh | 14 +++++--------- iraf-x11/meta.yaml | 9 +++++---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/iraf-x11/build.sh b/iraf-x11/build.sh index f4dad04..02f6592 100644 --- a/iraf-x11/build.sh +++ b/iraf-x11/build.sh @@ -1,21 +1,17 @@ # Drop extraneous conda-set environment variables -unset CFLAGS -unset CXXFLAGS -unset LDFLAGS +unset ARCH CFLAGS CXXFLAGS LDFLAGS MACOSX_DEPLOYMENT_TARGET # Complement build script -# ("UR_IRAFUSER" MUST BE SET OR BUILD WILL FAIL) -export UR_IRAFUSER=1 export TERM=xterm - -# Copy working directory into PREFIX +# Tell the build script where IRAF is (& it will then set up its environment) export iraf=$PREFIX/iraf/ # Execute build -printenv -./build 32 +printenv > build_log 2>&1 +./build 32 >> build_log 2>&1 +# Copy files into PREFIX mkdir -p $PREFIX/{bin,include,lib,share} ./install.bin $PREFIX ./install.lib $PREFIX diff --git a/iraf-x11/meta.yaml b/iraf-x11/meta.yaml index 024e5c5..4ccf72a 100644 --- a/iraf-x11/meta.yaml +++ b/iraf-x11/meta.yaml @@ -8,11 +8,12 @@ build: number: '0' package: name: iraf-x11 - version: 2.0 + version: "2.0" requirements: build: - - iraf + - iraf !=2.16.1,>=2.16.UR run: - - iraf + - iraf !=2.16.1,>=2.16.UR source: - git_url: /eng/ssb/jhunk/git-repos/x11iraf.git + svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/x11iraf/trunk/ + -- cgit From f78a281784e8d1ab66a32fffdb19d3de50cf5c69 Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Wed, 12 Oct 2016 21:09:35 -0300 Subject: Also update home URL from jehturner to astroconda. --- astroconda-iraf-helpers/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astroconda-iraf-helpers/meta.yaml b/astroconda-iraf-helpers/meta.yaml index e5a4a2b..6cbb845 100644 --- a/astroconda-iraf-helpers/meta.yaml +++ b/astroconda-iraf-helpers/meta.yaml @@ -1,5 +1,5 @@ about: - home: https://github.com/jehturner/astroconda-iraf-helpers + home: https://github.com/astroconda/astroconda-iraf-helpers license: BSD summary: Utilities to help build and install AstroConda packages build: -- cgit