Changeset 1584


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsinstaller/gsinstall.cpp

    r1581 r1584  
    371371  // if we are not running in the Windows temporary directory, copy this exe
    372372  // and the installation log to the temporary directory and run them there
    373   MessageBox(0, tempPath.cString(), this->sourcePath->cString(), MB_OK);
    374373  if (*this->sourcePath != tempPath)
    375374    {
     
    468467      return false;
    469468    }
    470      
     469
    471470      // add the group
    472471      if (!this->progman->addProgramGroup(groupName))
     
    475474      return false;
    476475    }
    477      
     476
    478477      // add a "server" icon
    479478      FilePath libraryPath(this->destinationPath->pathString(), "library.exe");
     
    492491      //        }
    493492      //    }
    494      
     493
    495494      FilePath readMePath(this->destinationPath->pathString(), "readme.txt");
    496495      if (!this->progman->addIcon(groupName, "ReadMe", readMePath.pathString(), ""))
     
    503502    }
    504503
     504        /*
    505505      FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
    506506      FilePath logPath(this->destinationPath->pathString(), "install.log");
    507507      if (!this->progman->addIcon(groupName, "Uninstall", uninstallPath.pathString() + " -u " + logPath.pathString(), ""))
    508508      {
    509       }
    510      
     509      }*/
     510
    511511      // disconnect from program manager
    512512      this->progman->disconnect();
     
    628628  launchApp launchNetscape(netscape32Path);
    629629  launchNetscape.platformApp(gsPlatform_WINDOWS32S, netscape16Path);
     630  launchNetscape.platformApp(gsPlatform_WINDOWS, netscape16Path);
    630631  if (launchNetscape.run(true, 1,
    631632             "This library is displayed using a web browser.  If you don't "
     
    721722      }
    722723      return TRUE;
    723      
     724
    724725    case WM_COMMAND:
    725726      switch (LOWORD(wParam))
     
    784785          {
    785786        char buffer[128];
    786        
     787
    787788            sprintf(buffer, "Directory %s does not exist - create it?", selector->selectedPath());
    788789
     
    997998        install.updateProfiles();
    998999        install.updateSetupExe();
    999        
     1000
    10001001        // the log will need reopening (probably failed initially)
    10011002        install.reopenLog();
    1002        
     1003
    10031004        // close log
    10041005        install.closeLog();
    1005        
     1006
    10061007        // do further actions
    10071008        install.installNetscape();
Note: See TracChangeset for help on using the changeset viewer.