Changeset 3056

Timestamp:

10/29/15 14:44:08 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: new methods, get_rev_info_file, get_asap_revdate, to support git

Test Programs:

Put in Release Notes: No

Module(s):

Description: committing changes for git from Ville.

Location:

trunk

Files:

• getgitrev.sh (modified) (1 diff)
• python/__init__.py (modified) (1 diff)
• python/env.py (modified) (5 diffs)

trunk/getgitrev.sh

@@ -9 +9 @@
 date "+%b %d %Y, %H:%M:%S" >> $OUT
 
-# Replace svn $date$ witg current date in __init__.py
-dat=`date`
-INITPY=python/__init__.py
-sed s/\\\'\\\$Date\\\$\\\'\\\.split\(\)\\\[1\\\]/replacethisstring/g $INITPY > tmpinit.txt
-sed "s/replacethisstring/\"$dat\"/g"  tmpinit.txt > tmpinitmodified.txt
-mv tmpinitmodified.txt $INITPY
-exit 0

trunk/python/__init__.py

@@ -59 +59 @@
 from _asap import srctype
 
-__date__ = '$Date$'.split()[1]
+__date__ = get_asap_revdate()
 __version__  = '4.3.0a'
 __revision__ = get_revision()

trunk/python/env.py

@@ -2 +2 @@
 """
 __all__ = ["is_casapy", "is_ipython", "setup_env", "get_revision",
-           "is_asap_cli"]
+           "is_asap_cli", "get_asap_revdate"]
 
 import sys
@@ -52 +52 @@
         os.environ["CASAPATH"] = "%s %s somwhere" % ( asapdata, plf)
 
-def get_revision():
+def get_revinfo_file():
     """Get the revision of the software. Only useful within casapy."""
     if not is_casapy:
@@ -59 +59 @@
     versioninfo = sys.version_info
     pyversion = '%s.%s'%(versioninfo[0],versioninfo[1])
+    revinfo = None
     if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/%s/asap'%(pyversion)):
         # for casa developer environment (linux or darwin)
@@ -68 +69 @@
         else:
             revinfo=casapath[0]+'/lib/python%s/asap/svninfo.txt'%(pyversion)
+    return revinfo
+
+def get_revision():
+    revinfo=get_revinfo_file()
     if os.path.isfile(revinfo):
         f = file(revinfo)
@@ -75 +80 @@
         return revsionno.rstrip()
     return ' unknown '
+
+
+def get_asap_revdate():
+    revinfo=get_revinfo_file() 
+    if os.path.isfile(revinfo):
+        f = file(revinfo)
+        f.readline()
+        f.readline()
+        revdate=f.readline()
+        return revdate.rstrip().lstrip()
+    return 'unknown'
+
+