Changeset 1210 for trunk

Timestamp:

08/29/06 16:16:15 (19 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

Location:

trunk

Files:

• bin/asap (modified) (1 diff)
• bin/install (modified) (2 diffs)
• external/casa_asap/README (copied) (copied from tags/Release2.1.0b/external/casa_asap/README )
• external/casa_asap/build.sh (modified) (1 diff)
• external/casa_asap/configure.sh (copied) (copied from tags/Release2.1.0b/external/casa_asap/configure.sh )
• external/casa_asap/install.sh (deleted)

trunk/bin/asap

@@ -32 +32 @@
 [ -x /usr/bin/clear ] && /usr/bin/clear
 
+# do not remove this line it gets replaced on install with custom moduledir
+# **PYTHONPATH**
+
 echo "Loading ASAP..."
 

trunk/bin/install

@@ -45 +45 @@
 execprefix = dist.EXEC_PREFIX
 moduledir = dist.get_python_lib()
+sysmoduledir = moduledir
 for k, v in opts:
     if k in ("-h", "--help"):
@@ -118 +119 @@
     shutil.copytree("asap", moddir)
     print "Installing asap  scripts in %s" % bindir
-    shutil.copy2("bin/asap", bindir)
+    if moduledir != sysmoduledir:
+        import sre
+        print "Changing asap startup script to use custom PYTHONPATH"
+        inf = file("bin/asap")
+        outf = file(os.path.join(bindir,"asap"), "w")
+        outline = "export PYTHONPATH=%s" % moduledir
+        regx = sre.compile("\*\*PYTHONPATH\*\*")
+        for line in inf.readlines():
+            if regx.search(line):
+                line = outline
+            outf.write(line)
+        outf.close()
+        os.chmod(os.path.join(bindir,"asap"), 0755)
+    else:
+        shutil.copy2("bin/asap", bindir)
     shutil.copy2("bin/asap_update_data", bindir)
     if not os.path.exists("asap/data/ephemerides"):

trunk/external/casa_asap/build.sh

@@ -1 +1 @@
 #!/bin/sh
 
+ROOTDIR=`pwd`
 . aipsinit.sh