Changeset 1475 for trunk/gsinstaller/gsinstall.cpp

Timestamp:

2000-08-31T00:42:59+12:00 (24 years ago)

Author:

cs025

Message:

Updated sources with most of uninstall added

File:

• trunk/gsinstaller/gsinstall.cpp (modified) (27 diffs)

trunk/gsinstaller/gsinstall.cpp

@@ -29 +29 @@
 
 bool            config_complete = false;
-// static char app_tmptext[100] = "George";
 
 typedef vector<dirSelector *> dirSelVector;
 
-class GSInstall
+class GSInstall : public installManager
 { private:
-        configureFile   *   configFile;
-        FilePath *          collectPath;
-    FilePath *          installToPath;
-    FilePath *          sourcePath;
-    FilePath *          gsdlSourcePath;
-    FilePath *          destinationPath;
-    FilePath *          dataDestPath;
+        configureFile   *   configFile;             // the installation configure file
+
+        FilePath *          collectPath;            // where the collection is currently installed
+    FilePath *          installToPath;      // the first cut at a destination folder
+    FilePath *          sourcePath;             // the root source folder
+    FilePath *          gsdlSourcePath;     // the gsdl folder in the source area
+    FilePath *          destinationPath;    // where the executables will be installed to
+    FilePath *          dataDestPath;           // where the collection data files will go
+
+    bool                        installVolume;      // whether to install collection data
+    bool                        installFullVolume;// whether to install all collection data
+
+    dirSelVector        selectedDirs;           // configuration objects
+
+    gsPlatform                  platform;           // platform information
+    gsRegistry *                gsRegister;     // registry
+    gsManifest *                manifest;           // manifest of files
+    gsProgramManager  * progman;            // program manager connection
+
+    void                getSourcePath();
+    void                getExistingInstall();
+    public:
     bool            installExe;
-    bool                        installVolume;
-    bool                        installFullVolume;
-    gsPlatform          platform;
-    unInstaller *       unInstall;
-
-    dirSelVector        selectedDirs;
-
-    gsRegistry *        gsRegister;
-    gsManifest *        manifest;
-
-    void                getSourcePath();
-    public:
-        GSInstall();
+
+        GSInstall(bool uninstall);
     FilePath *  collectionPath();
     FilePath *  installPath();
@@ -64 +67 @@
     bool                installNetscape();
     void                setDestination();
+    void                setUninstall();
+    void                uninstall();
     void                setManifest();
     void                addSelectedDir(dirSelector *selector);
@@ -87 +92 @@
  * THe source path is also discovered.
  */
-GSInstall::GSInstall()
-{ gsPlatform    platform;
-
-    // get the installation configuration file
+GSInstall::GSInstall(bool uninstall)
+    : installManager()
+{ // get the installation configuration file
     this->configFile    = new configureFile("install.cfg");
 
-  // initialise the pointers that we test later this fn.
-  this->unInstall       = NULL;
+    // set up "default" installation bits
+  this->installToPath   = new FilePath("C:\\GSDL");
+    this->collectPath   = NULL;
+  this->installExe  = true; // we must install the exe files
 
     // don't attempt this with windows 3.1
-  if (!platform.isWindows32s() || TRUE)
+  if (!this->platform.isWindows32s())
   { // get the registry
-      this->gsRegister  = new gsRegistry(*this->configFile);
-
-    // TODO: in windows 3.1 we can't use the register as it isn't fully/properly
+      this->gsRegister  = new gsRegistry(*this, *this->configFile);
+  }
+  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
-    if (gsRegister->collectionInstalled())
-      { // TODO: check if receptionist etc should be replaced or not
-
-        // TODO: check build version of the volume
-
-        // Get location of the library executable from the registry; this
-        // is thence used to get the location of gsdl.ini etc.
-        this->collectPath   = this->gsRegister->collectionPath();
-        this->installToPath = this->collectPath;
-
-        // TODO: if collectPath == NULL generate error
-
-      // get uninstall information from destination location
-      FilePath *uninstallPath   = new FilePath(this->collectPath->cString(), "uninstl.cfg");
-      this->unInstall   = new unInstaller(uninstallPath->cString());
-      delete uninstallPath;
-
-      // we don't need to install the exe files
-        this->installExe = false||true;
-      }
-    else
-      { this->installToPath = new FilePath("C:\\GSDL");
-            this->collectPath   = NULL;
-        // we must install the exe files
-          this->installExe  = true;
-    }
-  }
-  else
-  { // TODO: do windows 3.1 stuff here
-    this->installToPath = new FilePath("C:\\GSDL");
-    this->installExe = true;
-    this->collectPath   = NULL;
-  }
-
-  if (this->unInstall   == NULL)
-  { this->unInstall = new unInstaller("");
+    this->gsRegister    = new gsRegistry(*this, *this->configFile);
   }
 
@@ -145 +117 @@
   this->installFullVolume   = true;
 
+    // detect any existing installation; unnecessary in uninstall (it's the
+  // "source" directory - see later
+  if (uninstall == false)
+  { this->getExistingInstall();
+  }
+
   // get where we are installing from
   this->getSourcePath();
 
-  // get the manifest
-  this->manifest = new gsManifest(*this->sourcePath);
+  // if doing an uninstall we now know where the "uninstall" is
+  if (uninstall == true)
+  { this->collectPath   = this->sourcePath;
+  }
+
+  // get the manifest and program manager objects
+  if (uninstall)
+  { this->manifest = new gsManifest(*this);
+  }
+  else
+  { this->manifest = new gsManifest(*this, *this->sourcePath);
+  }
+  this->progman  = new gsProgramManager(*this);
 
   // tell manifest the number of bits in the raw windows environment; this may
@@ -165 +154 @@
   }
 */
-  // inform manifests of collection directory name
-  char *buffer;
-  this->configFile->get("CollectionDirName", &buffer);
-  this->manifest->expandMacro("COLDIRNAME", buffer);
-  delete buffer;
+  // inform manifest of collection directory name
+  string colDir;
+  colDir = this->configFile->getString("CollectionDirName");
+  if (colDir != "")
+  { this->manifest->expandMacro("COLDIRNAME", colDir);
+  }
+}
+
+/**
+ * Detect the presence of an existing installation
+ */
+void GSInstall::getExistingInstall()
+{   if (!this->platform.isWindows32s())
+    {   if (gsRegister->collectionInstalled())
+      { // TODO: check if receptionist etc should be replaced or not
+
+        // TODO: check build version of the volume
+
+        // Get location of the library executable from the registry; this
+        // is thence used to get the location of gsdl.ini etc.
+        this->collectPath   = this->gsRegister->collectionPath();
+      if (this->collectPath != "")
+      { this->installToPath = this->collectPath;
+
+        // we don't need to install the exe files
+            this->installExe = false;
+      }
+      }
+  }
 }
 
