Changeset 2063 for trunk/gsinstaller

Timestamp:

2001-02-24T04:47:04+13:00 (23 years ago)

Author:

cs025

Message:

Improvements towards fixing Windows 3.1 uninstallation.

Location:

trunk/gsinstaller

Files:

• gsManifest.cpp (modified) (1 diff)
• gsProgman.cpp (modified) (3 diffs)
• gsinstall.cpp (modified) (15 diffs)

trunk/gsinstaller/gsManifest.cpp

@@ -307 +307 @@
       if (!RemoveDirectory(params[0].c_str()))
       {
-        MessageBox(0, "Remove failed", params[0].c_str(), MB_OK);
             this->removeFailed.add(params[0]);
       }

trunk/gsinstaller/gsProgman.cpp

@@ -221 +221 @@
     {
       // flag error by returning false
+    MessageBox(0, "Couldn't create group", "Greenstone Installer", MB_OK);
       return false;
     }
@@ -324 +325 @@
       return false;
     }
-      
+
+      // if the item is there already, mark it for replacement; this may fail,
+      // so we don't test for success
+      sprintf(buffer, "[ReplaceItem(%s)]", iconName.c_str());
+      DDEShellCommand(this->instance, buffer);
+
       // and now add the item itself to the active (given) group
       sprintf(buffer, "[AddItem(%s,%s)]", iconDestination.c_str(), iconName.c_str());
@@ -330 +336 @@
     {
       // TODO: again work out what the problems could be
+    MessageBox(0, "Can't create item", "Greenstone Installer", MB_OK);
       return false;
     }

trunk/gsinstaller/gsinstall.cpp

@@ -64 +64 @@
   gsProgramManager *progman; // program manager connection
 
+  string setupExe; // form to use for gs(s)setup.exe
+
   void getSourcePath();
   void getExistingInstall();
@@ -73 +75 @@
   FilePath *installPath();
   FilePath *installSourcePath() { return this->sourcePath; }
+  string setupExeLeaf() { return this->setupExe; }
   bool copyFiles();
   bool updateRegistry();
@@ -108 +111 @@
 GSInstall::GSInstall(bool uninstall)
   : installManager()
