Changeset 2d74016 in sasview


Ignore:
Timestamp:
Nov 14, 2011 2:04:10 PM (12 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:
1f177cc
Parents:
45b6bfb
Message:

new ver. #s

Location:
sansview
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • sansview/build_sansview.py

    ra2898df r2d74016  
    6161SANSMODELS = "1.0.0" 
    6262DATALOADER = "1.0.0" 
    63 GUIFRAME   = "1.0.0" 
    64 SANSVIEW   = "2.0.0" 
     63GUIFRAME   = "1.0.1" 
     64SANSVIEW   = "2.0.1" 
    6565PLOTTOOLS  = "1.0.0" 
    6666UTIL       = "1.0.0" 
    6767PARK       = "1.2.1" 
    68 PARK_INTEG = "1.0.0" 
     68PARK_INTEG = "1.0.1" 
    6969PRVIEW     = "1.0.0" 
    7070PR_INV     = "1.0.0" 
    … …  
    7373INVARIANT  = "1.0.0" 
    7474INV_VIEW   = "1.0.0" 
    75 FIT_VIEW   = "1.0.0" 
     75FIT_VIEW   = "1.0.1" 
    7676 
    7777# URLs for SVN repos 
    78 SANSMODELS_URL = "svn://danse.us/sans/releases/sansmodels-%s" % SANSMODELS 
    79 DATALOADER_URL = "svn://danse.us/sans/releases/sansdataloader-%s" % DATALOADER 
    80 GUIFRAME_URL = "svn://danse.us/sans/releases/sansguiframe-%s" % GUIFRAME 
    81 PLOTTOOLS_URL = "svn://danse.us/common/releases/plottools-%s" % PLOTTOOLS 
    82 UTIL_URL = "svn://danse.us/common/releases/util-%s" % UTIL 
    83 SANSVIEW_URL = "svn://danse.us/sans/releases/sansview-%s" % SANSVIEW 
    84 FIT_URL = "svn://danse.us/sans/releases/fittingview-%s" % FIT_VIEW 
    85 PARK_INTEG_URL = "svn://danse.us/sans/releases/park_integration-%s" % PARK_INTEG 
     78SANSMODELS_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sansmodels-%s" % SANSMODELS 
     79DATALOADER_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sansdataloader-%s" % DATALOADER 
     80GUIFRAME_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sansguiframe-%s" % GUIFRAME 
     81PLOTTOOLS_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/common-releases/plottools-%s" % PLOTTOOLS 
     82UTIL_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/common-releases/util-%s" % UTIL 
     83SANSVIEW_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sansview-%s" % SANSVIEW 
     84FIT_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/fittingview-%s" % FIT_VIEW 
     85PARK_INTEG_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/park_integration-%s" % PARK_INTEG 
    8686PARK_URL = "svn://danse.us/park/releases/park-%s" % PARK 
    87 PRVIEW_URL = "svn://danse.us/sans/releases/inversionview-%s" % PRVIEW 
    88 PR_INV_URL = "svn://danse.us/sans/releases/pr_inversion-%s" % PR_INV 
    89 CALC_URL = "svn://danse.us/sans/releases/sanscalculator-%s" % CALCULATOR 
    90 CALC_VIEW_URL = "svn://danse.us/sans/releases/calculatorview-%s" % CALC_VIEW 
    91 INV_URL = "svn://danse.us/sans/releases/sansinvariant-%s" % INVARIANT 
    92 INV_VIEW_URL = "svn://danse.us/sans/releases/invariantview-%s" % INV_VIEW 
     87PRVIEW_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/inversionview-%s" % PRVIEW 
     88PR_INV_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/pr_inversion-%s" % PR_INV 
     89CALC_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sanscalculator-%s" % CALCULATOR 
     90CALC_VIEW_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/calculatorview-%s" % CALC_VIEW 
     91INV_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/sansinvariant-%s" % INVARIANT 
     92INV_VIEW_URL = "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/releases/invariantview-%s" % INV_VIEW 
    9393 
    9494def check_system(): 
    … …  
    171171        install_pkg(".", "sansdataloader-%s" % DATALOADER, DATALOADER_URL) 
    172172    else: 
    173         install_pkg(".", "sansdataloader", "svn://danse.us/sans/trunk/sansdataloader") 
     173        install_pkg(".", "sansdataloader", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansdataloader") 
    174174     
    175175    os.chdir(wd) 
    … …  
    177177        install_pkg(".", "sansmodels-%s" % SANSMODELS, SANSMODELS_URL) 
    178178    else: 
    179         install_pkg(".", "sansmodels", "svn://danse.us/sans/trunk/sansmodels") 
     179        install_pkg(".", "sansmodels", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansmodels") 
    180180     
    181181    os.chdir(wd) 
    … …  
    183183        install_pkg(".", "sansguiframe-%s" % GUIFRAME, GUIFRAME_URL) 
    184184    else: 
    185         install_pkg(".", "sansguiframe", "svn://danse.us/sans/trunk/sansguiframe") 
     185        install_pkg(".", "sansguiframe", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansguiframe") 
    186186     
    187187    os.chdir(wd) 
    … …  
    189189        install_pkg(".", "plottools-%s" % PLOTTOOLS, PLOTTOOLS_URL) 
    190190    else: 
    191         install_pkg(".", "plottools", "svn://danse.us/common/plottools") 
     191        install_pkg(".", "plottools", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/plottools") 
    192192     
    193193    os.chdir(wd) 
    … …  
    195195        install_pkg(".", "util-%s" % UTIL, UTIL_URL) 
    196196    else: 
    197         install_pkg(".", "util", "svn://danse.us/common/util") 
     197        install_pkg(".", "util", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansutil") 
    198198     
    199199    os.chdir(wd) 
    … …  
    201201        install_pkg(".", "park_integration-%s" % PARK_INTEG, PARK_INTEG_URL) 
    202202    else: 
    203         install_pkg(".", "park_integration", "svn://danse.us/sans/trunk/park_integration") 
     203        install_pkg(".", "park_integration", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/park_integration") 
    204204     
    205205    os.chdir(wd) 
    … …  
    207207        install_pkg(".", "inversionview-%s" % PRVIEW, PRVIEW_URL) 
    208208    else: 
    209         install_pkg(".", "inversionview", "svn://danse.us/sans/trunk/inversionview") 
     209        install_pkg(".", "inversionview", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/inversionview") 
    210210     
    211211    os.chdir(wd) 
    … …  
    213213        install_pkg(".", "pr_inversion-%s" % PR_INV, PR_INV_URL) 
    214214    else: 
    215         install_pkg(".", "pr_inversion", "svn://danse.us/sans/trunk/pr_inversion") 
     215        install_pkg(".", "pr_inversion", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/pr_inversion") 
    216216     
    217217    os.chdir(wd) 
    … …  
    219219        install_pkg(".", "sansinvariant-%s" % INVARIANT, INV_URL) 
    220220    else: 
    221         install_pkg(".", "sansinvariant", "svn://danse.us/sans/trunk/sansinvariant") 
     221        install_pkg(".", "sansinvariant", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansinvariant") 
    222222     
    223223    os.chdir(wd) 
    … …  
    225225        install_pkg(".", "invariantview-%s" % INV_VIEW, INV_VIEW_URL) 
    226226    else: 
    227         install_pkg(".", "invariantview", "svn://danse.us/sans/trunk/invariantview") 
     227        install_pkg(".", "invariantview", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/invariantview") 
    228228     
    229229    os.chdir(wd) 
    … …  
    231231        install_pkg(".", "calculatorview-%s" % CALC_VIEW, CALC_VIEW_URL) 
    232232    else: 
    233         install_pkg(".", "calculatorview", "svn://danse.us/sans/trunk/calculatorview") 
     233        install_pkg(".", "calculatorview", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/calculatorview") 
    234234     
    235235    os.chdir(wd) 
    … …  
    237237        install_pkg(".", "sanscalculator-%s" % CALCULATOR, CALC_URL) 
    238238    else: 
    239         install_pkg(".", "sanscalculator", "svn://danse.us/sans/trunk/sanscalculator") 
     239        install_pkg(".", "sanscalculator", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sanscalculator") 
    240240 
    241241 
    … …  
    244244        install_pkg(".", "park-%s" % PARK, PARK_URL) 
    245245    else: 
    246         install_pkg(".", "park-1.2", "svn://danse.us/park/branches/park-1.2") 
     246        install_pkg(".", "park-1.2", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/park-1.2") 
    247247         
    248248    os.chdir(wd) 
    … …  
    250250        install_pkg(".", "fittingview-%s" % FIT_VIEW, FIT_URL) 
    251251    else: 
    252         install_pkg(".", "fittingview", "svn://danse.us/sans/trunk/fittingview") 
     252        install_pkg(".", "fittingview", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/fittingview") 
    253253             
    254254    os.chdir(wd) 
    … …  
    256256        os.system("%s checkout -q %s" % (SVN, SANSVIEW_URL)) 
    257257    else: 
    258         os.system("%s checkout -q svn://danse.us/sans/trunk/sansview" % SVN) 
     258        os.system("%s checkout -q https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansview" % SVN) 
    259259    # put build number to local_config 
    260260    try: 

  • sansview/installer_new.iss

    ra2898df r2d74016  
    88ChangesAssociations=yes 
    99AppName=SansView 
    10 AppVerName=SansView-2.0.0 
     10AppVerName=SansView-2.0.1 
    1111AppPublisher=(c) 2009 - 2011, University of Tennessee 
    1212AppPublisherURL=http://danse.chem.utk.edu 
    … …  
    1515ChangesEnvironment=true  
    1616DefaultDirName={pf}\SansView 
    17 DefaultGroupName=DANSE\SansView-2.0.0 
     17DefaultGroupName=DANSE\SansView-2.0.1 
    1818DisableProgramGroupPage=yes 
    1919LicenseFile=license.txt 
    … …  
    7575Name: "{group}\SansView";       Filename: "{app}\SansView.exe"; WorkingDir: "{app}"  
    7676Name: "{group}\{cm:UninstallProgram, SansView}";         Filename: "{uninstallexe}"  
    77 Name: "{commondesktop}\SansView-2.0.0"; Filename: "{app}\SansView.exe"; Tasks: desktopicon; WorkingDir: "{app}"  
     77Name: "{commondesktop}\SansView-2.0.1"; Filename: "{app}\SansView.exe"; Tasks: desktopicon; WorkingDir: "{app}"  
    7878 
    7979 

  • sansview/local_config.py

    ra2898df r2d74016  
    77# Version of the application 
    88__appname__ = "SansView" 
    9 __version__ = '2.0.0' 
    10 __build__ = '2.0.0' 
     9__version__ = '2.0.1' 
     10__build__ = '2.0.1' 
    1111__download_page__ = 'http://danse.chem.utk.edu' 
    1212__update_URL__ = 'http://danse.chem.utk.edu/sansview_version.php' 

  • sansview/releases_notes.txt

    rdbdff5e r2d74016  
    22============= 
    33 
    4 SansView 2.0.0 
    5  
     4SansView 2.0.1 
     5         
     6        - version 2.0.1: 
     7         
     8        - fixed a bug in saving model values as a file 
     9        - fixed a problem in a report file (html) 
     10        - Simultaneous fit: fixed a problem, displaying incorrect results in PD/Angles 
     11        -  
    6121       - version 2.0.0:  
    713 
    … …  
    9399                        (after all dependent packages/modules are installed/compiled, run 'python sansview.py' under the 'sansview-2.0.0' folder) 
    94100                - This application is also dependent on the following DANSE code: 
    95                         svn://danse.us/sans/releases/fittingview-1.0.0 (run 'python setup.py install' under the 'fittingview-1.0.0' folder) 
     101                        svn://danse.us/sans/releases/fittingview-1.0.1 (run 'python setup.py install' under the 'fittingview-1.0.0' folder) 
    96102                        svn://danse.us/sans/releases/sanscalculator-1.0.0 (run 'python setup.py install' under the 'sanscalculator-1.0.0' folder) 
    97103                        svn://danse.us/sans/releases/sanscalculator-1.0.0 (run 'python setup.py install' under the 'sanscalculator-1.0.0' folder) 
    98104                        svn://danse.us/sans/releases/sansinvariant-1.0.0 (run 'python setup.py install' under the 'sansinvariant-1.0.0' folder) 
    99105                        svn://danse.us/sans/releases/invariantview-1.0.0 (run 'python setup.py install' under the 'invariantview-1.0.0' folder) 
    100                         svn://danse.us/sans/releases/sansguiframe-1.0.0 (run 'python setup.py install' under the 'sansguiframe-1.0.0' folder) 
     106                        svn://danse.us/sans/releases/sansguiframe-1.0.1 (run 'python setup.py install' under the 'sansguiframe-1.0.0' folder) 
    101107                        svn://danse.us/sans/releases/sansdataloader-1.0.0 (run 'python setup.py install' under the 'sansdataloader-1.0.0' folder) 
    102                         svn://danse.us/sans/releases/park_integration-1.0.0 (run 'python setup.py install' under the 'park_integration-1.0.0' folder) 
     108                        svn://danse.us/sans/releases/park_integration-1.0.1 (run 'python setup.py install' under the 'park_integration-1.0.0' folder) 
    103109                        svn://danse.us/sans/releases/sansmodels-1.0.0 (run 'python setup.py install' under the 'sansmodels-1.0.0' folder) 
    104110                        svn://danse.us/park/releases/park-1.2.1 (run 'python setup.py install' under the 'park-1.2.1' folder) 
    … …  
    107113                svn://danse.us/sans/releases/pr_inversion-1.0.0(run 'python setup.py install'under the 'pr_inversion-1.0.0' folder) 
    108114                svn://danse.us/sans/releases/inversionview-1.0.0 (run 'python setup.py install'under the 'inversionview-1.0.0' folder) 
     115                svn://danse.us/sans/releases/sansview-2.0.1 (run 'python sansview.py' under the 'sansview-2.0.1' folder after finished all other installations) 
    109116                - The following modules are required: 
    110117                        * matplotlib = 0.99.0(WIN), 0.99.1.1(MAC) 

  • sansview/setup_exe.py

    ra490860 r2d74016  
    7777        self.__dict__.update(kw) 
    7878        # for the versioninfo resources 
    79         self.version = "1.9.2Dev" 
     79        self.version = "2.0.1" 
    8080        self.company_name = "U Tennessee" 
    8181        self.copyright = "copyright 2009 - 2011" 
Note: See TracChangeset for help on using the changeset viewer.