@@ -189 +202 @@
 
   // get the gsdl source path
-  this->gsdlSourcePath  = new FilePath(this->sourcePath->cString(), "gsdl");
+  this->gsdlSourcePath  = new FilePath(this->sourcePath->pathString(), "gsdl");
   delete exePath;
 }
@@ -199 +212 @@
  */
 bool GSInstall::copyFiles()
-{   FileVector *fileList;
-
-  // ensure that we have got the required destination and that we can write there
+{   // ensure that we have got the required destination and that we can write there
   if (this->installExe)
   { this->destinationPath->ensureWriteablePath();
@@ -232 +243 @@
   // now move on to add key items
     if (this->installExe)
-  { FilePath *serverPath    = new FilePath((char *) this->destinationPath->cString(), "server.exe");
-    char *exeKeyPath;
+  { FilePath *serverPath    = new FilePath(this->destinationPath->pathString(), "server.exe");
+    FilePath *setupPath     = new FilePath(this->destinationPath->pathString(), "gssetup.exe");
+      FilePath *logPath = new FilePath(this->destinationPath->pathString(), "install.log");
+    string exeKeyPath, uninstallCmd, uninstallKeyPath;
     gsPlatform platform;
 
@@ -240 +253 @@
                                                                         this->gsRegister->collectKeyId(),
                                       "library",
-                                      serverPath->cString());
+                                      serverPath->pathString());
 
     // This test is in fact for 9x or NT 4+; we're worried about the registry
@@ -254 +267 @@
         this->gsRegister->storeKeyString(   HKEY_LOCAL_MACHINE,
                                                                         exeKeyPath,
-                                          NULL,
-                                        serverPath->cString());
+                                          "",
+                                        serverPath->pathString());
 
       // store path for this application
@@ -261 +274 @@
                                                                         exeKeyPath,
                                           "path",
-                                        this->destinationPath->cString());
-      // delete the windows 9x speciall app path key
-            delete exeKeyPath;
-
-      // TODO: set up uninstall option
+                                        this->destinationPath->pathString());
+
+      // create uninstall command line
+      uninstallCmd = setupPath->pathString() + " -u " + logPath->pathString();
+      uninstallKeyPath = this->gsRegister->uninstallKeyId(this->configFile->getString("CollectionName"));
+
+      // ensure uninstall key exists
+      this->gsRegister->ensureKeyExists(HKEY_LOCAL_MACHINE, uninstallKeyPath);
+
+      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE, uninstallKeyPath,
+                                                                        "DisplayName",
+                                        this->configFile->getString("CollectionName"));
+      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE, uninstallKeyPath,
+                                                                        "UninstallString", uninstallCmd);
     }
