Changeset 3bc6090 in sasview for sansview


Ignore:
Timestamp:
Sep 9, 2011 7: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

Location:
sansview
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sansview/build_sansview.py

    r83e503c r3bc6090  
    137137        if not os.path.isdir(install_dir): 
    138138            os.mkdir(install_dir) 
    139         os.chdir(install_dir)    
     139        os.chdir(install_dir) 
     140        build_num = os.path.basename(os.getcwd())    
    140141        os.system("%s checkout -q %s" % (SVN, url))         
    141142        os.chdir(setup_dir) 
     143        if setup_dir.count('sansview') > 0: 
     144            conf_file = open('local_config.py', 'rw') 
     145            conf = conf_file.read() 
     146            conf = '__build__ = %s %s \n'% (build_num, time.localtime()) +\ 
     147                     conf 
     148            conf_file.write(conf) 
     149            conf_file.close() 
     150            print "install_dir", build_num,'__build__ = %s %s \n'% (build_num, time.localtime()) 
    142151        if sys.platform == 'win32': 
    143152            os.system("%s setup.py -q build -cmingw32" % PYTHON) 
     
    248257    else: 
    249258        os.system("%s checkout -q svn://danse.us/sans/trunk/sansview" % SVN) 
    250      
     259    # put build number to local_config 
     260    try: 
     261        build_num = os.path.basename(wd).split('_')[1]  
     262        if sys.argv[1]=="-r": 
     263            sansview_folder = "sansview-%s" % (SANSVIEW)   
     264        else: 
     265            sansview_folder = "sansview"    
     266        os.chdir(sansview_folder) 
     267        if os.getcwd().count('sansview') > 0: 
     268            conf_file = open('local_config.py', 'r') 
     269            conf = '' 
     270            import datetime 
     271            for line in conf_file.readlines(): 
     272                conf += line 
     273                if line.count('__version__'): 
     274                    conf += "__build__ = '%s-%s' \n"% (build_num, datetime.date.today()) 
     275            conf_file.close() 
     276            conf_file = open('local_config.py', 'w') 
     277            conf_file.write(conf) 
     278            conf_file.close() 
     279    except: 
     280        pass 
     281    os.chdir(wd) 
     282    
    251283def prepare(wipeout = False): 
    252284    """ 
  • sansview/welcome_panel.py

    rd4c19e5 r3bc6090  
    115115        revision = verwords[-1] 
    116116        self.label_title = wx.StaticText(self, -1, config.__appname__+ " "+str(config.__version__))#(version)) 
    117         self.label_build = wx.StaticText(self, -1, "Build: "+str(config.__version__)) 
     117        try: 
     118            build_num = str(config.__build__) 
     119        except: 
     120            build_num = str(config.__version__) 
     121        self.label_build = wx.StaticText(self, -1, "Build: " + build_num) 
    118122      
    119123        sizer_main = wx.BoxSizer(wx.VERTICAL) 
Note: See TracChangeset for help on using the changeset viewer.