[Winmerge-svn] SF.net SVN: winmerge: [4020] branches/R2_6/Installer/InnoSetup

[<ge...@us...>]

Revision: 4020
          http://svn.sourceforge.net/winmerge/?rev=4020&view=rev
Author:   gerundt
Date:     2007-01-08 12:24:54 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
PATCH: [ 1630397 ] Remove "Plugins.txt" from installer

Modified Paths:
--------------
    branches/R2_6/Installer/InnoSetup/Changes.txt
    branches/R2_6/Installer/InnoSetup/WinMerge.iss

Modified: branches/R2_6/Installer/InnoSetup/Changes.txt
===================================================================
--- branches/R2_6/Installer/InnoSetup/Changes.txt	2007-01-08 20:24:20 UTC (rev 4019)
+++ branches/R2_6/Installer/InnoSetup/Changes.txt	2007-01-08 20:24:54 UTC (rev 4020)
@@ -1,3 +1,7 @@
+2007-01-08 Tim
+ PATCH: [ 1630397 ] Remove "Plugins.txt" from installer
+  InnoSetup: WinMerge.iss
+
 2006-12-13 Kimmo
  PATCH: [ 1614056 ] Add new SourceControl filter to installer
   InnoSetup: WinMerge.iss

Modified: branches/R2_6/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMerge.iss	2007-01-08 20:24:20 UTC (rev 4019)
+++ branches/R2_6/Installer/InnoSetup/WinMerge.iss	2007-01-08 20:24:54 UTC (rev 4020)
@@ -291,7 +291,6 @@
 
 Name: {app}\MergePlugins\editor addin.sct; Type: Files; Check: not IsComponentSelected('Plugins')
 Name: {app}\MergePlugins\insert datetime.sct; Type: Files; Check: not IsComponentSelected('Plugins')
-Name: {app}\Docs\Plugins.txt; Type: Files; Check: DontInstallPluginsText
 Name: {app}\MergePlugins; Type: DirIfEmpty; Check: not IsComponentSelected('Plugins')
 
 Name: {app}\Filters\ADAMulti.flt; Type: Files; Check: not IsComponentSelected('Filters')
@@ -374,7 +373,6 @@
 ;Please note IgnoreVersion and CompareTimeStamp are to instruct the installer to not not check for version info and go straight to comparing modification dates
 Source: ..\..\Plugins\dlls\editor addin.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
 Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
-Source: ..\..\Plugins\dlls\Plugins.txt; DestDir: {app}\Docs; DestName: Plugins.txt; Flags: IgnoreVersion CompareTimeStamp; Check: InstallPluginsText; Components: ; Tasks: ; Languages: 
 Source: ..\..\Plugins\dlls\*.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
 
 [INI]
@@ -387,7 +385,6 @@
 ;WinMerge (ANSI) for WinMerge.exe in NT-windows
 Name: {group}\WinMerge (ANSI); Filename: {app}\WinMerge.exe; IconIndex: 0; MinVersion: 0,4; Components: core; Check: not IsWin64
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
-Name: {group}\{cm:PluginsText}; Filename: {app}\Docs\Plugins.txt; IconFileName: {win}\NOTEPAD.EXE Check: InstallPluginsText; Components: Plugins
 Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm; Components: docs
 Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}
 
@@ -786,32 +783,6 @@
     }
 end;
 
-{Install Plugins.txt if plugins are installed}
-Function InstallPluginsText(): Boolean;
-Begin
-    {If Plugins are to be installed then...}
-    If (IsComponentSelected('Plugins') = True) Then
-        {We should install the Plugins.txt File}
-        Result := True
-    Else
-        {The Plugins.txt file should not be installed}
-        Result := False;
-End;
-
-{This function is needed as a check parameter in the [InstallDelete] section unfortunately there's not yet a way to get the Check: parameter to check
-for a false value and respond accordingly}
-Function DontInstallPluginsText(): Boolean;
-Begin
-    {If the Plugins.txt file shouldn't be installed then...}
-    If InstallPluginsText() = False Then
-
-        {This function returns True}
-        Result := True
-    Else
-        {This function returns False}
-        Result := False;
-End;
-
 {Determines whether or not TortoiseCVS is installed}
 Function TortoiseCVSInstalled(): boolean;
 Begin


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