Changeset 2532

Timestamp:

2001-06-13T10:56:14+12:00 (23 years ago)

Author:

cs025

Message:

Added better reporting of installation.

Location:

trunk/gsinstaller

Files:

• unInstall.cpp (modified) (5 diffs)
• unInstall.h (modified) (1 diff)

trunk/gsinstaller/unInstall.cpp

@@ -25 +25 @@
 
     unInstallCommand command("InstallRoot");
-    command.addParameter(this->logfileName);
+    // Get the parent directory of the log file, and store it as the root
+    FilePath p(this->logfileName);
+    FilePath *parent = p.parent();
+    command.addParameter(parent->pathString());
+    delete parent;
 
     if (this->modules["default"].begin()->command != "InstallRoot")
@@ -66 +70 @@
     }
 
-    // open the log file 
+    // open the log file
     this->logfile.open(this->logfileName.c_str(), ios::in);
 #ifndef __BORLANDC__
@@ -76 +80 @@
         // Get the commands into this object from the existing log file
         while ((command = this->readCommand(params)) != "")
-        {   if (command[0] == '[' && command[command.length()-1] == ']')
+        {  if (command[0] == '[' && command[command.length()-1] == ']')
             { this->setModule(command.substr(1, command.length() - 2));
             }
             else
             {   unInstallCommand action(command, params);
+
                 this->storeCommand(action);
             }
@@ -104 +109 @@
 
 bool installManager::storeCommand(unInstallCommand &command)
-{ this->modules[this->currentModule].push_back(command);
+{
+    this->modules[this->currentModule].push_back(command);
+
     this->changed = true; // set the "changed" flag
     return true;
@@ -238 +245 @@
   return command;
 }
-
+void installManager::abortLog()
+{   this->changed = false;
+}
 bool installManager::recordLog()
 {   // just return if there are no changes to record

trunk/gsinstaller/unInstall.h

@@ -76 +76 @@
   bool readLog();
   bool recordLog();
+  void abortLog();
   void setModule(string moduleName);
   bool storeCommand(unInstallCommand &command);