Changeset 1305 for trunk

Timestamp:

11/29/06 12:02:15 (18 years ago)

Author:

mar637

Message:

merge from asap2.1.1 release tag

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• SConstruct (modified) (1 diff)
• doc/CHANGELOG (modified) (2 diffs)
• python/__init__.py (modified) (1 diff)
• src/STWriter.cpp (modified) (1 diff)
• web/index.html (modified) (2 diffs)

trunk/Makefile

@@ -1 @@
-PREFIX := /Library/Frameworks/Python.framework/Versions/2.4
-PYDIR := $(PREFIX)/lib/python2.4/site-packages
-
 ifndef ASAPROOT
    ASAPROOT := $(shell pwd)
 endif
 
+PREFIX := /Library/Frameworks/Python.framework/Versions/2.4
+PYDIR := $(PREFIX)/lib/python2.4/site-packages
+
+
 PY := $(wildcard python/*.py)
-LIBS := /tmp/_asap.so
+LIBS := src/_asap.so
 BINS := bin/asap
 

trunk/SConstruct

@@ -79 +79 @@
     env = conf.Finish()
 
-env["version"] = "2.1.1b"
+env["version"] = "2.1.1"
 
 # general CPPFLAGS

trunk/doc/CHANGELOG

@@ -2 +2 @@
 =========
 
-Minor Release 2.1.1 []
+Minor Release 2.1.1 [2006-11-09]
 
 * fix for Ticket #88 - numpy masks
@@ -9 +9 @@
 * ticket #64 - speed up of auto_poly_baseline
 * fix for ticket #89 - export of IF sub-selections
+* fix for Ticket #83 - export to ms2 crashed asap
+* added file suffix support for name.rpf.1 etc.
 
 Release Version 2.1.0 [2006-09-11]

trunk/python/__init__.py

@@ -358 +358 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.1.1b'
+__version__  = '2.1.1'
 
 def is_ipython():

trunk/src/STWriter.cpp

@@ -124 +124 @@
   Vector<Bool> havexpol(nIF);
   nPol = 0;nChan = 0; havexpol = False;
-  for (int i=0;i<ifs.size();++i) {
+  for (uint i=0;i<ifs.size();++i) {
     nPol(ifs[i]) = in->npol();
     nChan(ifs[i]) = in->nchan(ifs[i]);

trunk/web/index.html

@@ -71 +71 @@
 <b class="asap">ASAP</b> project tracking page</a>. Please also check if the defect has already been submitted under
 <a href="http://sourcecode.atnf.csiro.au/cgi-bin/trac_asap.cgi/report/1">current tickets</a>.
-
+If the trac system tells you that your submission has been considered spam, please log in with the username "bugs" and password "mops".
 
 <h2>Documentation</h2>
@@ -118 +118 @@
   <li><b class="asap">ASAP</b> source code is available through our subversion repository
     <pre>
-        svn co http://sourcecode.atnf.csiro.au/repos/asap/tags/Release2.1.1 asap2.1.1
+        svn co http://sourcecode.atnf.csiro.au/repos/asap/tags/asap2.1.1
     </pre>
   </li>