Changeset 1657

Timestamp:

2000-11-07T15:12:08+13:00 (23 years ago)

Author:

sjboddie

Message:

Fixed a couple of bugs that surfaced on windows 2000

Location:

trunk/gsinstaller

Files:

• gsProgman.cpp (modified) (2 diffs)
• gsProgman.h (modified) (1 diff)
• gsinstall.cpp (modified) (9 diffs)
• install.cfg (modified) (1 diff)
• manifest.cfg (modified) (2 diffs)

trunk/gsinstaller/gsProgman.cpp

@@ -233 +233 @@
                    string iconName, // name of the icon
                    string iconDestination, // destination file of the icon
+                   string arguments, // any arguments to go along with iconDestination
                    string description) // the textual description
-  // of the icon (not usually displayed)
+                                                   // of the icon (not usually displayed)
 {   
   bool reply = false;
@@ -288 +289 @@
       // description.
       psl->SetPath(iconDestination.c_str());
-
+      psl->SetArguments(arguments.c_str());
       psl->SetDescription(description.c_str());
       

trunk/gsinstaller/gsProgman.h

@@ -9 +9 @@
 class gsProgramManager : public installAgent
 {
-    private:
-    gsPlatform *platform;
-    DWORD               instance;
-    bool                connected;
+private:
+  gsPlatform *platform;
+  DWORD instance;
+  bool connected;
+  
+  void logAction(string actionName, string group);
+  void logAction(string actionName, string group, string item, string parameter);
+protected:
+public:
+  // constructor
+  gsProgramManager(installManager &manager);
 
-    void logAction(string actionName, string group);
-    void logAction(string actionName, string group, string item, string parameter);
-  protected:
-  public:
-    // constructor
-    gsProgramManager(installManager &manager);
+  // connect/disconnect activity
+  bool connect();
+  bool disconnect();
 
-    // connect/disconnect activity
-    bool connect();
-    bool disconnect();
+  bool addProgramGroup(string name);
+  bool removeProgramGroup(string name);
+  bool addIcon(string groupName, string iconName, string iconDestination,
+           string arguments, string description);
+  bool removeIcon(string groupName, string iconName);
 
-    bool addProgramGroup(string name);
-    bool removeProgramGroup(string name);
-    bool addIcon(   string groupName, string iconName, string iconDestination,
-                                string description);
-    bool removeIcon(    string groupName, string iconName);
-
-    bool undoAction(string actionName, stringArray &params);
+  bool undoAction(string actionName, stringArray &params);
 };
 #endif

trunk/gsinstaller/gsinstall.cpp

@@ -274 +274 @@
     {
       //      FilePath *serverPath = new FilePath(this->destinationPath->pathString(), "server.exe");
-      FilePath *serverPath = new FilePath(this->destinationPath->pathString(), "library.exe");
+      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");
@@ -291 +291 @@
     {
       // get special app path key for windows 9x
-      exeKeyPath = this->gsRegister->exeKeyId("library.exe");
+      exeKeyPath = this->gsRegister->exeKeyId("server.exe");
 
       // ensure that the exe key exists
@@ -350 +350 @@
     }
 
+
   // set the log for writing
+
   FilePath *logPath = new FilePath(this->destinationPath->pathString(), "install.log");
+
   this->setLogFile(logPath->pathString());
+
   this->readLog();
+
   delete logPath;
+
 }
 
@@ -395 +401 @@
   // will in fact be the temporary directory as outlined above)
   FilePath *logPath = new FilePath(this->sourcePath->pathString(), "install.log");
+
   this->setLogFile(logPath->pathString());
   this->readLog();
@@ -456 +463 @@
 {
   string groupName;
+  string collectionName;
 
   // if we managed to get a connection to the program manager (or explorer
@@ -469 +477 @@
       return false;
     }
+      collectionName = this->configFile->getString("CollectionName");
+      if (collectionName == "")
+    {
+      // TODO: error handling
+      this->progman->disconnect();
+      return false;
+    }
 
       // add the group
@@ -478 +493 @@
 
       // add a "server" icon
-      FilePath libraryPath(this->destinationPath->pathString(), "library.exe");
-      if (!this->progman->addIcon(groupName, "Library", libraryPath.pathString(), ""))
+      FilePath libraryPath(this->destinationPath->pathString(), "server.exe");
+      if (!this->progman->addIcon(groupName, collectionName, libraryPath.pathString(), "", ""))
     {
-      // assume that it may be there already
-    }
-
-      // 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->pathString(), "readme.txt");
-      if (!this->progman->addIcon(groupName, "ReadMe", readMePath.pathString(), ""))
+      if (!this->progman->addIcon(groupName, "ReadMe", readMePath.pathString(), "", ""))
     {
     }
 
-      FilePath supportPath(this->destinationPath->pathString(), "support.html");
-      if (!this->progman->addIcon(groupName, "Technical Support", supportPath.pathString(), ""))
+      FilePath supportPath(this->destinationPath->pathString(), "Support.htm");
+      if (!this->progman->addIcon(groupName, "Technical Support", supportPath.pathString(), "", ""))
     {
     }
@@ -507 +511 @@
       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(), ""))
+      if (!this->progman->addIcon(groupName, "Uninstall", uninstallPath.pathString(), " -u " + logPath.pathString(),
+                  "Remove this Greenstone collection"))
       {
       }
@@ -641 +646 @@
              "Greenstone Installer", false) < 0)
     {
-      MessageBox(0, "Error", app_name, MB_OK);
+      //      MessageBox(0, "Error", app_name, MB_OK);
       return false;
     }

trunk/gsinstaller/install.cfg

@@ -1 @@
-CompanyName:Demo
+CompanyName:New Zealand Digital Library
 CollectionName:Demo Collection
 CollectionDirName:demo
 CollectionVersion:1.0
 CollectionVolume:1
-ProgramGroupName:Demo Collection
+ProgramGroupName:Greenstone

trunk/gsinstaller/manifest.cfg

@@ -3 +3 @@
 
 library:
-  gsdl.ini library.exe Net32 Net16 readme.txt
+  gsdl.ini server.exe Net32 Net16 readme.txt Support.htm docs
 
 database:
@@ -9 +9 @@
 
 collection:
-  collect
+  collect etc images macros unicode