[Avida-cvs] [avida-svn] r568 - branches/developers/avida-edward/source/python/AvidaGui2

[avidaedward@myxo.css.msu.edu]

Author: avidaedward
Date: 2006-04-04 16:30:55 -0400 (Tue, 04 Apr 2006)
New Revision: 568

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh
   branches/developers/avida-edward/source/python/AvidaGui2/svn_revision.sh
   branches/developers/avida-edward/source/python/AvidaGui2/svn_update.sh
Log:

Cleanup of revision string in Avida-ED.



Modified: branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py	2006-04-04 20:20:10 UTC (rev 567)
+++ branches/developers/avida-edward/source/python/AvidaGui2/Get_Avida_ED_version.py	2006-04-04 20:30:55 UTC (rev 568)
@@ -1,6 +1,8 @@
 
+avida_ed_version_string = 'Avida-ED v2.0'
 try:
   import Avida_ED_version
-  svn_revision_string = Avida_ED_version.svn_revision_string
+  reload(Avida_ED_version)
+  avida_ed_version_string += '.%s' % Avida_ED_version.svn_revision_string
 except:
-  svn_revision_string = "(unknown)"
+  avida_ed_version_string += '.(unknown)'

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2006-04-04 20:20:10 UTC (rev 567)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2006-04-04 20:30:55 UTC (rev 568)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from Get_Avida_ED_version import svn_revision_string
+from Get_Avida_ED_version import avida_ed_version_string
 from pyEduWorkspaceView import pyEduWorkspaceView
 from pyMdtr import pyMdtr
 from pyOneAnalyzeCtrl import pyOneAnalyzeCtrl
@@ -29,7 +29,7 @@
     self.m_cli_to_ctrl_dict = {}
     self.m_ctrl_to_cli_dict = {}
     #self.setCaption(self.m_session_mdl.m_current_workspace)
-    self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
+    self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
    
     while self.m_widget_stack.visibleWidget():
       self.m_widget_stack.removeWidget(self.m_widget_stack.visibleWidget())
@@ -200,7 +200,7 @@
             self.m_session_mdl.m_current_workspace = str(new_dir)
             self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
             #self.setCaption(self.m_session_mdl.m_current_workspace)
-            self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
+            self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
             self.m_session_mdl.m_session_mdtr.emit(
               PYSIGNAL("doRefreshFreezerInventorySig"), ())
             created = True
@@ -226,7 +226,7 @@
       self.m_session_mdl.m_current_workspace = str(workspace_dir)
       self.m_session_mdl.m_current_freezer = os.path.join(self.m_session_mdl.m_current_workspace, "freezer")
       #self.setCaption(self.m_session_mdl.m_current_workspace)
-      self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
+      self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
       self.m_session_mdl.m_session_mdtr.emit(
         PYSIGNAL("doRefreshFreezerInventorySig"), ())
 
@@ -279,7 +279,7 @@
             self.m_session_mdl.m_current_workspace = str(new_dir)
             self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
             #self.setCaption(self.m_session_mdl.m_current_workspace)
-            self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
+            self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
             self.m_session_mdl.m_session_mdtr.emit(
               PYSIGNAL("doRefreshFreezerInventorySig"), ())
             created = True

Modified: branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh	2006-04-04 20:20:10 UTC (rev 567)
+++ branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh	2006-04-04 20:30:55 UTC (rev 568)
@@ -3,5 +3,4 @@
 SCRIPT_DIR=`dirname "$0"`
 
 svn commit || (echo "Can't 'svn commit' Avida-ED."; exit 1)
-revision_string=`svnversion` || (echo "Can't get Avida-ED's svn revision number."; exit 1)
-echo "svn_revision_string = 'Avida-ED v2.0.$revision_string'" > "$SCRIPT_DIR"/Avida_ED_version.py
+${SCRIPT_DIR}/svn_revision.sh

Modified: branches/developers/avida-edward/source/python/AvidaGui2/svn_revision.sh
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/svn_revision.sh	2006-04-04 20:20:10 UTC (rev 567)
+++ branches/developers/avida-edward/source/python/AvidaGui2/svn_revision.sh	2006-04-04 20:30:55 UTC (rev 568)
@@ -3,4 +3,4 @@
 SCRIPT_DIR=`dirname "$0"`
 
 revision_string=`svnversion` || (echo "Can't get Avida-ED's svn revision number."; exit 1)
-echo "svn_revision_string = 'Avida-ED v2.0.$revision_string'" > "$SCRIPT_DIR"/Avida_ED_version.py
+echo "svn_revision_string = '$revision_string'" > "$SCRIPT_DIR"/Avida_ED_version.py

Modified: branches/developers/avida-edward/source/python/AvidaGui2/svn_update.sh
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/svn_update.sh	2006-04-04 20:20:10 UTC (rev 567)
+++ branches/developers/avida-edward/source/python/AvidaGui2/svn_update.sh	2006-04-04 20:30:55 UTC (rev 568)
@@ -3,5 +3,4 @@
 SCRIPT_DIR=`dirname "$0"`
 
 svn update || (echo "Can't 'svn update' Avida-ED."; exit 1)
-revision_string=`svnversion` || (echo "Can't get Avida-ED's svn revision number."; exit 1)
-echo "svn_revision_string = 'Avida-ED v2.0.$revision_string'" > "$SCRIPT_DIR"/Avida_ED_version.py
+${SCRIPT_DIR}/svn_revision.sh