[Winmerge-svn] SF.net SVN: winmerge:[7095] trunk/Installer/InnoSetup/WinMerge.iss

[<ki...@us...>]

Revision: 7095
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7095&view=rev
Author:   kimmov
Date:     2010-01-12 21:45:51 +0000 (Tue, 12 Jan 2010)

Log Message:
-----------
Update new ShellExtension build folders to InnoSetup installer.

Modified Paths:
--------------
    trunk/Installer/InnoSetup/WinMerge.iss

Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss	2010-01-12 20:39:43 UTC (rev 7094)
+++ trunk/Installer/InnoSetup/WinMerge.iss	2010-01-12 21:45:51 UTC (rev 7095)
@@ -375,10 +375,10 @@
 Source: {#Runtime_MFC_Manifest}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
 
 ; Shell extension
-Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
-Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64
+Source: ..\..\Build\ShellExtension\release mindependency\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
+Source: ..\..\Build\ShellExtension\unicode release mindependency\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64
 ; 64-bit version of ShellExtension
-Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
+Source: ..\..\Build\ShellExtension\x64 release\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
 
 ; Expat dll
 Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.