Changeset 2091

Timestamp:

04/01/11 16:20:19 (15 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: build asap from scratch and execute asap_init()

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Merge changes in trunk (r2090).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• cmake/exec_getsvnrev.sh (modified) (1 diff)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/env.py (modified) (2 diffs)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/cmake/exec_getsvnrev.sh

@@ -6 +6 @@
 fi
 
-pushd ${DIR}
+cd ${DIR}
 ${DIR}/getsvnrev.sh
-pushd

branches/casa-prerelease/pre-asap/python/env.py

@@ -75 +75 @@
         return ' unknown '
     casapath=os.environ["CASAPATH"].split()
-    if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/2.5/asap'):
+    versioninfo = sys.version_info
+    pyversion = '%s.%s'%(versioninfo[0],versioninfo[1])
+    if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/%s/asap'%(pyversion)):
         # for casa developer environment (linux or darwin)
-        revinfo=casapath[0]+'/'+casapath[1]+'/python/2.5/asap/svninfo.txt'
+        revinfo=casapath[0]+'/'+casapath[1]+'/python/%s/asap/svninfo.txt'%(pyversion)
     else:
         # for end-user environments
@@ -83 +85 @@
             revinfo=casapath[0]+'/Resources/python/asap/svninfo.txt'
         else:
-            revinfo=casapath[0]+'/lib/python2.5/asap/svninfo.txt'
+            revinfo=casapath[0]+'/lib/python%s/asap/svninfo.txt'%(pyversion)
     if os.path.isfile(revinfo):
         f = file(revinfo)