From 57b060589ecdeb4e4bcd82e0cc456d1484c908b4 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
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

(limited to 'iraf-x11')

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 21c4ce119913c20c0b31b172b3780ff620baf259 Mon Sep 17 00:00:00 2001
From: "James E.H. Turner" <jturner@gemini.edu>
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(-)

(limited to 'iraf-x11')

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