-{ 
+{
   // get the installation configuration file
   this->configFile = new configureFile("install.cfg");
@@ -119 +122 @@
   // don't attempt this with windows 3.1
   if (!this->platform.isWindows32s())
-    { 
+    {
       // get the registry
       this->gsRegister  = new gsRegistry(*this, *this->configFile);
+      this->setupExe    = "gssetup.exe";
     }
   else
-    {   
+    {
       // TODO: in windows 3.1 we can't use the register as it isn't fully/properly
       //       implemented; we must get the existing path information from elsewhere
       this->gsRegister = new gsRegistry(*this, *this->configFile);
+      this->setupExe   = "gsetup.exe";
     }
 
@@ -137 +142 @@
   // "source" directory - see later
   if (uninstall == false)
-    { 
+    {
       this->getExistingInstall();
     }
@@ -146 +151 @@
   // if doing an uninstall we now know where the "uninstall" is
   if (uninstall == true)
-    {   
+    {
       this->collectPath = this->sourcePath;
     }
@@ -152 +157 @@
   // get the manifest and program manager objects
   if (uninstall)
-    {   
+    {
       this->manifest = new gsManifest(*this);
     }
   else
-    { 
+    {
       this->manifest = new gsManifest(*this, *this->sourcePath);
     }
@@ -278 +283 @@
       //      FilePath *serverPath = new FilePath(this->destinationPath->pathString(), "server.exe");
       FilePath *serverPath = new FilePath(this->destinationPath->pathString(), "server.exe");
-      FilePath *setupPath = new FilePath(this->destinationPath->pathString(), "gssetup.exe");
+      FilePath *setupPath = new FilePath(this->destinationPath->pathString(), this->setupExe);
       FilePath *logPath = new FilePath(this->destinationPath->pathString(), "install.log");
       string exeKeyPath, uninstallCmd, uninstallKeyPath;
@@ -384 +389 @@
     {
       // copy this and install.log to temporary directory and restart
-      FilePath exePath(*this->sourcePath, "gssetup.exe");
+      FilePath exePath(*this->sourcePath, this->setupExe);
       FilePath logPath(*this->sourcePath, "install.log");
 
-      FilePath exeDest(tempPath, "gssetup.exe");
+      FilePath exeDest(tempPath, this->setupExe);
       FilePath logDest(tempPath, "install.log");
 
@@ -513 +518 @@
 
 
-    FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
+      FilePath uninstallPath(this->destinationPath->pathString(), this->setupExe);
     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
-                                              // 
+                                              //
                                               // TODO: reinstate this with Win3.1
                                               // happy code
@@ -527 +532 @@
     }
     else
-    {   MessageBox(0, uninstallPath.cString(), logPath.cString(), MB_OK);
+    {   if (!this->progman->addIcon(groupName, "Uninstall", uninstallPath.pathString() + " -u " + logPath.pathString(), "",
+                  "Remove this Greenstone collection"))
+      {
+      }
     }
       // disconnect from program manager
@@ -632 +640 @@
       destExePath = this->collectPath;
     }
-  FilePath destExeFile(*destExePath, "gssetup.exe");
+    FilePath destExeFile(*destExePath, this->setupExe);
 
   if (this->platform.isWindows32s() == false) // NB: Don't copy the setup executable
@@ -640 +648 @@
         return false;
         }
+  }
+  else
+  { // Windows 3.1 has a peculiar behaviour on calling CopyFile on an .exe;
+    // it doesn't. (Copy the file); thus we copy to an non-exe file and then
+    // rename it into an exe file; this works.
+    FilePath intExeFile(*destExePath, "gsetup.ex");
+    if (!CopyFile(srcExeFile.cString(), intExeFile.cString(), false))
+        {
+        return false;
+        }
+    MoveFile(intExeFile.cString(), destExeFile.cString());
   }
   return true;
@@ -985 +1004 @@
           // get it's parent to find where the gssetup executable will be
           FilePath *logParent = logPath.parent();
-          FilePath uninstallPath(*logParent, "gssetup.exe");
+          FilePath uninstallPath(*logParent, install.setupExeLeaf());
 
           // delete the gssetup executable
           DeleteFile(uninstallPath.cString());
 
-        MessageBox(0, logParent->cString(), "Removing", MB_OK);
+            // kill the original log parent directory if it should have died
           if (install.removeFailed(logParent->pathString()))
             {
@@ -1100 +1119 @@
            LPSTR CmdLine,
            int CmdShow)
-{ 
+{
   MSG msg;
 
-  app_cmdLine = (char *) malloc(lstrlen(CmdLine) + 1);
-  lstrcpy(app_cmdLine, CmdLine);
+    gsPlatform p;
+
+  if (p.isWindows32s())
+  {
+    char filename[512];
+      FilePath *exePath;
+    FilePath *dirPath;
+
+        // get the filepath of this executable
+        GetModuleFileName(0, filename, 512);
+        exePath = new FilePath(filename);
+
+        // get the parent (i.e. the folder containing this executable) for the source
+        // folder
+        dirPath = exePath->parent();
+    delete exePath;
+
+    exePath = new FilePath(dirPath->cString(), "install.log");
+
+    if (exePath->exists())
+    { app_cmdLine = (char *) malloc(256);
+      lstrcpy(app_cmdLine, "gsetup.exe -u ");
+      lstrcat(app_cmdLine, exePath->cString());
+        }
+    else
+    {   app_cmdLine = (char *) malloc(1);
+        app_cmdLine[0] = '\0';
+        }
+
+    delete exePath;
+    delete dirPath;
+  }
+  else
+  { app_cmdLine = (char *) malloc(lstrlen(CmdLine) + 1);
+    lstrcpy(app_cmdLine, CmdLine);
+    }
 
   app_instance = Current;