Ignore:
Timestamp:
04/01/11 16:20:19 (14 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/casa-prerelease/pre-asap

    • Property svn:mergeinfo changed
      /trunkmerged: 2090
  • branches/casa-prerelease/pre-asap/python

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

    r1859 r2091  
    7575        return ' unknown '
    7676    casapath=os.environ["CASAPATH"].split()
    77     if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/2.5/asap'):
     77    versioninfo = sys.version_info
     78    pyversion = '%s.%s'%(versioninfo[0],versioninfo[1])
     79    if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/%s/asap'%(pyversion)):
    7880        # for casa developer environment (linux or darwin)
    79         revinfo=casapath[0]+'/'+casapath[1]+'/python/2.5/asap/svninfo.txt'
     81        revinfo=casapath[0]+'/'+casapath[1]+'/python/%s/asap/svninfo.txt'%(pyversion)
    8082    else:
    8183        # for end-user environments
     
    8385            revinfo=casapath[0]+'/Resources/python/asap/svninfo.txt'
    8486        else:
    85             revinfo=casapath[0]+'/lib/python2.5/asap/svninfo.txt'
     87            revinfo=casapath[0]+'/lib/python%s/asap/svninfo.txt'%(pyversion)
    8688    if os.path.isfile(revinfo):
    8789        f = file(revinfo)
Note: See TracChangeset for help on using the changeset viewer.