[GExperts-CVS] gexperts/unstable GExperts.iss,1.22,1.23

[Erik B. <eb...@us...>]

Update of /cvsroot/gexperts/gexperts/unstable
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7789

Modified Files:
	GExperts.iss 
Log Message:
Use Application Data to store data files

Index: GExperts.iss
===================================================================
RCS file: /cvsroot/gexperts/gexperts/unstable/GExperts.iss,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- GExperts.iss	1 Apr 2007 03:21:11 -0000	1.22
+++ GExperts.iss	9 Apr 2007 06:09:27 -0000	1.23
@@ -9,7 +9,7 @@
 #else
 ; IDE compiler
   #define Delphi2007
-  #define Version "1.30"
+  #define Version "1.32"
 #endif
 
 #define Product "GExperts"
@@ -82,13 +82,13 @@
 #endif
 
 #ifndef IDEShortName
-  #error Usage: "isppcc.exe GExperts.iss /dDelphi7 /dVersion=1.20"
+  #error Usage: "isppcc.exe GExperts.iss /dDelphi7 /dVersion=1.32"
 #endif
 
-#define FullName   Product +" for "+ IDELongName +" "+ IDEVer
-#define BinaryDir  IDEShortName + IDEVer
-#define DLLName    "GExperts" + DLLSuffix + ".dll"
-#define AppIDValue Product + IDEShortName + IDEVer
+#define FullName    Product +" for "+ IDELongName +" "+ IDEVer
+#define BinaryDir   IDEShortName + IDEVer
+#define DLLName     "GExperts" + DLLSuffix + ".dll"
+#define AppIDValue  Product + IDEShortName + IDEVer
 
 [Setup]
 AllowNoIcons=true
@@ -130,28 +130,42 @@
 [Registry]
 Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\Experts; ValueType: STRING; ValueName: GExperts; ValueData: {app}\{#DLLName}; Flags: uninsdeletevalue; Check: IDEExecuted
 Root: HKLM; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\Experts; ValueType: STRING; ValueName: GExperts; ValueData: {app}\{#DLLName}; Flags: uninsdeletevalue uninsdeletekeyifempty
-Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}\Misc; ValueType: STRING; ValueName: ConfigPath; ValueData: {app}; Check: IDEExecuted
 Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}\Misc; ValueType: STRING; ValueName: HelpFile; ValueData: {app}\GExperts.chm; Check: IDEExecuted
 Root: HKCU; Subkey: Software\GExperts\Debug; ValueType: STRING; ValueName: FilePath; ValueData: {app}\GDebug.exe
 
 [Code]
+procedure DeleteDirAndSettings(Dir: string);
+begin
+  if (Dir <> '') and DirExists(Dir) then
+  begin
+    Dir := AddBackslash(Dir);
+    Deltree(Dir + '*.xml',      False, True, False);
+    Deltree(Dir + '*.fs',       False, True, False);
+    Deltree(Dir + '*.log',      False, True, False);
+    Deltree(Dir + '*.debuglog', False, True, False);
+    Deltree(Dir + '*.gex',      False, True, False);
+    Deltree(Dir + 'Classes.{#DLLSuffix}', True, True, True); // Classes.D6, etc.
+    // Delete this settings directory itself only if it is now empty
+    Deltree(Dir,                 True, False, False);
+  end;
+end;
+
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var
+  DataPath: string;
 begin
   if CurUninstallStep = usPostUninstall then
   begin
+    DataPath := '';
     // Delete the DLL reference even if it was copied from the HKLM tree
     RegDeleteValue(HKEY_CURRENT_USER, 'Software\Borland\{#IDERegName}\{#IDERegVer}.0\Experts', 'GExperts');
     case MsgBox('Do you want to delete all of your GExperts preferences and data files?',
                 mbConfirmation, MB_YESNOCANCEL or MB_DEFBUTTON2) of
       IDYES:
         begin
-          Deltree(ExpandConstant('{app}\*.xml'),      False, True, False);
-          Deltree(ExpandConstant('{app}\*.fs'),       False, True, False);
-          Deltree(ExpandConstant('{app}\*.log'),      False, True, False);
-          Deltree(ExpandConstant('{app}\*.debuglog'), False, True, False);
-          Deltree(ExpandConstant('{app}\*.gex'),      False, True, False);
-          Deltree(ExpandConstant('{app}\Classes.{#DLLSuffix}'), True, True, True);
-          Deltree(ExpandConstant('{app}'),            True, False, False);
+          RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}\Misc', 'ConfigPath', DataPath);
+          DeleteDirAndSettings(DataPath);
+          DeleteDirAndSettings(ExpandConstant('{app}'));
           RegDeleteKeyIncludingSubkeys(HKEY_CURRENT_USER, 'Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}');
         end;
       IDCANCEL: