Changeset 8842 for trunk/anuga_core/source/anuga

Timestamp:

Apr 19, 2013, 9:39:33 PM (12 years ago)

Author:

steve

Message:

Still fiddling with store_version_info

Location:

trunk/anuga_core/source/anuga

Files:

• compile_all.py (modified) (2 diffs)
• utilities/system_tools.py (modified) (1 diff)

trunk/anuga_core/source/anuga/compile_all.py

@@ -15 +15 @@
 subprocess.call([sys.executable, 'compile.py', 'sparse_dok.c'])
 subprocess.call([sys.executable, 'compile.py', 'sparse_csr.c'])
-try:
-    from anuga.utilities.system_tools  import store_version_info
-    store_version_info(verbose=True)
-except:
-    pass
-
 execfile('compile.py')
 
@@ -68 +62 @@
 
 
-os.chdir(BUILDROOT)    
+#====================================================================
+os.chdir('..')
+os.chdir('utilities')
+try:
+    from anuga.utilities.system_tools  import store_version_info
+    store_version_info(verbose=True)
+    print
+    print "---------------------------------"
+    print 'Storing of version info succeeded'
+    print "---------------------------------"
+    print
+except:
+    print
+    print "----------------------------------------------------------------"
+    print 'Storage of version info failed (just means svn is not available)'
+    print "----------------------------------------------------------------"
+    print
+
+os.chdir(BUILDROOT)

trunk/anuga_core/source/anuga/utilities/system_tools.py

@@ -248 +248 @@
 
     try:
-        fid = os.popen('svn info')
+        #fid = os.popen('svn info')
+        #FIXME SR: This works for python 2.6
+        txt = subprocess.Popen('svn -info', shell=True, stdout=subprocess.PIPE).communicate()[0]
+
     except:
         msg = 'Command "svn" is not recognised on the system PATH'
         raise Exception(msg)
     else:    
-        txt = fid.read()
-        fid.close()
+        #txt = fid.read()
+        #fid.close()
+
+        if verbose: print 'response ',txt