+    delete setupPath;
     delete serverPath;
+      delete logPath;
   }
 
@@ -280 +304 @@
  */
 void GSInstall::setDestination()
-{   this->destinationPath       = new FilePath(this->selectedDirs[0]->selectedPath());
+{ // get configuration from the install wizard pages
+    this->destinationPath       = new FilePath(this->selectedDirs[0]->selectedPath());
     this->installFullVolume = this->selectedDirs[1]->getOption();
   if (this->installFullVolume || true)  // NB: always take path from 2nd dialog
@@ -287 +312 @@
   else
   { this->dataDestPath  = this->destinationPath;
+  }
+
+  // open the log for writing
+  FilePath *logPath = new FilePath(this->destinationPath->pathString(), "install.log");
+  this->openLog(logPath->pathString(), true);
+  delete logPath;
+}
+
+void GSInstall::setUninstall()
+{
+  // open the log for reading
+  FilePath *logPath = new FilePath(this->collectPath->pathString(), "install.log");
+  this->openLog(logPath->pathString(), false);
+  delete logPath;
+}
+
+void GSInstall::uninstall()
+{ FilePath *iniPath;
+    string      command;
+  stringArray params;
+
+    this->manifest = new gsManifest(*this); // get a manifest manager
+
+  iniPath   = new FilePath(this->collectPath->pathString(), "gsdl.ini");
+    gsProfile gsdlProfile(*this, iniPath->pathString());
+
+    while ((command = this->readCommand(params)) != "")
+  { if (!this->manifest->undoAction(command, params))
+    { if (!gsdlProfile.undoAction(command, params))
+        { if (!this->gsRegister->undoAction(command, params))
+        { if (!this->progman->undoAction(command, params))
+            {
+          }
+        }
+      }
+    }
   }
 }
@@ -295 +356 @@
 void GSInstall::setManifest()
 {   if (this->installExe)
-    {   this->manifest->selectGroup("library", this->destinationPath->pathString());
+    {   this->manifest->selectGroup("library", *this->destinationPath);
   }
   if (this->installFullVolume)
-  { this->manifest->selectGroup("collection", this->dataDestPath->pathString());
+  { this->manifest->selectGroup("collection", *this->dataDestPath);
   }
   else
-  { this->manifest->selectGroup("database", this->dataDestPath->pathString());
+  { this->manifest->selectGroup("database", *this->dataDestPath);
   }
 }
@@ -310 +371 @@
  */
 bool GSInstall::updateProgman()
-{ gsProgramManager  progman;
-    char *            groupName = NULL;
+{ string groupName;
 
   // if we managed to get a connection to the program manager (or explorer
   // shell) then do the requisite updates
-  if (progman.connect())
+  if (this->progman->connect())
   { // get group name from folders
-    this->configFile->get("ProgramGroupName", &groupName);
-      if (groupName == NULL)
+    groupName = this->configFile->getString("ProgramGroupName");
+      if (groupName == "")
     {   // TODO: error handling
-        progman.disconnect();
-          delete groupName;
+        this->progman->disconnect();
         return false;
       }
 
       // add the group
-        if (!progman.addProgramGroup(groupName))
-      { progman.disconnect();
-          delete groupName;
+        if (!this->progman->addProgramGroup(groupName))
+      { this->progman->disconnect();
         return false;
     }
 
     // add a "server" icon
-    FilePath libraryPath(this->destinationPath->cString(), "library.exe");
-      if (!progman.addIcon(groupName, "Library (without nextwork support)", libraryPath.cString(), ""))
-    { progman.disconnect();
-          delete groupName;
-        return false;
+    FilePath libraryPath(this->destinationPath->pathString(), "library.exe");
+      if (!this->progman->addIcon(groupName, "Library (without nextwork support)", libraryPath.pathString(), ""))
+    { // assume that it may be there already
       }
 
-    // TODO: check for server existence
-    FilePath serverPath(this->destinationPath->cString(), "server.exe");
-      if (!progman.addIcon(groupName, "Server", serverPath.cString(), ""))
-    {   progman.disconnect();
-          delete groupName;
-        return false;
+    // check for server existence
+    FilePath serverPath(this->destinationPath->pathString(), "server.exe");
+    if (serverPath.exists())
+    { if (!this->progman->addIcon(groupName, "Server", serverPath.pathString(), ""))
+        {   // assume that it may be there already
+      }
       }
 
-    FilePath readMePath(this->destinationPath->cString(), "readme.txt");
-      if (!progman.addIcon(groupName, "ReadMe", readMePath.cString(), ""))
-    {   progman.disconnect();
-          delete groupName;
-        return false;
+    FilePath readMePath(this->destinationPath->pathString(), "readme.txt");
+      if (!this->progman->addIcon(groupName, "ReadMe", readMePath.pathString(), ""))
+    {
       }
 
-    FilePath supportPath(this->destinationPath->cString(), "support.html");
-      if (!progman.addIcon(groupName, "Technical Support", supportPath.cString(), ""))
-    {   progman.disconnect();
-          delete groupName;
-        return false;
+    FilePath supportPath(this->destinationPath->pathString(), "support.html");
+      if (!this->progman->addIcon(groupName, "Technical Support", supportPath.pathString(), ""))
+    {
       }
 
-    // TODO: add uninstall support
-
-    // dispose of group name
-      delete groupName;
+    // TODO: uninstall icon
+    // FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
 
     // disconnect from program manager
-    progman.disconnect();
+    this->progman->disconnect();
   }
   return true;
@@ -393 +443 @@
     {   exePath = this->collectPath;
   }
-  iniPath   = new FilePath((char *) exePath->cString(), "gsdl.ini");
+  iniPath   = new FilePath(exePath->pathString(), "gsdl.ini");
 
   // TODO: check if this 'if' structure is correct; suspect that it isn't quite
@@ -401 +451 @@
   //       This all needs investigating
   if (this->installVolume)
-  { char volumeSectionName[100] = "\0";
-    unsigned int space  = 99;
-
-    // Manufacture the appropriate section name now; an equivalent string
+  { // Manufacture the appropriate section name now; an equivalent string
     // is also constructed
-    this->configFile->concat("CollectionName", volumeSectionName, space);
-    strcat(volumeSectionName, "#");
-    space --;
-    this->configFile->concat("CollectionVolume", volumeSectionName, space);
-    string volumeSectionString(volumeSectionName);
+    string volumeSectionString = this->configFile->getString("CollectionName") +
+                                                             "#" + this->configFile->getString("CollectionVolume");
 
     // if we're installing the full data for the collection, then take the
@@ -423 +467 @@
 
     // create a profile object to write to the gsdl.ini file
-    gsProfile gsdlProfile(iniPath->cString());
+    gsProfile gsdlProfile(*this, iniPath->pathString());
 
     // if installing the executable, add the database and greenstone home
@@ -429 +473 @@
     if (this->installExe)
     {   // set the correct exe entries in gsdl.ini (in the gsdl section)
-            gsdlProfile.writeString("gsdl", "gsdlhome", dataPath->cString());
-      gsdlProfile.writeString("gsdl", "gdbmhome", this->dataDestPath->cString());
-
-      this->unInstall->record("gsdl", "profilewrite", 2, &gsdl_VLHOME,
-                                                    &dataPath->pathString());
-      this->unInstall->record("gsdl", "profilewrite", 2, &gsdl_DBHOME,
-                                                    &this->dataDestPath->pathString());
+            gsdlProfile.writeString("gsdl", "gsdlhome", dataPath->pathString());
+      gsdlProfile.writeString("gsdl", "gdbmhome", this->dataDestPath->pathString());
     }
 
@@ -441 +480 @@
     if (this->installVolume)
     { // note the collection in the general gsdl section; and add the undo item too
-        gsdlProfile.ensureListMember("gsdl", gsdl_COLLIST.c_str(), volumeSectionName);
-      this->unInstall->record("gsdl", "proflistensure", 2, &gsdl_COLLIST, &volumeSectionString);
+        gsdlProfile.ensureListMember("gsdl", gsdl_COLLIST, volumeSectionString);
 
       // note the volume data in its own section
-        gsdlProfile.writeString(volumeSectionName, "gsdlhome", dataPath->cString());
-        gsdlProfile.writeString(volumeSectionName, "gdbmhome", this->dataDestPath->cString());
-        gsdlProfile.writeString(volumeSectionName, "staticpath", dataPath->cString());
-
-      this->unInstall->record(volumeSectionName, "profilewrite", 2, &gsdl_VLHOME, &dataPath->pathString());
-      this->unInstall->record(volumeSectionName, "profilewrite", 2, &gsdl_DBHOME, &this->dataDestPath->pathString());
-      this->unInstall->record(volumeSectionName, "profilewrite", 2, &gsdl_STATIC, &dataPath->pathString());
+        gsdlProfile.writeString(volumeSectionString, "gsdlhome", dataPath->pathString());
+        gsdlProfile.writeString(volumeSectionString, "gdbmhome", this->dataDestPath->pathString());
+        gsdlProfile.writeString(volumeSectionString, "staticpath", dataPath->pathString());
     }
   }
@@ -462 +496 @@
 
 bool GSInstall::installNetscape()
-{   FilePath    netscape32Path(this->sourcePath->cString(), "netscape\\n32e405.exe");
-  FilePath  netscape16Path(this->sourcePath->cString(), "netscape\\n16e405.exe");
+{   FilePath    netscape32Path(this->sourcePath->pathString(), "netscape\\n32e405.exe");
+  FilePath  netscape16Path(this->sourcePath->pathString(), "netscape\\n16e405.exe");
 
   launchApp launchNetscape(netscape32Path);
@@ -580 +614 @@
 
         case PSN_KILLACTIVE:
-        { // note the path from the dialog
+        break;
+
+                case PSN_WIZNEXT:
+          { // note the path from the dialog
             dirSelector *selector = ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA));
             selector->setPathFromEdit(GetDlgItem(Dialog, dirpath_PATH));
@@ -586 +623 @@
             // create a new FilePath object to check on the proposed destination
                     FilePath *path = new FilePath(selector->selectedPath());
+
+          // if the proposed destination doesn't exist, ask the user whether to
+          // create it now.  TODO: actually create it if asked!
           if (path->exists() == false)
           { char buffer[128];
@@ -600 +640 @@
           }
           delete path;
-        }
-        break;
-
-                case PSN_WIZNEXT:
-          { if (((LPNMHDR) lParam)->idFrom == 0)
-            { // TODO: note a default here
-            }
           }
         break;
@@ -673 +706 @@
     pshead.nPages      = 2;
     pshead.nStartPage  = 0;
-    pshead.ppsp        = ppage;
+  if (install.installExe == true)
+  { pshead.ppsp          = ppage;
+  }
+  else // cheat as the executable etc. is already installed
+  { pshead.ppsp          = &ppage[1];
+  }
     pshead.pfnCallback = GSInstall_wizardProc;
 
@@ -705 +743 @@
   switch(Message)
     { case WM_CREATE:
-    {
+    { ShowWindow(Window, SW_MAXIMIZE);
     }
     break;
@@ -713 +751 @@
 
     case WM_USER:
-    {   //dirSelector selector("Choose a Greenstone directory", "Select directory");
-
-      //selector.requestPath(Window, "Select directory");
-      GSInstall install;
-      GSInstall_init_wizard(install);
-      if (config_complete == false)
-      { MessageBox(0, "Install cancelled", app_name, MB_OK);
-            }
+    { // uninstall action
+        if (strstr(app_cmdLine, "-u") != NULL || true)
+        { char *at = strstr(app_cmdLine, "-u");
+        at += strlen("-u") + 1;
+
+                GSInstall install(true);
+        install.setUninstall();
+        install.uninstall();
+      }
+      // install wizard
       else
-      { install.setDestination();
-        install.setManifest();
-          install.copyFiles();
-        install.updateProgman();
-          install.updateRegistry();
-        install.updateProfiles();
-        install.installNetscape();
+      { GSInstall install(false);
+        GSInstall_init_wizard(install);
+          if (config_complete == false)
+        {   MessageBox(0, "Install cancelled", app_name, MB_OK);
+                }
+        else
+          { // configure the installation
+            install.setDestination();
+            install.setManifest();
+
+            // perform installation
+              install.copyFiles();
+            install.updateProgman();
+              install.updateRegistry();
+            install.updateProfiles();
+
+            // do further actions
+          install.installNetscape();
+          }
       }
       DestroyWindow(Window);