Changeset 5c3aafa in sasview


Ignore:
Timestamp:
Jan 10, 2012 5:43:17 PM (13 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
9520702
Parents:
62dc94b
Message:

minor cleanup

Files:
6 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • deps.py

    r08dcf6c8 r5c3aafa  
    55print sys.version 
    66 
    7 try: 
    8     import matplotlib 
    9     print "matplotlib ", matplotlib.__version__ 
    10 except: 
    11     print "No matplotlib" 
    12      
    13 try: 
    14     import wx 
    15     print "wx ", wx.__version__ 
    16 except: 
    17     print "No wx" 
    18      
    19 try: 
    20     import scipy 
    21     print "scipy ", scipy.__version__ 
    22 except: 
    23     print "No scipy" 
    24      
    25 try: 
    26     import numpy 
    27     print "numpy ", numpy.__version__ 
    28 except: 
    29     print "No numpy" 
    30      
    31 try: 
    32     import lxml.etree 
    33     print "lxml ", lxml.etree.__version__ 
    34 except: 
    35     print "No lxml" 
    36      
    37 try: 
    38     import reportlab 
    39     print "reportlab ", reportlab.Version 
    40 except: 
    41     print "No reportlab" 
    42      
    43 try: 
    44     import PIL 
    45     print "PIL" 
    46 except: 
    47     print "No PIL" 
    48      
    49 # The following is necessary to build an app 
    50 try: 
    51     import py2app 
    52     print "py2app ", py2app.__version__ 
    53 except: 
    54     print "No py2app: recommending version >= 0.6.4" 
    55      
    56 try: 
    57     import altgraph 
    58     print "altgraph ", altgraph.__version__ 
    59 except: 
    60     print "No altgraph"     
    61      
    62 try: 
    63     import modulegraph 
    64     print "modulegraph ", modulegraph.__version__ 
    65 except: 
    66     print "No modulegraph: recommending version >= 0.9.1" 
    67      
    68 try: 
    69     import macholib 
    70     print "macholib ", macholib.__version__ 
    71 except: 
    72     print "No macholib: recommending version >= 1.4.3" 
    73      
    74    
    75      
     7def check_deps(): 
     8    try: 
     9        import matplotlib 
     10        print "matplotlib ", matplotlib.__version__ 
     11    except: 
     12        print "No matplotlib" 
     13         
     14    try: 
     15        import wx 
     16        print "wx ", wx.__version__ 
     17    except: 
     18        print "No wx" 
     19         
     20    try: 
     21        import scipy 
     22        print "scipy ", scipy.__version__ 
     23    except: 
     24        print "No scipy" 
     25         
     26    try: 
     27        import numpy 
     28        print "numpy ", numpy.__version__ 
     29    except: 
     30        print "No numpy" 
     31         
     32    try: 
     33        import lxml.etree 
     34        print "lxml ", lxml.etree.__version__ 
     35    except: 
     36        print "No lxml" 
     37         
     38    try: 
     39        import reportlab 
     40        print "reportlab ", reportlab.Version 
     41    except: 
     42        print "No reportlab" 
     43         
     44    try: 
     45        import PIL 
     46        print "PIL" 
     47    except: 
     48        print "No PIL" 
     49         
     50    # The following is necessary to build an app 
     51    try: 
     52        import py2app 
     53        print "py2app ", py2app.__version__ 
     54    except: 
     55        print "No py2app: recommending version >= 0.6.4" 
     56         
     57    try: 
     58        import altgraph 
     59        print "altgraph ", altgraph.__version__ 
     60    except: 
     61        print "No altgraph"     
     62         
     63    try: 
     64        import modulegraph 
     65        print "modulegraph ", modulegraph.__version__ 
     66    except: 
     67        print "No modulegraph: recommending version >= 0.9.1" 
     68         
     69    try: 
     70        import macholib 
     71        print "macholib ", macholib.__version__ 
     72    except: 
     73        print "No macholib: recommending version >= 1.4.3" 
     74     
     75def check_system(): 
     76    """ 
     77        Checks that the system has the necessary modules. 
     78        This is an early and more complete variation of the system 
     79        check in check_deps() 
     80    """ 
     81    is_ok = True 
     82    msg = '' 
     83    try: 
     84        import wx 
     85        if not wx.__version__.count('2.8.11') and \ 
     86             not wx.__version__.count('2.8.12'): 
     87            mesg = "wx: Recommending version 2.8.11 or 2.8.12" 
     88            msg += mesg + "\n" 
     89            print mesg 
     90    except: 
     91        is_ok = False 
     92        mesg = "Error: wxpython 2.8.11 (12) missing" 
     93        msg += mesg + "\n" 
     94        print mesg 
     95        logging.error("wxpython missing") 
     96     
     97    try: 
     98        import matplotlib 
     99        if not matplotlib.__version__.count('0.99.0') and \ 
     100             not matplotlib.__version__.count('0.99.1'): 
     101            mesg = "matplotlib: Recommending version 0.99.0 or 0.99.1" 
     102            msg += mesg + "\n" 
     103            print mesg 
     104    except: 
     105        is_ok = False 
     106        mesg = "Error: matplotlib 0.99.0 (1) missing" 
     107        msg += mesg + "\n" 
     108        print mesg 
     109        logging.error("matplotlib missing") 
     110         
     111    try: 
     112        import numpy  
     113        if not numpy.__version__.count('1.4.1'): 
     114            mesg = "numpy: Recommending version 1.4.1" 
     115            msg += mesg + "\n" 
     116            print mesg 
     117    except: 
     118        is_ok = False 
     119        mesg = "Error: numpy 1.4.1 missing" 
     120        msg += mesg + "\n" 
     121        print mesg 
     122        logging.error("numpy missing") 
     123         
     124    try: 
     125        import scipy  
     126        if not scipy.__version__.count('0.7.2'): 
     127            mesg = "scipy: Recommending version 0.7.2" 
     128            msg += mesg + "\n" 
     129            print mesg 
     130    except: 
     131        is_ok = False 
     132        mesg = "Error: scipy 0.7.2 missing" 
     133        msg += mesg + "\n" 
     134        print mesg 
     135        logging.error("scipy missing") 
     136 
     137    try: 
     138        import periodictable 
     139        if not periodictable.__version__.count('1.3.0'): 
     140            mesg = "periodictable: Recommending version 1.3.0" 
     141            msg += mesg + "\n" 
     142            print mesg 
     143    except: 
     144        print "Trying to install perodic table..." 
     145        try: 
     146            os.system("easy_install periodictable") 
     147            print "installed periodictable" 
     148        except: 
     149            is_ok = False 
     150            mesg = "Error: periodictable missing" 
     151            msg += mesg + "\n" 
     152            print "easy_install periodictable failed" 
     153            logging.error("periodictable missing") 
     154     
     155      
     156    try: 
     157        if sys.platform.count("win32")> 0: 
     158            from wx.lib.pdfwin import PDFWindow    
     159    except: 
     160        is_ok = False 
     161        mesg = "comtypes missing" 
     162        msg += mesg + "\n" 
     163        print mesg 
     164        logging.error("comtypes missing") 
     165         
     166    try: 
     167        if sys.platform.count("win32")> 0: 
     168            import win32com 
     169    except: 
     170        is_ok = False 
     171        mesg = "pywin32 missing" 
     172        msg += mesg + "\n" 
     173        print mesg 
     174        logging.error("pywin32 missing") 
     175             
     176    try: 
     177        import pyparsing 
     178    except: 
     179        try: 
     180            os.system("easy_install pyparsing") 
     181            print "installed pyparsing" 
     182        except: 
     183            is_ok = False 
     184            mesg = "pyparsing missing" 
     185            msg += mesg + "\n" 
     186            print mesg 
     187            print "easy_install pyparsing failed" 
     188            logging.error("pyparsing missing") 
     189               
     190    if os.system("gcc -dumpversion")==1: 
     191        is_ok = False 
     192        mesg = "missing mingw/gcc" 
     193        msg += mesg + "\n" 
     194        print mesg 
     195        logging.error("missing mingw/gcc") 
     196     
     197    return is_ok, msg 
     198 
     199check_deps() 
     200     

  • sansmodels/license.txt

    r77dc373 r5c3aafa  
    1414http://wiki.cacr.caltech.edu/danse/index.php/Main_Page 
    1515 
    16 copyright 2008, University of Tennessee for the DANSE project 
     16copyright 2008-2011, University of Tennessee 

  • sansview/installer.iss

    rfa597990 r5c3aafa  
    1 ; Script generated by the Inno Setup Script Wizard. 
    2 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! 
    31 
     2; Script generated by the Inno Setup Script Wizard 
     3 
     4; and local_config.py located in this directory. 
     5 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! 
    46[Setup] 
    5 AppName=SansView-Dev12132010 
    6 AppVerName=SansView Dev12132010 
    7 AppPublisher=University of Tennessee 
    8 AppPublisherURL=http://danse.chem.utk.edu/ 
    9 AppSupportURL=http://danse.chem.utk.edu/ 
    10 AppUpdatesURL=http://danse.chem.utk.edu/ 
    11 DefaultDirName={pf}\SansView-Dev12132010 
    12 DefaultGroupName=DANSE\SansView-Dev12132010 
     7 
     8ChangesAssociations=yes 
     9AppName=SansView 
     10AppVerName=SansView-2.0.1 
     11AppPublisher=(c) 2009 - 2011, University of Tennessee 
     12AppPublisherURL=http://danse.chem.utk.edu 
     13AppSupportURL=http://danse.chem.utk.edu 
     14AppUpdatesURL=http://danse.chem.utk.edu  
     15ChangesEnvironment=true  
     16DefaultDirName={pf}/SansView 
     17DefaultGroupName=DANSE/SansView-2.0.1 
    1318DisableProgramGroupPage=yes 
    1419LicenseFile=license.txt 
    … …  
    2025 
    2126 
     27[Registry] 
     28Root: HKCR;     Subkey: ".xml/OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
     29Root: HKCR;     Subkey: ".txt/OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
     30Root: HKCR;     Subkey: ".asc/OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
     31Root: HKCR;     Subkey: ".dat/OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
     32Root: HKCR;     Subkey: ".tif/OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
     33Root: HKCR;     Subkey: ".abs/OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
     34Root: HKCR;     Subkey: ".d1d/OpenWithList\SansView.exe";        Flags: uninsdeletekey noerror 
     35Root: HKCR;     Subkey: ".sans/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     36Root: HKCR; Subkey: "applications\SansView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""";     Flags: uninsdeletevalue noerror 
     37Root: HKCU;     Subkey: "Software\Classes/.xml/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     38Root: HKCU;     Subkey: "Software\Classes/.txt/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     39Root: HKCU;     Subkey: "Software\Classes/.asc/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     40Root: HKCU;     Subkey: "Software\Classes/.dat/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     41Root: HKCU;     Subkey: "Software\Classes/.tif/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     42Root: HKCU;     Subkey: "Software\Classes/.abs/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     43Root: HKCU;     Subkey: "Software\Classes/.d1d/OpenWithList\SansView.exe";       Flags: uninsdeletekey noerror 
     44Root: HKCU;     Subkey: "Software\Classes/.sans/OpenWithList\SansView.exe";      Flags: uninsdeletekey noerror 
     45Root: HKCU; Subkey: "Software/Classes/applications\SansView.exe\shell\open\command";    ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""";     Flags: uninsdeletevalue noerror 
     46Root: HKCR;     Subkey: ".svs"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
     47Root: HKCR;     Subkey: ".fitv";        ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
     48Root: HKCR;     Subkey: ".inv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
     49Root: HKCR;     Subkey: ".prv"; ValueType: string;      ValueName: "";  ValueData: "{app}\SansView.exe";         Flags: uninsdeletevalue  noerror 
     50Root: HKCR; Subkey: "{app}\SansView.exe";       ValueType: string; ValueName: "";       ValueData: "{app}\SansView File";        Flags: uninsdeletekey  noerror          
     51Root: HKCR; Subkey: "{app}\SansView.exe\shell\open\command";    ValueType: string; ValueName: "";       ValueData: """{app}\SansView.exe""  ""%1""";     Flags: uninsdeletevalue noerror         
     52Root: HKCR; Subkey: "{app}\images\ball.ico";    ValueType: string; ValueName: "";       ValueData: "{app}\SansView.exe,0";       Flags: uninsdeletevalue noerror         
     53Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment";     ValueType: expandsz; ValueName: "SANSVIEWPATH"; ValueData: "{app}";      Flags: uninsdeletevalue noerror 
     54; Write to PATH (below) is disabled; need more tests 
     55;Root: HKCU; Subkey: "Environment";     ValueType: expandsz; ValueName: "PATH"; ValueData: "%SANSVIEWPATH%;{olddata}";   Check: NeedsAddPath() 
     56 
     57 
    2258[Languages] 
    23 Name: "english"; MessagesFile: "compiler:Default.isl" 
     59Name: "english";        MessagesFile: "compiler:Default.isl" 
     60 
    2461 
    2562[Tasks] 
    26 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked 
     63Name: "desktopicon";    Description: "{cm:CreateDesktopIcon}";  GroupDescription: "{cm:AdditionalIcons}";       Flags: unchecked 
     64Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}";     GroupDescription: "{cm:AdditionalIcons}"; 
     65 
    2766 
    2867[Files] 
    29 Source: "dist\SansView.exe"; DestDir: "{app}"; Flags: ignoreversion 
    30 Source: "dist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs 
    31 Source: "images\*"; DestDir: "{app}\images"; Flags: ignoreversion recursesubdirs createallsubdirs 
    32 Source: "test\*"; DestDir: "{app}\test"; Flags: ignoreversion recursesubdirs createallsubdirs 
    33 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files 
     68Source: "dist\SansView.exe";    DestDir: "{app}";       Flags: ignoreversion 
     69Source: "dist\*";       DestDir: "{app}";       Flags: ignoreversion recursesubdirs createallsubdirs 
     70Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sansview\plugin_models";    Flags: recursesubdirs createallsubdirs 
     71Source: "dist\config\custom_config.py"; DestDir: "{userappdata}\..\.sansview\config";   Flags: recursesubdirs createallsubdirs 
     72;       NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    3473 
    3574[Icons] 
    36 Name: "{group}\SansView"; Filename: "{app}\SansView.exe"; WorkingDir: "{app}" 
    37 Name: "{group}\{cm:UninstallProgram,SansView}"; Filename: "{uninstallexe}" 
    38 Name: "{commondesktop}\SansView Dev12082010"; Filename: "{app}\SansView.exe"; Tasks: desktopicon; WorkingDir: "{app}" 
     75Name: "{group}\SansView";       Filename: "{app}\SansView.exe"; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico"  
     76Name: "{group}\{cm:UninstallProgram, SansView}";         Filename: "{uninstallexe}"  
     77Name: "{commondesktop}\SansView-2.0.1"; Filename: "{app}\SansView.exe"; Tasks: desktopicon; WorkingDir: "{app}" ; IconFilename: "{app}\images\ball.ico"  
     78Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\SansView-2.0.1";  Filename: "{app}\SansView.exe"; Tasks: quicklaunchicon; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico"  
     79 
    3980 
    4081[Run] 
    41 Filename: "{app}\SansView.exe"; Description: "{cm:LaunchProgram,SansView}"; Flags: nowait postinstall skipifsilent 
     82Filename: "{app}\SansView.exe"; Description: "{cm:LaunchProgram, SansView}";    Flags: nowait postinstall skipifsilent 
     83; Install the Microsoft C++ DLL redistributable package if it is provided and the DLLs are not present on the target system. 
     84; Note that the redistributable package is included if the app was built using Python 2.6 or 2.7, but not with 2.5. 
     85; Parameter options: 
     86; - for silent install use: "/q" 
     87; - for silent install with progress bar use: "/qb" 
     88; - for silent install with progress bar but disallow cancellation of operation use: "/qb!" 
     89; Note that we do not use the postinstall flag as this would display a checkbox and thus require the user to decide what to do. 
     90;Filename: "{app}\vcredist_x86.exe"; Parameters: "/qb!"; WorkingDir: "{tmp}"; StatusMsg: "Installing Microsoft Visual C++ 2008 Redistributable Package ..."; Check: InstallVC90CRT(); Flags: skipifdoesntexist waituntilterminated 
    4291 
     92 
     93[Dirs] 
     94Name: "{app}\"; Permissions: everyone-modify     
     95 
     96 
     97[Code] 
     98function InstallVC90CRT(): Boolean; 
     99begin 
     100    Result := not DirExists('C:\WINDOWS\WinSxS\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375'); 
     101end; 
     102 
     103function NeedsAddPath(): boolean; 
     104var 
     105  oldpath: string; 
     106  newpath: string; 
     107  pathArr:    TArrayOfString; 
     108  i:        Integer; 
     109begin 
     110  RegQueryStringValue(HKEY_CURRENT_USER,'Environment','PATH', oldpath) 
     111  oldpath := oldpath + ';'; 
     112  newpath := '%SANSVIEWPATH%'; 
     113  i := 0; 
     114  while (Pos(';', oldpath) > 0) do begin 
     115    SetArrayLength(pathArr, i+1); 
     116    pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1); 
     117    oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath)); 
     118    i := i + 1; 
     119    // Check if current directory matches app dir 
     120    if newpath = pathArr[i-1]  
     121    then begin 
     122      Result := False; 
     123      exit; 
     124    end; 
     125  end; 
     126  Result := True; 
     127end; 
     128 
     129 
     130[UninstallDelete] 
     131; Delete directories and files that are dynamically created by the application (i.e. at runtime). 
     132Type: filesandordirs; Name: "{app}\.matplotlib" 
     133Type: files; Name: "{app}\*.*" 
     134; The following is a workaround for the case where the application is installed and uninstalled but the 
     135;{app} directory is not deleted because it has user files.  Then the application is installed into the 
     136; existing directory, user files are deleted, and the application is un-installed again.  Without the 
     137; directive below, {app} will not be deleted because Inno Setup did not create it during the previous 
     138; installation. 
     139Type: dirifempty; Name: "{app}" 
     140 

  • sansview/installer_generator.py

    raade98e r5c3aafa  
    11""" 
    2 This module generates .ss file according to the local config of 
     2This module generates .iss file according to the local config of 
    33the current application. Please make sure a file named "local_config.py" 
    44exists in the current directory. Edit local_config.py according to your needs. 

  • sansview/license.txt

    rfa597990 r5c3aafa  
    1111http://wiki.cacr.caltech.edu/danse/index.php/Main_Page 
    1212 
    13 copyright 2009, University of Tennessee for the DANSE project 
     13copyright 2009-2011, University of Tennessee 
Note: See TracChangeset for help on using the changeset viewer.