aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Turner <jturner@gemini.edu>2016-12-12 14:41:12 -0500
committerJames Turner <jturner@gemini.edu>2016-12-12 14:41:12 -0500
commitdeeb280f2673626d0ca8147bb8b6d80f6b82df87 (patch)
treee27f8305bf58b1cae79bff884fb6dc9932fb5703
parent9c7215cd2e0db4b934c9da1e4a2ad49695620b98 (diff)
downloadastroconda-iraf-deeb280f2673626d0ca8147bb8b6d80f6b82df87.tar.gz
Add RVSAO, SONG & SQIID IRAF packages (with small patches to fix things that were also broken in Ureka). The SONG package is missing a dependency that isn't in Ureka or AstroConda and lives in the "obsolete" directory on the IRAF FTP site.
-rw-r--r--iraf.rvsao/ac.iraf.rvsao.patch5
-rw-r--r--iraf.rvsao/bld.bat2
-rw-r--r--iraf.rvsao/build.sh8
-rw-r--r--iraf.rvsao/meta.yaml27
-rw-r--r--iraf.rvsao/post-link.sh3
-rw-r--r--iraf.rvsao/pre-unlink.sh1
-rw-r--r--iraf.rvsao/ur_extern.pkg6
-rw-r--r--iraf.rvsao/ur_manifest2
-rw-r--r--iraf.rvsao/ur_mkpkg_cmd11
-rw-r--r--iraf.rvsao/ur_mkpkg_patterns1
-rw-r--r--iraf.song/bld.bat2
-rw-r--r--iraf.song/build.sh8
-rw-r--r--iraf.song/meta.yaml26
-rw-r--r--iraf.song/post-link.sh3
-rw-r--r--iraf.song/pre-unlink.sh1
-rw-r--r--iraf.song/ur_extern.pkg6
-rw-r--r--iraf.song/ur_mkpkg_cmd1
-rw-r--r--iraf.song/ur_mkpkg_patterns1
-rw-r--r--iraf.sqiid/ac.iraf.sqiid.patch21
-rw-r--r--iraf.sqiid/bld.bat2
-rw-r--r--iraf.sqiid/build.sh8
-rw-r--r--iraf.sqiid/meta.yaml27
-rw-r--r--iraf.sqiid/post-link.sh3
-rw-r--r--iraf.sqiid/pre-unlink.sh1
-rw-r--r--iraf.sqiid/ur_extern.pkg5
-rw-r--r--iraf.sqiid/ur_mkhelp_cmd1
-rw-r--r--iraf.sqiid/ur_mkpkg_cmd1
-rw-r--r--iraf.sqiid/ur_mkpkg_patterns1
28 files changed, 184 insertions, 0 deletions
diff --git a/iraf.rvsao/ac.iraf.rvsao.patch b/iraf.rvsao/ac.iraf.rvsao.patch
new file mode 100644
index 0000000..bcd5309
--- /dev/null
+++ b/iraf.rvsao/ac.iraf.rvsao.patch
@@ -0,0 +1,5 @@
+diff -Nur ../original/numrec_list.txt ./numrec_list.txt
+--- ../original/numrec_list.txt 1969-12-31 21:00:00.000000000 -0300
++++ ./numrec_list.txt 2016-05-03 13:32:08.000000000 -0300
+@@ -0,0 +1 @@
++Util/fourm.x
diff --git a/iraf.rvsao/bld.bat b/iraf.rvsao/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.rvsao/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.rvsao/build.sh b/iraf.rvsao/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.rvsao/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.rvsao/meta.yaml b/iraf.rvsao/meta.yaml
new file mode 100644
index 0000000..eb1b68e
--- /dev/null
+++ b/iraf.rvsao/meta.yaml
@@ -0,0 +1,27 @@
+about:
+ home: http://iraf.noao.edu/
+ license: SAO permissive license, Numerical Recipes
+ summary: RVSAO package for IRAF
+build:
+ binary_relocation: False
+ number: '0'
+ # These must be copied from astroconda-iraf-helpers, since conda 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.rvsao
+ version: "2.7.8"
+source:
+ fn: rvsao-src-2.7.8-ur.tar.gz
+ url: http://astroconda-source:4440/rvsao-src-2.7.8-ur.tar.gz
+ patches:
+ - ac.iraf.rvsao.patch
+requirements:
+ build:
+ - astroconda-iraf-helpers
+ - iraf !=2.16.1,>=2.16.UR
+ run:
+ - iraf !=2.16.1,>=2.16.UR
+
diff --git a/iraf.rvsao/post-link.sh b/iraf.rvsao/post-link.sh
new file mode 100644
index 0000000..db04f34
--- /dev/null
+++ b/iraf.rvsao/post-link.sh
@@ -0,0 +1,3 @@
+# Call a common script that updates extern.pkg for the new IRAF package:
+
+"$PREFIX/bin/ac_config_iraf_pkg" rvsao
diff --git a/iraf.rvsao/pre-unlink.sh b/iraf.rvsao/pre-unlink.sh
new file mode 100644
index 0000000..44a6486
--- /dev/null
+++ b/iraf.rvsao/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove rvsao
diff --git a/iraf.rvsao/ur_extern.pkg b/iraf.rvsao/ur_extern.pkg
new file mode 100644
index 0000000..8b8687c
--- /dev/null
+++ b/iraf.rvsao/ur_extern.pkg
@@ -0,0 +1,6 @@
+# ftp://iraf.noao.edu/iraf/v215/REPO
+reset rvsao = UR_VDIR
+task rvsao.pkg = rvsao$rvsao.cl
+reset helpdb= ( envget("helpdb") + ",rvsao$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",rvsao$lib/apropos.db" )
+
diff --git a/iraf.rvsao/ur_manifest b/iraf.rvsao/ur_manifest
new file mode 100644
index 0000000..2211764
--- /dev/null
+++ b/iraf.rvsao/ur_manifest
@@ -0,0 +1,2 @@
+bin/librv.a
+bin/x_rvsao.e
diff --git a/iraf.rvsao/ur_mkpkg_cmd b/iraf.rvsao/ur_mkpkg_cmd
new file mode 100644
index 0000000..a9ec0fc
--- /dev/null
+++ b/iraf.rvsao/ur_mkpkg_cmd
@@ -0,0 +1,11 @@
+# The original rvsao tarball had problems on OSX because it contains a
+# name that is duplicated on non-case-sensitive filesystems, namely a
+# symbolic link "templates -> Templates/". For the UR, the tarball has been
+# re-generated with the symbolic link removed and the directory renamed
+# to "templates" (grep shows that the capitalized name isn't used anywhere).
+
+# Delete a dangling symbolic link that causes conda-build great offence:
+rm -f Util/Old/shdr.h
+
+# cd rvsao # Pre-2.15
+mkpkg update
diff --git a/iraf.rvsao/ur_mkpkg_patterns b/iraf.rvsao/ur_mkpkg_patterns
new file mode 100644
index 0000000..44f2ef7
--- /dev/null
+++ b/iraf.rvsao/ur_mkpkg_patterns
@@ -0,0 +1 @@
+^!mkpkg -p noao nrelink
diff --git a/iraf.song/bld.bat b/iraf.song/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.song/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.song/build.sh b/iraf.song/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.song/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.song/meta.yaml b/iraf.song/meta.yaml
new file mode 100644
index 0000000..4a396f9
--- /dev/null
+++ b/iraf.song/meta.yaml
@@ -0,0 +1,26 @@
+about:
+ home: http://iraf.noao.edu/
+ license: IRAF MIT/X11 variant
+ summary: SONG package for IRAF
+build:
+ binary_relocation: False
+ number: '0'
+ # These must be copied from astroconda-iraf-helpers, since conda 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.song
+ version: "2013_01_02"
+source:
+ fn: song-universal-2013-01-02.tar.gz
+ url: http://astroconda-source:4440/song-universal-2013-01-02.tar.gz
+requirements:
+ build:
+ - astroconda-iraf-helpers
+ - iraf !=2.16.1,>=2.16.UR
+ run:
+ - iraf !=2.16.1,>=2.16.UR
+ - iraf.rvx # required but currently doesn't exist in AstroConda!
+
diff --git a/iraf.song/post-link.sh b/iraf.song/post-link.sh
new file mode 100644
index 0000000..14e56cf
--- /dev/null
+++ b/iraf.song/post-link.sh
@@ -0,0 +1,3 @@
+# Call a common script that updates extern.pkg for the new IRAF package:
+
+"$PREFIX/bin/ac_config_iraf_pkg" song
diff --git a/iraf.song/pre-unlink.sh b/iraf.song/pre-unlink.sh
new file mode 100644
index 0000000..5499b92
--- /dev/null
+++ b/iraf.song/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove song
diff --git a/iraf.song/ur_extern.pkg b/iraf.song/ur_extern.pkg
new file mode 100644
index 0000000..a3aaafc
--- /dev/null
+++ b/iraf.song/ur_extern.pkg
@@ -0,0 +1,6 @@
+# ftp://iraf.noao.edu/iraf/v216/REPO
+reset song = UR_VDIR
+task song.pkg = song$song.cl
+reset helpdb= ( envget("helpdb") + ",song$lib/helpdb.mip" )
+reset aproposdb= ( envget("aproposdb") + ",song$lib/apropos.db" )
+
diff --git a/iraf.song/ur_mkpkg_cmd b/iraf.song/ur_mkpkg_cmd
new file mode 100644
index 0000000..24d2743
--- /dev/null
+++ b/iraf.song/ur_mkpkg_cmd
@@ -0,0 +1 @@
+echo "Nothing to do!"
diff --git a/iraf.song/ur_mkpkg_patterns b/iraf.song/ur_mkpkg_patterns
new file mode 100644
index 0000000..ecbb459
--- /dev/null
+++ b/iraf.song/ur_mkpkg_patterns
@@ -0,0 +1 @@
+^Nothing to do*
diff --git a/iraf.sqiid/ac.iraf.sqiid.patch b/iraf.sqiid/ac.iraf.sqiid.patch
new file mode 100644
index 0000000..dd6f047
--- /dev/null
+++ b/iraf.sqiid/ac.iraf.sqiid.patch
@@ -0,0 +1,21 @@
+diff -Nur ../original/sqiid.cl ./sqiid.cl
+--- ../original/sqiid.cl 1993-10-05 16:54:44.000000000 -0400
++++ ./sqiid.cl 2016-12-12 15:53:27.849154000 -0300
+@@ -15,7 +15,8 @@
+ # local
+
+ # change sqiiddir to point to SQIID directory in target system
+-set sqiiddir = "/u2/merrill/myprog/sqiid/"
++# set sqiiddir = "/u2/merrill/myprog/sqiid/"
++set sqiiddir = "sqiid$"
+ #set sqiiddir = "home$myprog/sqiid/"
+
+ package sqiid
+diff -Nur ../original/sqiid.par ./sqiid.par
+--- ../original/sqiid.par 1969-12-31 21:00:00.000000000 -0300
++++ ./sqiid.par 2016-12-12 16:30:29.824488000 -0300
+@@ -0,0 +1,4 @@
++# Dummy SQIID package parameter file.
++
++version,s,h,"June 16, 1994 UR"
++
diff --git a/iraf.sqiid/bld.bat b/iraf.sqiid/bld.bat
new file mode 100644
index 0000000..e1aca7a
--- /dev/null
+++ b/iraf.sqiid/bld.bat
@@ -0,0 +1,2 @@
+echo Not supported on Windows
+exit 1
diff --git a/iraf.sqiid/build.sh b/iraf.sqiid/build.sh
new file mode 100644
index 0000000..2353907
--- /dev/null
+++ b/iraf.sqiid/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.sqiid/meta.yaml b/iraf.sqiid/meta.yaml
new file mode 100644
index 0000000..fd1a8dd
--- /dev/null
+++ b/iraf.sqiid/meta.yaml
@@ -0,0 +1,27 @@
+about:
+ home: http://iraf.noao.edu/
+ license: IRAF MIT/X11 variant
+ summary: SQIID package for IRAF
+build:
+ binary_relocation: False
+ number: '0'
+ # These must be copied from astroconda-iraf-helpers, since conda 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.sqiid
+ version: "2013_01_02"
+source:
+ fn: sqiid-universal-2013-01-02.tar.gz
+ url: http://astroconda-source:4440/sqiid-universal-2013-01-02.tar.gz
+ patches:
+ - ac.iraf.sqiid.patch
+requirements:
+ build:
+ - astroconda-iraf-helpers
+ - iraf !=2.16.1,>=2.16.UR
+ run:
+ - iraf !=2.16.1,>=2.16.UR
+
diff --git a/iraf.sqiid/post-link.sh b/iraf.sqiid/post-link.sh
new file mode 100644
index 0000000..5461791
--- /dev/null
+++ b/iraf.sqiid/post-link.sh
@@ -0,0 +1,3 @@
+# Call a common script that updates extern.pkg for the new IRAF package:
+
+"$PREFIX/bin/ac_config_iraf_pkg" sqiid
diff --git a/iraf.sqiid/pre-unlink.sh b/iraf.sqiid/pre-unlink.sh
new file mode 100644
index 0000000..a8cf8cd
--- /dev/null
+++ b/iraf.sqiid/pre-unlink.sh
@@ -0,0 +1 @@
+"$PREFIX/bin/ac_config_iraf_pkg" --remove sqiid
diff --git a/iraf.sqiid/ur_extern.pkg b/iraf.sqiid/ur_extern.pkg
new file mode 100644
index 0000000..58fcd99
--- /dev/null
+++ b/iraf.sqiid/ur_extern.pkg
@@ -0,0 +1,5 @@
+# ftp://iraf.noao.edu/iraf/v216/REPO
+reset sqiid = UR_VDIR
+task sqiid.pkg = sqiid$sqiid.cl
+# sqiid contains ho help
+
diff --git a/iraf.sqiid/ur_mkhelp_cmd b/iraf.sqiid/ur_mkhelp_cmd
new file mode 100644
index 0000000..23cdd8b
--- /dev/null
+++ b/iraf.sqiid/ur_mkhelp_cmd
@@ -0,0 +1 @@
+echo "No help to build for squiid"
diff --git a/iraf.sqiid/ur_mkpkg_cmd b/iraf.sqiid/ur_mkpkg_cmd
new file mode 100644
index 0000000..24d2743
--- /dev/null
+++ b/iraf.sqiid/ur_mkpkg_cmd
@@ -0,0 +1 @@
+echo "Nothing to do!"
diff --git a/iraf.sqiid/ur_mkpkg_patterns b/iraf.sqiid/ur_mkpkg_patterns
new file mode 100644
index 0000000..ecbb459
--- /dev/null
+++ b/iraf.sqiid/ur_mkpkg_patterns
@@ -0,0 +1 @@
+^Nothing to do*