Drop ClearCase from Installer

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index 0e12057..8c5ac62 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -294,7 +294,6 @@ Name: modifypath; Description: {cm:AddToPath}; GroupDescription: {cm:OptionalFea
 Name: TortoiseCVS; Description: {cm:IntegrateTortoiseCVS}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseCVSInstalled\r
 Name: TortoiseGit; Description: {cm:IntegrateTortoiseGit}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseGitInstalled; MinVersion: 0,5.0.2195sp3\r
 Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3\r
-Name: ClearCase; Description: {cm:IntegrateClearCase}; GroupDescription: {cm:OptionalFeatures}; Check: ClearCaseInstalled\r
 Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked\r
 Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; OnlyBelowVersion: 0,6.1\r
 \r
@@ -1092,58 +1091,6 @@ Begin
     Result := ExpandConstant('{app}\') + ExeName(Unused);\r
 End;\r
 \r
-{Returns ClearCase external tools configuration file name}\r
-Function ClearCaseMapFile(): string;\r
-Begin\r
-    if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Rational Software\', 'RSINSTALLDIR', Result) then\r
-    begin\r
-        Result := {pf} + '\Rational\';\r
-    end;\r
-    Result := Result + 'ClearCase\lib\mgrs\map';\r
-End;\r
-\r
-{Determines whether or not Rational ClearCase is installed}\r
-Function ClearCaseInstalled(): boolean;\r
-Begin\r
-    Result := FileExists(ClearCaseMapFile());\r
-End;\r
-\r
-{Intergrate WinMerge as ClearCase external diff tool}\r
-Procedure IntegrateClearCase(OldExe: String; NewExe: String);\r
-Var\r
-    MapFile: TStringList;\r
-    FileName: String;\r
-    I: Integer;\r
-    BakFile: String;\r
-\r
-Begin\r
-    FileName := ClearCaseMapFile();\r
-    {Create a backup file of the original file first time it gets modified}\r
-    BakFile := FileName + '.original';\r
-    if not FileExists(BakFile) then\r
-    begin\r
-        FileCopy(FileName, BakFile, True);\r
-    end;\r
-    MapFile := TStringList.Create();\r
-    {Read the entire map file to a string list}\r
-    MapFile.LoadFromFile(FileName);\r
-    if MapFile.Count > 0 then\r
-    begin\r
-        for I := 0 to MapFile.Count do\r
-        begin\r
-            {Search for the 'text_file_delta xcompare ...' line}\r
-                       if (MapFile.Strings[I][1] <> ';') and (Pos('text_file_delta', MapFile.Strings[I]) > 0) and (Pos('xcompare', MapFile.Strings[I]) > 0) then\r
-                       begin\r
-                               {Replace old executable name with a new executable name}\r
-                               MapFile.Strings[I] := ReplaceSubString(MapFile.Strings[I], OldExe, NewExe);\r
-                           break;\r
-                       end;\r
-               end;\r
-               { Save the modified file. }\r
-               MapFile.SaveToFile(FileName);\r
-       end;\r
-End;\r
-\r
 // Add WinMerge to system path.\r
 // This requires certain order of things to work:\r
 // #1 ModPathDir function must be first (it gets called by others)\r
@@ -1198,10 +1145,6 @@ Begin
     begin\r
                if IsTaskSelected('modifypath') then\r
                        ModPath();\r
-        if IsTaskSelected('ClearCase') then\r
-        begin\r
-            IntegrateClearCase('..\..\bin\cleardiffmrg.exe', WinMergeExeName());\r
-        end;\r
     end;\r
 End;\r
 \r
@@ -1217,12 +1160,6 @@ Begin
                                ModPath();\r
                DeleteFile(appdir + '\uninsTasks.txt')\r
        end;\r
-\r
-    if CurUninstallStep = usPostUninstall then\r
-    begin\r
-      if ClearCaseInstalled() then\r
-        IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');\r
-    end;\r
 End;\r
 \r
 function BooleanToString(Value : Boolean) : String; \r

diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index ebf51f7..bb0aee6 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -297,7 +297,6 @@ Name: modifypath; Description: {cm:AddToPath}; GroupDescription: {cm:OptionalFea
 Name: TortoiseCVS; Description: {cm:IntegrateTortoiseCVS}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseCVSInstalled\r
 Name: TortoiseGit; Description: {cm:IntegrateTortoiseGit}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseGitInstalled; MinVersion: 0,5.0.2195sp3\r
 Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3\r
-Name: ClearCase; Description: {cm:IntegrateClearCase}; GroupDescription: {cm:OptionalFeatures}; Check: ClearCaseInstalled\r
 Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked\r
 Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; OnlyBelowVersion: 0,6.1\r
 \r
@@ -1075,58 +1074,6 @@ Begin
     Result := ExpandConstant('{app}\') + ExeName(Unused);\r
 End;\r
 \r
-{Returns ClearCase external tools configuration file name}\r
-Function ClearCaseMapFile(): string;\r
-Begin\r
-    if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Rational Software\', 'RSINSTALLDIR', Result) then\r
-    begin\r
-        Result := {pf} + '\Rational\';\r
-    end;\r
-    Result := Result + 'ClearCase\lib\mgrs\map';\r
-End;\r
-\r
-{Determines whether or not Rational ClearCase is installed}\r
-Function ClearCaseInstalled(): boolean;\r
-Begin\r
-    Result := FileExists(ClearCaseMapFile());\r
-End;\r
-\r
-{Intergrate WinMerge as ClearCase external diff tool}\r
-Procedure IntegrateClearCase(OldExe: String; NewExe: String);\r
-Var\r
-    MapFile: TStringList;\r
-    FileName: String;\r
-    I: Integer;\r
-    BakFile: String;\r
-\r
-Begin\r
-    FileName := ClearCaseMapFile();\r
-    {Create a backup file of the original file first time it gets modified}\r
-    BakFile := FileName + '.original';\r
-    if not FileExists(BakFile) then\r
-    begin\r
-        FileCopy(FileName, BakFile, True);\r
-    end;\r
-    MapFile := TStringList.Create();\r
-    {Read the entire map file to a string list}\r
-    MapFile.LoadFromFile(FileName);\r
-    if MapFile.Count > 0 then\r
-    begin\r
-        for I := 0 to MapFile.Count do\r
-        begin\r
-            {Search for the 'text_file_delta xcompare ...' line}\r
-                       if (MapFile.Strings[I][1] <> ';') and (Pos('text_file_delta', MapFile.Strings[I]) > 0) and (Pos('xcompare', MapFile.Strings[I]) > 0) then\r
-                       begin\r
-                               {Replace old executable name with a new executable name}\r
-                               MapFile.Strings[I] := ReplaceSubString(MapFile.Strings[I], OldExe, NewExe);\r
-                           break;\r
-                       end;\r
-               end;\r
-               { Save the modified file. }\r
-               MapFile.SaveToFile(FileName);\r
-       end;\r
-End;\r
-\r
 // Add WinMerge to system path.\r
 // This requires certain order of things to work:\r
 // #1 ModPathDir function must be first (it gets called by others)\r
@@ -1181,10 +1128,6 @@ Begin
     begin\r
                if IsTaskSelected('modifypath') then\r
                        ModPath();\r
-        if IsTaskSelected('ClearCase') then\r
-        begin\r
-            IntegrateClearCase('..\..\bin\cleardiffmrg.exe', WinMergeExeName());\r
-        end;\r
     end;\r
 End;\r
 \r
@@ -1200,12 +1143,6 @@ Begin
                                ModPath();\r
                DeleteFile(appdir + '\uninsTasks.txt')\r
        end;\r
-\r
-    if CurUninstallStep = usPostUninstall then\r
-    begin\r
-      if ClearCaseInstalled() then\r
-        IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');\r
-    end;\r
 End;\r
 \r
 function BooleanToString(Value : Boolean) : String; \r

diff --git a/Installer/WiX/WinMerge.wxs b/Installer/WiX/WinMerge.wxs
index f018293..0fc4d74 100644 (file)
--- a/Installer/WiX/WinMerge.wxs
+++ b/Installer/WiX/WinMerge.wxs
@@ -13,7 +13,6 @@
         * Integrate to...\r
           * TortoiseCVS\r
           * TortoiseSVN\r
-          * ClearCase\r
         * Modify Path\r
       * Don't install 32 bit version von Windows x64\r
       * Install translated readme files\r