Changeset 3bc6090 in sasview

Timestamp:

Sep 9, 2011 5:00:17 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fe4224b

Parents:

73197d0

Message:

uses build number and date for build sansview in welcome and about

Files:

• sansguiframe/src/sans/guiframe/aboutbox.py (modified) (1 diff)
• sansview/build_sansview.py (modified) (2 diffs)
• sansview/welcome_panel.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/aboutbox.py

@@ -128 +128 @@
         version = '.'.join(verwords[:-1])
         revision = verwords[-1]
-        
+        try:
+            build_num = str(config.__build__)
+        except:
+            build_num = str(config.__version__)
         self.label_author.SetLabel(strLabel)
         self.label_version.SetLabel(config.__version__)#(version)
-        self.label_svnrevision.SetLabel(config.__version__)
+        self.label_svnrevision.SetLabel(build_num)
         
         # set bitmaps for logo buttons

sansview/build_sansview.py

@@ -137 +137 @@
         if not os.path.isdir(install_dir):
             os.mkdir(install_dir)
-        os.chdir(install_dir)   
+        os.chdir(install_dir)
+        build_num = os.path.basename(os.getcwd())   
         os.system("%s checkout -q %s" % (SVN, url))        
         os.chdir(setup_dir)
+        if setup_dir.count('sansview') > 0:
+            conf_file = open('local_config.py', 'rw')
+            conf = conf_file.read()
+            conf = '__build__ = %s %s \n'% (build_num, time.localtime()) +\
+                     conf
+            conf_file.write(conf)
+            conf_file.close()
+            print "install_dir", build_num,'__build__ = %s %s \n'% (build_num, time.localtime())
         if sys.platform == 'win32':
             os.system("%s setup.py -q build -cmingw32" % PYTHON)
@@ -248 +257 @@
     else:
         os.system("%s checkout -q svn://danse.us/sans/trunk/sansview" % SVN)
-    
+    # put build number to local_config
+    try:
+        build_num = os.path.basename(wd).split('_')[1] 
+        if sys.argv[1]=="-r":
+            sansview_folder = "sansview-%s" % (SANSVIEW)  
+        else:
+            sansview_folder = "sansview"   
+        os.chdir(sansview_folder)
+        if os.getcwd().count('sansview') > 0:
+            conf_file = open('local_config.py', 'r')
+            conf = ''
+            import datetime
+            for line in conf_file.readlines():
+                conf += line
+                if line.count('__version__'):
+                    conf += "__build__ = '%s-%s' \n"% (build_num, datetime.date.today())
+            conf_file.close()
+            conf_file = open('local_config.py', 'w')
+            conf_file.write(conf)
+            conf_file.close()
+    except:
+        pass
+    os.chdir(wd)
+   
 def prepare(wipeout = False):
     """

sansview/welcome_panel.py

@@ -115 +115 @@
         revision = verwords[-1]
         self.label_title = wx.StaticText(self, -1, config.__appname__+ " "+str(config.__version__))#(version))
-        self.label_build = wx.StaticText(self, -1, "Build: "+str(config.__version__))
+        try:
+            build_num = str(config.__build__)
+        except:
+            build_num = str(config.__version__)
+        self.label_build = wx.StaticText(self, -1, "Build: " + build_num)
      
         sizer_main = wx.BoxSizer(wx.VERTICAL)