Changeset 1584 for trunk/gsinstaller

Timestamp:

2000-10-04T06:34:40+13:00 (24 years ago)

Author:

cs025

Message:

Removed messages and worked around the failure of windows 32s detection
which was resulting in the incorrect execution of the netscape installation.

File:

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

trunk/gsinstaller/gsinstall.cpp

@@ -371 +371 @@
   // if we are not running in the Windows temporary directory, copy this exe
   // and the installation log to the temporary directory and run them there
-  MessageBox(0, tempPath.cString(), this->sourcePath->cString(), MB_OK);
   if (*this->sourcePath != tempPath)
     {
@@ -468 +467 @@
       return false;
     }
-      
+
       // add the group
       if (!this->progman->addProgramGroup(groupName))
@@ -475 +474 @@
       return false;
     }
-      
+
       // add a "server" icon
       FilePath libraryPath(this->destinationPath->pathString(), "library.exe");
@@ -492 +491 @@
       //        }
       //    }
-      
+
       FilePath readMePath(this->destinationPath->pathString(), "readme.txt");
       if (!this->progman->addIcon(groupName, "ReadMe", readMePath.pathString(), ""))
@@ -503 +502 @@
     }
 
+        /*
       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(), ""))
       {
-      }
-      
+      }*/
+
       // disconnect from program manager
       this->progman->disconnect();
@@ -628 +628 @@
   launchApp launchNetscape(netscape32Path);
   launchNetscape.platformApp(gsPlatform_WINDOWS32S, netscape16Path);
+  launchNetscape.platformApp(gsPlatform_WINDOWS, netscape16Path);
   if (launchNetscape.run(true, 1,
              "This library is displayed using a web browser.  If you don't "
@@ -721 +722 @@
       }
       return TRUE;
-      
+
     case WM_COMMAND:
       switch (LOWORD(wParam))
@@ -784 +785 @@
           {
         char buffer[128];
-        
+
             sprintf(buffer, "Directory %s does not exist - create it?", selector->selectedPath());
 
@@ -997 +998 @@
         install.updateProfiles();
         install.updateSetupExe();
-        
+
         // the log will need reopening (probably failed initially)
         install.reopenLog();
-        
+
         // close log
         install.closeLog();
-        
+
         // do further actions
         install.installNetscape();