Changeset aade98e in sasview


Ignore:
Timestamp:
Dec 23, 2011 1:29:24 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:
eb32080e
Parents:
e9bd127
Message:

updated iss generator

Location:
sansview
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sansview/installer_generator.py

    re7281fd raade98e  
    2424                                 
    2525OutputBaseFilename = local_config.OutputBaseFilename 
    26 SetupIconFile = local_config.SetupIconFile_win 
     26SetupIconFile = "images\\ball.ico" 
    2727LicenseFile = 'license.txt' 
    2828DisableProgramGroupPage = 'yes' 
    … …  
    183183    msg += """Name: "desktopicon";\tDescription: "{cm:CreateDesktopIcon}";\t""" 
    184184    msg += """GroupDescription: "{cm:AdditionalIcons}";\tFlags: unchecked\n""" 
     185    msg += """Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}";\t""" 
     186    msg += """GroupDescription: "{cm:AdditionalIcons}";\n""" 
    185187    return msg 
    186188 
    … …  
    195197    msg += """Source: "dist\*";\tDestDir: "{app}";\t""" 
    196198    msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n""" 
    197     msg += """Source: "%s\*";\tDestDir: "{app}\%s";\t""" % (str(icon_path), str("images")) 
    198     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n""" 
    199     msg += """Source: "%s\*";\tDestDir: "{app}\%s";\t""" % (str(test_path), str("test")) 
    200     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n""" 
    201     msg += """Source: "%s\*";\tDestDir: "{app}\%s";\t""" % (str(media_path), str("media")) 
    202     msg += """Flags: ignoreversion recursesubdirs createallsubdirs\n""" 
     199    msg += """Source: "dist\plugin_models\*";\tDestDir: "{userappdata}\..\.sansview\plugin_models";\t"""  
     200    msg += """Flags: recursesubdirs createallsubdirs\n""" 
     201    msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userappdata}\..\.sansview\config";\t"""  
     202    msg += """Flags: recursesubdirs createallsubdirs\n""" 
    203203    msg += """;\tNOTE: Don't use "Flags: ignoreversion" on any shared system files""" 
    204204    return msg 
    … …  
    211211    msg += """Name: "{group}\%s";\t""" % str(AppName) 
    212212    msg += """Filename: "{app}\%s";\t"""  % str(APPLICATION) 
    213     msg += """WorkingDir: "{app}" \n""" 
     213    msg += """WorkingDir: "{app}"; IconFilename: "{app}\images\\ball.ico" \n""" 
    214214    msg += """Name: "{group}\{cm:UninstallProgram, %s}";\t""" % str(AppName) 
    215215    msg += """ Filename: "{uninstallexe}" \n""" 
    216216    msg += """Name: "{commondesktop}\%s";\t""" % str(AppVerName) 
    217217    msg += """Filename: "{app}\%s";\t""" % str(APPLICATION) 
    218     msg += """Tasks: desktopicon; WorkingDir: "{app}" \n""" 
     218    msg += """Tasks: desktopicon; WorkingDir: "{app}" ; IconFilename: "{app}\images\\ball.ico" \n""" 
     219    msg += """Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\%s";\t""" % str(AppVerName) 
     220    msg += """Filename: "{app}\%s";\t""" % str(APPLICATION) 
     221    msg += """Tasks: quicklaunchicon; WorkingDir: "{app}"; IconFilename: "{app}\images\\ball.ico" \n""" 
    219222    return msg 
    220223 
    … …  
    227230    msg += """Description: "{cm:LaunchProgram, %s}";\t""" %str(AppName)  
    228231    msg += """Flags: nowait postinstall skipifsilent\n""" 
     232    msg += """; Install the Microsoft C++ DLL redistributable package if it is """ 
     233    msg += """provided and the DLLs are not present on the target system.\n""" 
     234    msg += """; Note that the redistributable package is included if the app was """ 
     235    msg += """built using Python 2.6 or 2.7, but not with 2.5.\n""" 
     236    msg += """; Parameter options:\n""" 
     237    msg += """; - for silent install use: "/q"\n""" 
     238    msg += """; - for silent install with progress bar use: "/qb"\n""" 
     239    msg += """; - for silent install with progress bar but disallow """ 
     240    msg += """cancellation of operation use: "/qb!"\n""" 
     241    msg += """; Note that we do not use the postinstall flag as this would """ 
     242    msg += """display a checkbox and thus require the user to decide what to do.\n""" 
     243    msg += """;Filename: "{app}\\vcredist_x86.exe"; Parameters: "/qb!"; """ 
     244    msg += """WorkingDir: "{tmp}"; StatusMsg: "Installing Microsoft Visual """ 
     245    msg += """C++ 2008 Redistributable Package ..."; Check: InstallVC90CRT(); """ 
     246    msg += """Flags: skipifdoesntexist waituntilterminated\n""" 
    229247    return msg 
    230248 
    … …  
    245263    """ 
    246264    msg = """\n\n[Code]\n""" 
     265    msg += """function InstallVC90CRT(): Boolean;\n"""  
     266    msg += """begin\n""" 
     267    msg += """    Result := not DirExists('C:\WINDOWS\WinSxS\\x86_Microsoft.VC90.""" 
     268    msg += """CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375');\n""" 
     269    msg += """end;\n\n""" 
    247270    msg += """function NeedsAddPath(): boolean;\n"""  
    248271    msg += """var\n"""  
    … …  
    273296    msg += """end;\n""" 
    274297    msg += """\n""" 
    275      
    276      
    277      
    278      
    279     return msg 
    280  
     298    return msg 
     299 
     300def write_uninstalldelete(): 
     301    """ 
     302    Define uninstalldelete 
     303    """ 
     304    msg = """\n[UninstallDelete]\n""" 
     305    msg += """; Delete directories and files that are dynamically created by """ 
     306    msg += """the application (i.e. at runtime).\n""" 
     307    msg += """Type: filesandordirs; Name: "{app}\.matplotlib"\n""" 
     308    msg += """Type: files; Name: "{app}\*.*"\n""" 
     309    msg += """; The following is a workaround for the case where the """ 
     310    msg += """application is installed and uninstalled but the\n""" 
     311    msg += """;{app} directory is not deleted because it has user files.  """ 
     312    msg += """Then the application is installed into the\n""" 
     313    msg += """; existing directory, user files are deleted, and the """ 
     314    msg += """application is un-installed again.  Without the\n""" 
     315    msg += """; directive below, {app} will not be deleted because Inno Setup """ 
     316    msg += """did not create it during the previous\n""" 
     317    msg += """; installation.\n""" 
     318    msg += """Type: dirifempty; Name: "{app}"\n""" 
     319    msg += """\n"""   
     320    return msg 
    281321 
    282322if __name__ == "__main__": 
    … …  
    312352    TEMPLATE += write_dirs() 
    313353    TEMPLATE += write_code() 
     354    TEMPLATE += write_uninstalldelete() 
    314355    path = '%s.iss' % str(INSTALLER_FILE) 
    315356    f = open(path,'w')  

  • sansview/installer_new.iss

    r8ab3302 raade98e  
    6262[Tasks] 
    6363Name: "desktopicon";    Description: "{cm:CreateDesktopIcon}";  GroupDescription: "{cm:AdditionalIcons}";       Flags: unchecked 
    64 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; 
     64Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}";     GroupDescription: "{cm:AdditionalIcons}"; 
    6565 
    6666 
    … …  
    6868Source: "dist\SansView.exe";    DestDir: "{app}";       Flags: ignoreversion 
    6969Source: "dist\*";       DestDir: "{app}";       Flags: ignoreversion recursesubdirs createallsubdirs 
    70 Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sansview\plugin_models";    Flags: recursesubdirs createallsubdirs  
    71 Source: "dist\config\custom_config.py"; DestDir: "{userappdata}\..\.sansview\config";   Flags: 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 
    7272;       NOTE: Don't use "Flags: ignoreversion" on any shared system files 
    7373 
    7474[Icons] 
    75 Name: "{group}\SansView";       Filename: "{app}\SansView.exe"; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico" 
     75Name: "{group}\SansView";       Filename: "{app}\SansView.exe"; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico"  
    7676Name: "{group}\{cm:UninstallProgram, SansView}";         Filename: "{uninstallexe}"  
    77 Name: "{commondesktop}\SansView-2.0.1"; Filename: "{app}\SansView.exe"; Tasks: desktopicon; WorkingDir: "{app}" ; IconFilename: "{app}\images\ball.ico" 
    78 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\SansView-2.0.1"; Filename: "{app}\SansView"; Tasks: quicklaunchicon; WorkingDir: "{app}"; IconFilename: "{app}\images\ball.ico" 
     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"  
    7979 
    8080 
    … …  
    127127end; 
    128128 
     129 
    129130[UninstallDelete] 
    130131; Delete directories and files that are dynamically created by the application (i.e. at runtime). 
    … …  
    137138; installation. 
    138139Type: dirifempty; Name: "{app}" 
     140 
Note: See TracChangeset for help on using the changeset viewer.