Changeset 1757 for branches/alma/bin

Timestamp:

06/09/10 19:03:06 (15 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• bin/asap (modified) (1 diff)
• bin/install (modified) (4 diffs)

branches/alma/bin/asap

@@ -51 +51 @@
     fi
     # now execute ipython using the profile
-    $ip -ipythondir "${HOME}/.asap" -p 'asap' $*
+    $ip -ipythondir "${HOME}/.asap" $*
 fi

branches/alma/bin/install

@@ -18 +18 @@
     lddopts = ""
     if (sys.platform == "darwin"):
-        lddcommand = "otool"
+        lddcommand = "/usr/bin/otool"
         lddopts = "-L"
     if not os.path.isfile(lddcommand):
@@ -27 +27 @@
     resolved = []
     unresolved = []
-    for l in p.readlines():
-        lsp = l.split()
-        # test this to avoid fails on linux_gate, which has no library
-        if len(lsp) >= 3:
-            if lsp[2] == "not":
-                unresolved.append(lsp[0])
+    if sys.platform == "linux2":
+        for l in p.readlines():
+            lsp = l.split()
+            # test this to avoid fails on linux_gate, which has no library
+            if len(lsp) >= 3:
+                if lsp[2] == "not":
+                    unresolved.append(lsp[0])
+                else:
+                    resolved.append(lsp[2])
+    elif sys.platform == "darwin":
+        for l in p.readlines():
+            l = l.strip()
+            if l.endswith(":"):
+                continue
+            l = l.split()[0]
+            if not os.path.exists(l):
+                unresolved.append(l)
             else:
-                resolved.append(lsp[2])
+                resolved.append(l)
     return resolved, unresolved
+
 
 try:
@@ -122 +134 @@
     print "Installing asap  scripts in %s" % bindir
     if moduledir != sysmoduledir:
-        import sre
+        import re
         print "Changing asap startup script to use custom PYTHONPATH"
         inf = file("bin/asap")
@@ -137 +149 @@
         shutil.copy2("bin/asap", bindir)
     shutil.copy2("bin/asap_update_data", bindir)
+    shutil.copy2("bin/asap2to3", bindir)
     if not os.path.exists("asap/data/ephemerides"):
         print "Warning - no data directory present"