From 2bf58ad2e6d7c8cd96cc781d9dd9bdc0fa9fa85a Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 6 Dec 2016 13:14:50 -0300 Subject: Rename iraf-core back to iraf after eliminating need for a separate help pkg. --- astroconda-iraf-helpers/meta.yaml | 3 ++- iraf-all/meta.yaml | 6 ++++-- 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 | 4 ++-- iraf.gemini/meta.yaml | 4 ++-- iraf.stecf/meta.yaml | 2 +- iraf.stsdas/meta.yaml | 4 ++-- iraf.tables/meta.yaml | 4 ++-- iraf/bld.bat | 3 +++ iraf/build.sh | 44 +++++++++++++++++++++++++++++++++++++++ iraf/meta.yaml | 22 ++++++++++++++++++++ 15 files changed, 88 insertions(+), 85 deletions(-) delete mode 100644 iraf-core/bld.bat delete mode 100644 iraf-core/build.sh delete mode 100644 iraf-core/meta.yaml create mode 100644 iraf/bld.bat create mode 100644 iraf/build.sh create mode 100644 iraf/meta.yaml diff --git a/astroconda-iraf-helpers/meta.yaml b/astroconda-iraf-helpers/meta.yaml index b1f4c8e..aa143da 100644 --- a/astroconda-iraf-helpers/meta.yaml +++ b/astroconda-iraf-helpers/meta.yaml @@ -13,7 +13,8 @@ source: git_url: https://github.com/astroconda/astroconda-iraf-helpers.git requirements: run: - - iraf-core !=2.16.1,>=2.16.UR # conda considers 2.16.1 > 2.16.UR/UR_2.16 + - iraf !=2.16.1,>=2.16.UR # conda considers 2.16.1 > 2.16.UR/UR_2.16 + # PyRAF is needed by scripts/make_iraf_help, but we're trying to replace # that with $iraf/make_help, so these are commented out to avoid pulling in # masses of unnecessary Python build dependencies for every IRAF package: diff --git a/iraf-all/meta.yaml b/iraf-all/meta.yaml index c02a1db..b79c8a8 100644 --- a/iraf-all/meta.yaml +++ b/iraf-all/meta.yaml @@ -14,7 +14,8 @@ requirements: # builds correctly -- the packages are listed in their build order here, # in the hope of circumventing that problem). build: - - iraf !=2.16.1,>=2.16.UR # (meta package including X11IRAF) + - iraf !=2.16.1,>=2.16.UR + - iraf-x11 >=2.0 - iraf.fitsutil - iraf.tables - iraf.stsdas @@ -23,7 +24,8 @@ requirements: # For public use, these need to be floating version numbers, to allow # updating constituent packages easily: run: - - iraf !=2.16.1,>=2.16.UR # (meta package including X11IRAF) + - iraf !=2.16.1,>=2.16.UR + - iraf-x11 >=2.0 - iraf.fitsutil - iraf.tables - iraf.stsdas diff --git a/iraf-core/bld.bat b/iraf-core/bld.bat deleted file mode 100644 index fa5316a..0000000 --- a/iraf-core/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-core/build.sh b/iraf-core/build.sh deleted file mode 100644 index 0ce0b6e..0000000 --- a/iraf-core/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-core/meta.yaml b/iraf-core/meta.yaml deleted file mode 100644 index 00a4bdd..0000000 --- a/iraf-core/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 (excluding help) -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 2844006..b6fad01 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-core !=2.16.1,>=2.16.UR + - iraf !=2.16.1,>=2.16.UR run: - - iraf-core !=2.16.1,>=2.16.UR + - iraf !=2.16.1,>=2.16.UR diff --git a/iraf-x11/meta.yaml b/iraf-x11/meta.yaml index 8fdd259..f6adbe4 100644 --- a/iraf-x11/meta.yaml +++ b/iraf-x11/meta.yaml @@ -14,10 +14,10 @@ package: requirements: build: - iraf-os-libs # [linux] - - iraf-core !=2.16.1,>=2.16.UR + - iraf !=2.16.1,>=2.16.UR run: - iraf-os-libs # [linux] - - iraf-core !=2.16.1,>=2.16.UR + - iraf !=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 0a41417..59b0eea 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-iraf-helpers, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, as 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: requirements: build: - astroconda-iraf-helpers - - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) + - iraf !=2.16.1,>=2.16.UR run: - iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version) diff --git a/iraf.gemini/meta.yaml b/iraf.gemini/meta.yaml index 347d798..f3e2df1 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-iraf-helpers, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, as conda unhelpfully # disallows the post-install step from depending on other packages: always_include_files: - bin/ac_config_iraf_pkg @@ -22,7 +22,7 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) + - iraf !=2.16.1,>=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) - iraf.tables - iraf.stsdas - iraf.fitsutil diff --git a/iraf.stecf/meta.yaml b/iraf.stecf/meta.yaml index 5a7f672..aecf9bf 100644 --- a/iraf.stecf/meta.yaml +++ b/iraf.stecf/meta.yaml @@ -19,7 +19,7 @@ source: requirements: build: - astroconda-iraf-helpers - - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) + - iraf !=2.16.1,>=2.16.UR - iraf.tables - iraf.stsdas run: diff --git a/iraf.stsdas/meta.yaml b/iraf.stsdas/meta.yaml index ae78994..fd2127d 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-iraf-helpers, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, as 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: requirements: build: - astroconda-iraf-helpers - - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) + - iraf !=2.16.1,>=2.16.UR - iraf.tables run: - iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version) diff --git a/iraf.tables/meta.yaml b/iraf.tables/meta.yaml index f522110..599f19e 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-iraf-helpers, since conda unhelpfully + # These must be copied from astroconda-iraf-helpers, as 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: requirements: build: - astroconda-iraf-helpers - - iraf-core >=2.16.UR # (build shouldn't depend on PyRAF or X11IRAF) + - iraf !=2.16.1,>=2.16.UR run: - iraf !=2.16.1,>=2.16.UR # (must ensure correct run-time "iraf" version) 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..0ce0b6e --- /dev/null +++ b/iraf/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/meta.yaml b/iraf/meta.yaml new file mode 100644 index 0000000..83dd666 --- /dev/null +++ b/iraf/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 + 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