Changeset 2288 for trunk/gsinstaller

Timestamp:

2001-04-06T03:17:03+12:00 (23 years ago)

Author:

cs025

Message:

Improvements to destroy the gsdlsite.cfg file as required at uninstall.

Location:

trunk/gsinstaller

Files:

• gsProfile.cpp (modified) (4 diffs)
• gsProfile.h (modified) (1 diff)
• gsinstall.cpp (modified) (1 diff)
• unInstall.cpp (modified) (3 diffs)
• unInstall.h (modified) (1 diff)

trunk/gsinstaller/gsProfile.cpp

@@ -1 +1 @@
 #include "gsProfile.h"
+#include "FilePath.h"
 
 #include <stdio.h>
@@ -5 +6 @@
 gsProfile::gsProfile(installManager &manager, string fileName)
   : installAgent(manager)
-{   this->fileName  = fileName;
+{ FilePath path(fileName);
+
+    this->fileName  = fileName;
+    if (path.exists() == false)
+  { this->logAction("ProfileCreate", "", "", "");
+  }
 }
 
@@ -19 +25 @@
 
 bool gsProfile::undoAction(string actionName, stringArray &params)
-{   if (actionName == "ProfileAddListMember")
-    {   this->removeListMember(params[0], params[1], params[2]);
+{ if (actionName == "ProfileCreate")
+  { if (this->fileName == params[0])
+    {   DeleteFile(params[0].c_str());
+    }
+  }
+  else if (actionName == "ProfileAddListMember")
+  { this->removeListMember(params[0], params[1], params[2]);
+    return true;
+  }
+  else if (actionName == "ProfileSetItem")
+  { this->removeString(params[1], params[2]);
     return true;
   }
@@ -90 +105 @@
     return false;
   }
+  this->logAction("ProfileSetItem", sectionName, itemName, itemValue);
   return true;
 }
+
+bool gsProfile::removeString(string sectionName, string itemName)
+{ if (!WritePrivateProfileString( sectionName.c_str(), itemName.c_str(),
+                                    NULL, this->fileName.c_str()))
+    { MessageBox(0, "Failed", itemName.c_str(), MB_OK);
+    return false;
+  }
+  return true;
+}

trunk/gsinstaller/gsProfile.h

@@ -30 +30 @@
   bool addListMember(string sectionName, string listName, string listMember);
   bool writeString(string sectionName, string itemName, string itemValue);
+  bool removeString(string sectionName, string itemName);
   bool undoAction(string actionName, stringArray &params);
 };

trunk/gsinstaller/gsinstall.cpp

@@ -425 +425 @@
   this->manifest = new gsManifest(*this); // get a manifest manager
 
-  iniPath = new FilePath(this->collectPath->pathString(), "gsdlsite.cfg");
+  iniPath = new FilePath(this->installRoot(), "gsdlsite.cfg");
   gsProfile gsdlProfile(*this, iniPath->pathString());
 

trunk/gsinstaller/unInstall.cpp

@@ -24 +24 @@
     {   HANDLE fHandle;
 
+    unInstallCommand command("InstallRoot");
+    command.addParameter(this->logfileName);
+
+    if (this->modules["default"].begin()->command != "InstallRoot")
+    {   this->modules["default"].insert(this->modules["default"].begin(), command);
+    }
         fHandle = CreateFile(this->logfileName.c_str(), GENERIC_READ | GENERIC_WRITE,
                          FILE_SHARE_WRITE, NULL, CREATE_NEW,
@@ -33 +39 @@
         }
         return false;
+    }
+    else
+    {   if (this->modules["default"].begin()->command == "InstallRoot")
+        {   this->logfileName = this->modules["default"].begin()->parameters[0];
+      }
     }
     return true;
@@ -288 +299 @@
 }
 
+string installManager::installRoot()
+{   if (this->modules["default"].begin()->command != "InstallRoot")
+        return "";
+    return this->modules["default"].begin()->parameters[0];
+}
+
 installManager::~installManager()
 {   this->recordLog();

trunk/gsinstaller/unInstall.h

@@ -80 +80 @@
   string popCommand(stringArray &params);
   bool isEmpty();
+  string installRoot();
   ~installManager();
 };