Fix conflict

1 files changed, 39 insertions, 0 deletions

diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini
new file mode 100644
index 0000000..a6d1232
--- /dev/null
+++ b/hstcal/hstcal.ini
@@ -0,0 +1,39 @@
+[package]
+name : hstcal
+version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
+
+[about]
+home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git
+license : BSD
+summary : ${package:name}
+
+[source]
+#fn : ${package:name}-${package:version}.tar.gz
+#url : ${about:home}/${fn}
+git_url : ${about:home}
+#git_tag : 
+
+[build]
+number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+
+[requirements]
+build : 
+    gcc >=4.6 [osx]
+run : 
+    #
+
+[test]
+imports : 
+	
+commands : 
+	
+
+[cbc_build]
+linux : 
+    ./configure --destdir=$$PREFIX
+    make
+    ./waf install
+
+windows : 
+    echo Not yet.
+    exit 1