maxb@tigris.org writes:
> Modified:
> trunk/packages/windows-innosetup/svn.iss
>
> Log:
> Merge the innosetup-hsuninsfix-5x-1.2.x branch into trunk.
> The original log message (by josander) for the change concerned is:
>
> Windows Installer fixes from Han-soft: Add/Repair/Remove and "InstallDelete"
>
> Han-soft (http://www.han-soft.com), the maker of UninsHs, have sent me a
> bugfix for the installer's Add/Repair/Remove system and the [InstallDelete] of
> the Inno Setup Script.
>
> Thank you very much.
>
> * packages/win32-innosetup/svn.iss: Changed accordingly.
^^^^^
"windows"
(Thanks for doing this merge, though -- I was about to go do it, but
fortunately read commit emails first.)
-Karl
> Modified: trunk/packages/windows-innosetup/svn.iss
> Url: http://svn.collab.net/viewcvs/svn/trunk/packages/windows-innosetup/svn.iss?rev=14830&p1=trunk/packages/windows-innosetup/svn.iss&p2=trunk/packages/windows-innosetup/svn.iss&r1=14829&r2=14830
> ==============================================================================
> --- trunk/packages/windows-innosetup/svn.iss (original)
> +++ trunk/packages/windows-innosetup/svn.iss Tue May 24 17:19:45 2005
> @@ -98,7 +98,7 @@
>
> ;Helpers ---------------------------------------------------------------------
> Source: {#= path_svnpath}\svnpath.exe; DestDir: {app}\helpers; Flags: ignoreversion
> -Source: UninsHs.exe; DestDir: {app}; Flags: ignoreversion onlyifdoesntexist
> +Source: UninsHs.exe; DestDir: {app}; Flags: restartreplace
>
> ; Debug symbols;
> #ifdef inc_dbgsyms
> @@ -123,7 +123,8 @@
>
> ; Reinstall, repair and uninstall with UninsHS
> FileName: {app}\UninsHs.dat; Section: Common; Key: Software; String: Subversion
> -FileName: {app}\UninsHs.dat; Section: Common; Key: Install; String: svn-{#= svn_version}-setup.exe
> +FileName: {app}\UninsHs.dat; Section: Common; Key: Install; String: {srcexe}
> +
> FileName: {app}\UninsHs.dat; Section: Common; Key: Language; String: {language}
> FileName: {app}\UninsHs.dat; Section: Common; Key: Remove; String: {uninstallexe}
> FileName: {app}\UninsHs.dat; Section: Common; Key: Group; String: {groupname}
> @@ -152,8 +153,39 @@
> Name: custom; Description: Custom Installation; Flags: iscustom
>
> [Components]
> -Name: main; Description: Subversion application files; Types: standard custom full
> -Name: pdb; Description: Debug Symbol Files; Types: full custom
> +Name: main; Description: Subversion application files; Types: standard custom full; flags: disablenouninstallwarning
> +;or
> +;Name: main; Description: Subversion application files; Types: standard custom full; flags: fixed
> +
> +Name: pdb; Description: Debug Symbol Files; Types: full custom flags: disablenouninstallwarning
> +
> +[InstallDelete]
> +
> +;If add "disablenouninstallwarning" flag to "main" in [Components], use these lines:
> +Type: files; Name: {app}\Readme.txt
> +Type: files; Name: {app}\W32notes.txt
> +Type: files; Name: {app}\svn-proxy-template.reg
> +Type: files; Name: {app}\Buildnotes.txt
> +Type: files; Name: {app}\Buildnotes.txt
> +Type: filesandordirs; Name: {app}\bin
> +Type: filesandordirs; Name: {app}\iconv
> +#ifdef inc_locale
> +Type: filesandordirs; Name: {app}\share\locale
> +#endif
> +Type: files; Name: {app}\BerkeleyLicense.txt
> +Type: filesandordirs; Name: {app}\doc
> +Type: filesandordirs; Name: {app}\helpers
> +Type: filesandordirs; Name: {app}\httpd
> +
> +;If add "fixed" flag to "main" in [Components], use these lines:
> +;Type: files; Name: {app}\svn.pdb
> +;Type: files; Name: {app}\svnadmin.pdb
> +;Type: files; Name: {app}\svnserve.pdb
> +;Type: files; Name: {app}\svnlook.pdb
> +;Type: files; Name: {app}\svnversion.pdb
> +;Type: files; Name: {app}\svndumpfilter.pdb
> +;Type: filesandordirs; Name: {app}\httpd
> +;Type: files; Name: {app}\iconv\*.pdb
> #endif
>
> [Registry]
> @@ -171,7 +203,7 @@
>
> [Run]
> Filename: {app}\helpers\svnpath.exe; Parameters: "add ""{app}\bin"""; StatusMsg: Editing the path...
> -Filename: {app}\UninsHs.exe; Parameters: /r; Flags: runminimized
> +Filename: {app}\UninsHs.exe; Parameters: /r; Flags: runminimized runhidden nowait
>
> [UninstallRun]
> Filename: {app}\helpers\svnpath.exe; Parameters: "remove ""{app}\bin"""
> @@ -181,4 +213,3 @@
>
> [Code]
> #include "is_main.pas"
> -
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 25 21:10:23 2005