Changeset 2013 for trunk/gsinstaller

Timestamp:

2001-02-20T00:11:32+13:00 (23 years ago)

Author:

cs025

Message:

Updates and fixes to permit removal of the main install directory successfully.

Location:

trunk/gsinstaller

Files:

• gsManifest.cpp (modified) (2 diffs)
• gsManifest.h (modified) (2 diffs)
• gsinstall.cpp (modified) (10 diffs)
• unInstall.cpp (modified) (1 diff)

trunk/gsinstaller/gsManifest.cpp

@@ -305 +305 @@
   if (actionName == "Manifest.CreateDir" || actionName == "CreateDir")
     {
-      RemoveDirectory(params[0].c_str());
+      if (!RemoveDirectory(params[0].c_str()))
+      {
+        MessageBox(0, "Remove failed", params[0].c_str(), MB_OK);
+            this->removeFailed.add(params[0]);
+      }
       return true;
     }
@@ -314 +318 @@
     }
   return false;
+}
+
+bool gsManifest::undoFailed(string path)
+{
+    return this->removeFailed.includes(path);
 }
 

trunk/gsinstaller/gsManifest.h

@@ -26 +26 @@
   strArrayMap manifests;
   pathStringArrayMap selected;
+  stringArray removeFailed;
 
   bool getManifestLine(char *line, string &macro);
@@ -36 +37 @@
   void logAction(string actionName, string source, string dest);
   bool undoAction(string actionName, stringArray &params);
+  bool undoFailed(string path);
   void expandGroupInstance(const string &parentgroup, string groupName);
   void expandGroup(const string &group);

trunk/gsinstaller/gsinstall.cpp

@@ -72 +72 @@
   FilePath *collectionPath();
   FilePath *installPath();
+  FilePath *installSourcePath() { return this->sourcePath; }
   bool copyFiles();
   bool updateRegistry();
@@ -78 +79 @@
   bool updateSetupExe();
   bool installNetscape();
+  bool removeFailed(string file) { return this->manifest->undoFailed(file); }
   void setDestination();
   bool setUninstall();
@@ -387 +389 @@
       FilePath exeDest(tempPath, "gssetup.exe");
       FilePath logDest(tempPath, "install.log");
-      
+
       CopyFile(exePath.cString(), exeDest.cString(), false);
       CopyFile(logPath.cString(), logDest.cString(), false);
@@ -436 +438 @@
     }
     }
+  
 }
 
@@ -510 +513 @@
 
 
-    if (this->platform.isWindows32s() == false) // NB: don't add this shortcut under
+    FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
+    FilePath logPath(this->destinationPath->pathString(), "install.log");
+    if (this->platform.isWindows32s() == false) // NB: don't add this shortcut under
                                               // Windows32s as it causes a crash
                                               // 
@@ -516 +521 @@
                                               // happy code
   {
-      FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
-      FilePath logPath(this->destinationPath->pathString(), "install.log");
       if (!this->progman->addIcon(groupName, "Uninstall", uninstallPath.pathString(), " -u " + logPath.pathString(),
                   "Remove this Greenstone collection"))
       {
       }
+    }
+    else
+    {   MessageBox(0, uninstallPath.cString(), logPath.cString(), MB_OK);
     }
       // disconnect from program manager
@@ -749 +755 @@
 
         case dirpath_OPTION:
-      ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->setOption(IsDlgButtonChecked(Dialog, dirpath_OPTION));
+      ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->setOption(IsDlgButtonChecked(Dialog, dirpath_OPTION) == BST_CHECKED);
       if (HIWORD(wParam) == BN_CLICKED && false)
         // don't do the enable/disable these days
@@ -958 +964 @@
         string logPathString(at);
         FilePath logPath(logPathString);
-        
+
         GSInstall install(true);
         // if we're running in the temporary directory, do the uninstall
@@ -980 +986 @@
           FilePath *logParent = logPath.parent();
           FilePath uninstallPath(*logParent, "gssetup.exe");
-          
+
           // delete the gssetup executable
           DeleteFile(uninstallPath.cString());
-          
+
+        MessageBox(0, logParent->cString(), "Removing", MB_OK);
+          if (install.removeFailed(logParent->pathString()))
+            {
+                RemoveDirectory(logParent->cString());
+            }
+
           // dispose of the parent directory information
           delete logParent;
         }
+
           // if not, then overwrite the original log with the modified one
           else
@@ -1011 +1024 @@
         install.copyFiles();       // caused page fault; Windows 3.1
         install.updateProgman();   // caused divide overflow; Windows 3.1
-    install.updateRegistry();
+        install.updateRegistry();
         install.updateProfiles();
         install.updateSetupExe();  // caused bomb-out of Windows; 3.1

trunk/gsinstaller/unInstall.cpp

@@ -245 +245 @@
     if (!this->logfile.rdbuf()->is_open())
 #endif
-    {   MessageBox(0, "Unable to open log file", "Test", MB_OK);
+    {   MessageBox(0, "Unable to open log file", this->logfileName.c_str(), MB_OK);
     }