From b3796602986c73b8fc809c9383acd802deea337c Mon Sep 17 00:00:00 2001 From: "James E.H. Turner" Date: Wed, 26 Oct 2016 11:16:03 -0300 Subject: Rename iraf package to iraf-core, in order to make a more complete iraf meta-package. --- astroconda-iraf-helpers/meta.yaml | 2 +- iraf-core/bld.bat | 3 +++ iraf-core/build.sh | 44 +++++++++++++++++++++++++++++++++++++++ iraf-core/meta.yaml | 22 ++++++++++++++++++++ iraf-help/meta.yaml | 4 ++-- iraf-x11/meta.yaml | 4 ++-- iraf.fitsutil/meta.yaml | 5 +++-- iraf.gemini/meta.yaml | 5 +++-- iraf.stecf/meta.yaml | 5 +++-- iraf.stsdas/meta.yaml | 5 +++-- iraf.tables/meta.yaml | 5 +++-- iraf/bld.bat | 3 --- iraf/build.sh | 44 --------------------------------------- iraf/meta.yaml | 22 -------------------- 14 files changed, 89 insertions(+), 84 deletions(-) create mode 100644 iraf-core/bld.bat create mode 100644 iraf-core/build.sh create mode 100644 iraf-core/meta.yaml delete mode 100644 iraf/bld.bat delete mode 100644 iraf/build.sh delete mode 100644 iraf/meta.yaml diff --git a/astroconda-iraf-helpers/meta.yaml b/astroconda-iraf-helpers/meta.yaml index 6cbb845..fb00637 100644 --- a/astroconda-iraf-helpers/meta.yaml +++ b/astroconda-iraf-helpers/meta.yaml @@ -13,6 +13,6 @@ 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 + - iraf-core !=2.16.1,>=2.16.UR # conda considers 2.16.1 > 2.16.UR/UR_2.16 - pyraf diff --git a/iraf-core/bld.bat b/iraf-core/bld.bat new file mode 100644 index 0000000..fa5316a --- /dev/null +++ b/iraf-core/bld.bat @@ -0,0 +1,3 @@ + +echo Not supported on Windows +exit 1 \ No newline at end of file diff --git a/iraf-core/build.sh b/iraf-core/build.sh new file mode 100644 index 0000000..0ce0b6e --- /dev/null +++ b/iraf-core/build.sh @@ -0,0 +1,44 @@ +set -x + +# Drop extraneous conda-set environment variables +unset ARCH CFLAGS CXXFLAGS LDFLAGS MACOSX_DEPLOYMENT_TARGET + +# Complement build script +export TERM=xterm + +# Execute build +printenv +if ! ./build 32; then + echo "The main IRAF build failed" 2>&1 + exit 1 +fi + +echo + +# Install into PREFIX +if ! ./install $PREFIX; then + echo "IRAF installation into $PREFIX failed" 2>&1 + exit 1 +fi + +# "Register" the IRAF environment setup with conda activate: +mkdir -p $PREFIX/etc/conda/{activate.d,deactivate.d} + +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 ' +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 + diff --git a/iraf-core/meta.yaml b/iraf-core/meta.yaml new file mode 100644 index 0000000..f74b1b4 --- /dev/null +++ b/iraf-core/meta.yaml @@ -0,0 +1,22 @@ +about: + home: http://iraf.noao.edu + license: MIT (and third-party licenses) + summary: NOAO Image Reduction and Analysis Facility +build: + binary_relocation: False # [osx] + detect_binary_files_with_prefix: False + # (if binary relocation is problematic, add "ignore_prefix_files" below) + rpaths: + - lib32/ + number: '0' +package: + name: iraf-core + version: 2.16.UR +requirements: + build: + - iraf-os-libs # [linux] + run: + - iraf-os-libs # [linux] +source: + svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/trunk + diff --git a/iraf-help/meta.yaml b/iraf-help/meta.yaml index b6fad01..2844006 100644 --- a/iraf-help/meta.yaml +++ b/iraf-help/meta.yaml @@ -11,6 +11,6 @@ package: requirements: build: - astroconda-iraf-helpers # depends on PyRAF, hence why separate - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR diff --git a/iraf-x11/meta.yaml b/iraf-x11/meta.yaml index f6adbe4..8fdd259 100644 --- a/iraf-x11/meta.yaml +++ b/iraf-x11/meta.yaml @@ -14,10 +14,10 @@ package: requirements: build: - iraf-os-libs # [linux] - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - iraf-os-libs # [linux] - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR source: svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/x11iraf/trunk/ diff --git a/iraf.fitsutil/meta.yaml b/iraf.fitsutil/meta.yaml index b1d2114..8a38dae 100644 --- a/iraf.fitsutil/meta.yaml +++ b/iraf.fitsutil/meta.yaml @@ -21,7 +21,8 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR diff --git a/iraf.gemini/meta.yaml b/iraf.gemini/meta.yaml index 9ae937d..92cd9e0 100644 --- a/iraf.gemini/meta.yaml +++ b/iraf.gemini/meta.yaml @@ -22,12 +22,13 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas - iraf.fitsutil run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas - iraf.fitsutil diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml index 6c0447f..7dbfcd1 100644 --- a/iraf.stecf/meta.yaml +++ b/iraf.stecf/meta.yaml @@ -19,11 +19,12 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml index fd8d9f0..e7ba0c6 100644 --- a/iraf.stsdas/meta.yaml +++ b/iraf.stsdas/meta.yaml @@ -21,9 +21,10 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR - iraf.tables run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR - iraf.tables diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index 5a5a36b..6b89fc4 100644 --- a/iraf.tables/meta.yaml +++ b/iraf.tables/meta.yaml @@ -21,7 +21,8 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR run: - - iraf !=2.16.1,>=2.16.UR + - iraf-core !=2.16.1,>=2.16.UR + - iraf-help !=2.16.1,>=2.16.UR diff --git a/iraf/bld.bat b/iraf/bld.bat deleted file mode 100644 index fa5316a..0000000 --- a/iraf/bld.bat +++ /dev/null @@ -1,3 +0,0 @@ - -echo Not supported on Windows -exit 1 \ No newline at end of file diff --git a/iraf/build.sh b/iraf/build.sh deleted file mode 100644 index 0ce0b6e..0000000 --- a/iraf/build.sh +++ /dev/null @@ -1,44 +0,0 @@ -set -x - -# Drop extraneous conda-set environment variables -unset ARCH CFLAGS CXXFLAGS LDFLAGS MACOSX_DEPLOYMENT_TARGET - -# Complement build script -export TERM=xterm - -# Execute build -printenv -if ! ./build 32; then - echo "The main IRAF build failed" 2>&1 - exit 1 -fi - -echo - -# Install into PREFIX -if ! ./install $PREFIX; then - echo "IRAF installation into $PREFIX failed" 2>&1 - exit 1 -fi - -# "Register" the IRAF environment setup with conda activate: -mkdir -p $PREFIX/etc/conda/{activate.d,deactivate.d} - -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 ' -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 - diff --git a/iraf/meta.yaml b/iraf/meta.yaml deleted file mode 100644 index f3628f3..0000000 --- a/iraf/meta.yaml +++ /dev/null @@ -1,22 +0,0 @@ -about: - home: http://iraf.noao.edu - license: MIT (and third-party licenses) - summary: NOAO Image Reduction and Analysis Facility -build: - binary_relocation: False # [osx] - detect_binary_files_with_prefix: False - # (if binary relocation is problematic, add "ignore_prefix_files" below) - rpaths: - - lib32/ - number: '0' -package: - name: iraf - version: 2.16.UR -requirements: - build: - - iraf-os-libs # [linux] - run: - - iraf-os-libs # [linux] -source: - svn_url: https://aeon.stsci.edu/ssb/svn/u-rel/iraf-2.16/trunk - -- cgit