// Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
// Project : SALOME
// Module : Installation Wizard
-// Copyright : 2002-2007 CEA
+// Copyright : 2002-2008 CEA
#include "globals.h"
// ================================================================
/*!
- * DefineDependeces [ static ]
- * Defines list of dependancies as string separated by space symbols
+ * getAllProducts [ static ]
+ * Defines list of all products as a string separated by space symbols
*/
// ================================================================
-static QString DefineDependeces(MapProducts& theProductsMap)
+static QString getAllProducts(MapProducts& theProductsMap)
{
- QStringList aProducts;
+ QStringList aModules, aPrereqs;
for ( MapProducts::Iterator mapIter = theProductsMap.begin(); mapIter != theProductsMap.end(); ++mapIter ) {
QCheckListItem* item = mapIter.key();
Dependancies dep = mapIter.data();
- QStringList deps = dep.getDependancies();
- for (int i = 0; i<(int)deps.count(); i++ ) {
- if ( !aProducts.contains( deps[i] ) ) {
- aProducts.append( deps[i] );
- aProducts.append( deps[i] + "_src" );
+ QString curModule = item->text(0);
+ if ( !aModules.contains( curModule ) && !aPrereqs.contains( curModule ) ) {
+ if ( dep.getType() == "component" ) {
+ aModules.append( curModule );
+ aModules.append( curModule + "_src" );
+ }
+ else {
+ aPrereqs.append( curModule );
+ aPrereqs.append( curModule + "_src" );
}
- }
- if ( !aProducts.contains( item->text(0) ) ) {
- aProducts.append( item->text(0) );
- aProducts.append( item->text(0) + "_src" );
}
}
- return aProducts.join(" ");
+ return QStringList(aPrereqs+aModules).join(" ");
}
// ================================================================
.arg( __IW_VERSION_MINOR__ ) \
.arg( __IW_VERSION_PATCH__ ) );
QLabel* copyright = new QLabel( this, "copyright" );
- copyright->setText( "<b>Copyright</b> © 2004-2007 CEA" );
+ copyright->setText( "<b>Copyright</b> © 2004-2008 CEA" );
QFont font = title->font();
font.setPointSize( (int)( font.pointSize() * 1.8 ) );
title->setFont( font );
// ================================================================
SALOME_InstallWizard::SALOME_InstallWizard(const QString& aXmlFileName,
const QString& aTargetDir,
- const QString& aTmpDir)
+ const QString& aTmpDir,
+ const bool aForceSrc)
: InstallWizard( qApp->desktop(), "SALOME_InstallWizard", false, 0 ),
helpWindow( NULL ),
moreMode( false ),
xmlFileName = aXmlFileName;
myTargetPath = aTargetDir;
myTmpPath = aTmpDir;
+ forceSrc = aForceSrc;
stateChanged = true;
binPath = QDir::currentDirPath() + "/Products/BINARIES";
srcPath = QDir::currentDirPath() + "/Products/SOURCES";
+ oneModDirName = "SALOME";
+ oneProdDirName = "PRODUCTS";
- singleBinPlts << "Debian3.1" << "Mandriva2006.0_64" << "Debian4.0";
+ singleBinPlts << "Debian4.0"
+ << "Debian3.1"
+ << "Mandrake10.1"
+ << "Mandriva2006.0"
+ << "Mandriva2007.0"
+ << "Mandriva2008.0"
+ << "Mandriva2006.0_64"
+ << "Mandriva2008.0_64"
+ << "RedHat8.0"
+ << "RedHat9"
+ << "RedHatEnterprise4"
+ << "Scientific4.2"
+ << "Scientific4.3";
commonPlatform = "Debian3.1";
//
addLogo( pixmap( pxLogo ) );
// set defaults
- setVersion( "4.0.0" );
+ setVersion( "4.1.1" );
setCaption( tr( "SALOME %1" ).arg( myVersion ) );
- setCopyright( tr( "Copyright (C) 2007 CEA" ) );
+ setCopyright( tr( "Copyright (C) 2008 CEA" ) );
setLicense( tr( "All rights reserved." ) );
___MESSAGE___( "Configuration file : " << xmlFileName.latin1() );
// create instance of class for starting shell script to get available disk space
diskSpaceProc = new QProcess( this, "procDiskSpace" );
- connect( diskSpaceProc, SIGNAL( processExited() ), this, SLOT( updateAvailableSpace() ) );
-
// create instance of class for starting shell install script
shellProcess = new QProcess( this, "shellProcess" );
-
+ // create instance of class for starting shell script to modify SALOME *.la files
+ modifyLaProc = new QProcess( this, "modifyLaProc" );
// create instance of class for starting shell script to check Fortran libraries
checkFLibProc = new QProcess( this, "checkFLibProc" );
- connect(checkFLibProc, SIGNAL( processExited() ), this, SLOT( checkFLibResult() ) );
// create introduction page
setupIntroPage();
connect( this, SIGNAL( helpClicked() ), this, SLOT( helpClicked() ) );
connect( this, SIGNAL( aboutClicked() ), this, SLOT( onAbout() ) );
- // catch signals from launched script
+ // catch signals from launched diskSpaceProc
+ connect( diskSpaceProc, SIGNAL( processExited() ), this, SLOT( updateAvailableSpace() ) );
+ // catch signals from launched shellProcess
connect(shellProcess, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) );
connect(shellProcess, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) );
connect(shellProcess, SIGNAL( processExited() ), this, SLOT( productInstalled() ) );
connect(shellProcess, SIGNAL( wroteToStdin() ), this, SLOT( wroteToStdin() ) );
+ // catch signals from launched modifyLaProc
+ connect(modifyLaProc, SIGNAL( readyReadStdout() ), this, SLOT( readFromStdout() ) );
+ connect(modifyLaProc, SIGNAL( readyReadStderr() ), this, SLOT( readFromStderr() ) );
+ connect(modifyLaProc, SIGNAL( processExited() ), this, SLOT( checkModifyLaResult() ) );
+ // catch signals from launched checkFLibProc
+ connect(checkFLibProc, SIGNAL( processExited() ), this, SLOT( checkFLibResult() ) );
// create validation thread
myThread = new ProcessThread( this );
platforms = elem.attribute( "platforms" ).stripWhiteSpace();
QStringList platList = QStringList::split( ",", platforms );
for ( uint j = 0; j < platList.count(); j++ ) {
- if ( !platList[j].isEmpty() && xmlMap.find( platList[j] ) == xmlMap.end() )
- xmlMap[ platList[j] ] = xmlList[i];
+ if ( !platList[j].isEmpty() )
+ if ( xmlMap.find( platList[j] ) == xmlMap.end() ||
+ xmlMap[ platList[j] ] == "config.xml" )
+ xmlMap[ platList[j] ] = xmlList[i];
}
// if ( !curPlatform.isEmpty() && xmlMap.find( curPlatform ) != xmlMap.end() )
// return xmlMap;
sizeLayout->addWidget( requiredTemp, 1, 1 );
sizeLayout->addWidget( reqLab3, 2, 0 );
sizeLayout->addWidget( availableSize, 2, 1 );
+ // ... 'single installation directory' check-boxes
+ oneModDirBtn = new QMyCheckBox( tr( "Install modules to a single directory" ), productsPage );
+ setAboutInfo( oneModDirBtn, tr( "Check this box if you want to install binaries of\nthe selected SALOME modules into a single directory" ) );
+ oneProdDirBtn = new QMyCheckBox( tr( "Install prerequisites to a single directory" ), productsPage );
+ setAboutInfo( oneProdDirBtn, tr( "Check this box if you want to install binaries of\nthe selected prerequisites into a single directory" ) );
+ oneProdDirBtn->hide(); // temporarily! waiting for correct prerequisites availability
+ QFrame* split_line = new QFrame( productsPage, "split_line" );
+ split_line->setFrameStyle( QFrame::HLine | QFrame::Sunken );
// layout common widgets
- pageLayout->addMultiCellLayout( leftBoxLayout, 0, 1, 0, 0 );
+ pageLayout->addMultiCellLayout( leftBoxLayout, 0, 4, 0, 0 );
pageLayout->addWidget ( productInfo, 0, 1 );
pageLayout->addLayout ( sizeLayout, 1, 1 );
+ pageLayout->addWidget ( split_line, 2, 1 );
+ pageLayout->addWidget ( oneModDirBtn, 3, 1 );
+ pageLayout->addWidget ( oneProdDirBtn, 4, 1 );
// adding page
addPage( productsPage, tr( "Choice of the products to be installed" ) );
availableSize->setText( diskSpaceProc->readLineStdout() + " KB");
}
// ================================================================
+/*!
+ * SALOME_InstallWizard::runModifyLaFiles
+ * Run the modification of SALOME *.la files
+ */
+// ================================================================
+void SALOME_InstallWizard::runModifyLaFiles()
+{
+ modifyLaProc->clearArguments();
+ // ... update status label
+ statusLab->setText( tr( "Modification of *.la files of SALOME modules..." ) );
+ // set process arguments
+ modifyLaProc->setWorkingDirectory( QDir::cleanDirPath( QFileInfo( "./config_files/" ).absFilePath() ) );
+ modifyLaProc->addArgument( "modifyLaFiles.sh" );
+ modifyLaProc->addArgument( "modify_la_files" );
+ modifyLaProc->addArgument( QDir::cleanDirPath( QFileInfo( targetFolder->text().stripWhiteSpace() ).absFilePath() ) );
+ modifyLaProc->addArgument( oneModDirName );
+ // ... run script
+ if ( !modifyLaProc->start() )
+ ___MESSAGE___( "Error: process could not start!" );
+}
+// ================================================================
+/*!
+ * SALOME_InstallWizard::checkModifyLaResult
+ * Slot to take result of modification SALOME *.la files
+ */
+// ================================================================
+void SALOME_InstallWizard::checkModifyLaResult()
+{
+ if ( modifyLaProc->normalExit() && modifyLaProc->exitStatus() == 1 )
+ runCheckFLib();
+ else {
+ // abort of the current installation
+ abort();
+ statusLab->setText( tr( "Installation has been aborted" ) );
+ QMessageBox::critical( this,
+ tr( "Error" ),
+ tr( "Modification of *.la SALOME files has not been completed."),
+ QMessageBox::Ok,
+ QMessageBox::NoButton,
+ QMessageBox::NoButton );
+ // enable <Next> button
+ setNextEnabled( true );
+ nextButton()->setText( tr( "&Start" ) );
+ setAboutInfo( nextButton(), tr( "Start installation process" ) );
+ // reconnect Next button - to use it as Start button
+ disconnect( this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
+ disconnect( this, SIGNAL( nextClicked() ), this, SLOT( onStart() ) );
+ connect( this, SIGNAL( nextClicked() ), this, SLOT( onStart() ) );
+ // enable <Back> button
+ setBackEnabled( true );
+ }
+}
+// ================================================================
+/*!
+ * SALOME_InstallWizard::runCheckFLib
+ * Run the Fortran libraries checking
+ */
+// ================================================================
+void SALOME_InstallWizard::runCheckFLib()
+{
+ // Check Fortran libraries
+ checkFLibProc->clearArguments();
+ // ... update status label
+ statusLab->setText( tr( "Check Fortran libraries..." ) );
+ // ... search "not found" libraries
+ checkFLibProc->setWorkingDirectory( QDir::cleanDirPath( QFileInfo( "./config_files/" ).absFilePath() ) );
+ checkFLibProc->addArgument( "checkFortran.sh" );
+ checkFLibProc->addArgument( "find_libraries" );
+ checkFLibProc->addArgument( QDir::cleanDirPath( QFileInfo( targetFolder->text().stripWhiteSpace() ).absFilePath() ) );
+ // ... run script
+ if ( !checkFLibProc->start() )
+ ___MESSAGE___( "Error: process could not start!" );
+}
+// ================================================================
/*!
* SALOME_InstallWizard::checkFLibResult
* Slot to take result of Fortran libraries checking
return;
// get all prerequisites
QStringList dependOn = productsMap[ item ].getDependancies();
- // install MED without GUI case
- if ( installGuiBtn->state() != QButton::On && item->text(0) == "MED" ) {
+ // install SALOME without GUI case
+ if ( installGuiBtn->state() != QButton::On &&
+ woGuiModules.find( item->text(0) ) != woGuiModules.end() &&
+ woGuiModules[item->text(0)] == True ) {
dependOn.remove( "GUI" );
}
// setting prerequisites
itProd.key()->setOn( true );
itProd.key()->setEnabled( false );
}
+ break;
}
}
}
for ( itProd = productsMap.begin(); itProd != productsMap.end(); ++itProd ) {
if ( itProd.data().getType() == productsMap[ item ].getType() ) {
QStringList dependOn = itProd.data().getDependancies();
- // install MED without GUI case
- if ( installGuiBtn->state() != QButton::On && itemName == "GUI" ) {
- dependOn.remove( "MED" );
- }
for ( int i = 0; i < (int)dependOn.count(); i++ ) {
if ( dependOn[ i ] == itemName ) {
if ( itProd.key()->isOn() ) {
for ( int k = 0; k < (int)prereqsList.count(); k++ ) {
if ( prereqsList[ k ] == itProd1.data().getName() ) {
nbDependents++;
+ break;
}
}
}
itProd1.key()->setOn( false );
}
}
+ break;
}
}
}
QString tgtFolder = QDir::cleanDirPath( targetFolder->text().stripWhiteSpace() );
shellProcess->addArgument( QFileInfo( tgtFolder ).absFilePath() );
// ... list of all products
- QString depproducts = DefineDependeces(productsMap);
+ QString depproducts = getAllProducts(productsMap);
depproducts.prepend( QStringList( extraProducts.keys() ).join(" ") + " " );
___MESSAGE___( "Dependancies"<< depproducts.latin1() );
shellProcess->addArgument( depproducts );
shellProcess->addArgument( "FALSE" );
// ... binaries directory
shellProcess->addArgument( binDir );
- // ... install MED with GUI or not?
- if ( installGuiBtn->state() != QButton::On && prodProc == "MED" &&
- (installType == Binaries || installType == Compile) )
- shellProcess->addArgument( "FALSE" );
+ // ... install SALOME with GUI or not?
+ if ( woGuiModules.find( prodProc ) != woGuiModules.end() )
+ ( installGuiBtn->state() != QButton::On && woGuiModules[ prodProc ] == True ) ?
+ shellProcess->addArgument( "FALSE" ) :
+ shellProcess->addArgument( "TRUE" );
+ // ... single installation directory for SALOME modules, if this option was selected
+ if ( oneModDirBtn->isChecked() ) {
+ MapProducts::Iterator mapIter;
+ for ( mapIter = productsMap.begin(); mapIter != productsMap.end(); ++mapIter )
+ if ( mapIter.data().getName() == prodProc && mapIter.data().getType() == "component" ) {
+ shellProcess->addArgument( oneModDirName );
+ break;
+ }
+ }
+ // ... single installation directory for prerequisites, if this option was selected
+ if ( oneProdDirBtn->isChecked() ) {
+ if ( prodProc == "DebianLibsForSalome" )
+ shellProcess->addArgument( oneProdDirName );
+ else {
+ MapProducts::Iterator mapIter;
+ for ( mapIter = productsMap.begin(); mapIter != productsMap.end(); ++mapIter )
+ if ( mapIter.data().getName() == prodProc && mapIter.data().getType() == "prerequisite" ) {
+ shellProcess->addArgument( oneProdDirName );
+ break;
+ }
+ }
+ }
+
// run script
if ( !shellProcess->start() ) {
// error handling can be here
// all products are installed successfully
MapProducts::Iterator mapIter;
___MESSAGE___( "starting pick-up environment" );
- QString depproducts = QUOTE( DefineDependeces(productsMap).prepend( QStringList( extraProducts.keys() ).join(" ") + " " ) );
+ QString depproducts = QUOTE( getAllProducts(productsMap).prepend( QStringList( extraProducts.keys() ).join(" ") + " " ) );
for ( mapIter = productsMap.begin(); mapIter != productsMap.end(); ++mapIter ) {
QCheckListItem* item = mapIter.key();
Dependancies dep = mapIter.data();
}
}
}
-
+
if ( installType == Binaries ) {
- // Check Fortran libraries
- // ... update status label
- statusLab->setText( tr( "Check Fortran libraries..." ) );
- // ... search "not found" libraries
- checkFLibProc->setWorkingDirectory( QDir::cleanDirPath( QFileInfo( "./config_files/" ).absFilePath() ) );
- checkFLibProc->addArgument( "checkFortran.sh" );
- checkFLibProc->addArgument( "find_libraries" );
- checkFLibProc->addArgument( QDir::cleanDirPath( QFileInfo( targetFolder->text().stripWhiteSpace() ).absFilePath() ) );
- // ... run script
- if ( !checkFLibProc->start() ) {
- ___MESSAGE___( "Error: process could not start!" );
- }
+ if ( oneModDirBtn->isChecked() )
+ runModifyLaFiles();
+ else
+ runCheckFLib();
}
- else
+ else {
// Update GUI and check installation errors
completeInstallation();
+ }
}
// ================================================================
}
else {
QString itemName = itProd.data().getName();
- if ( itemName != "KERNEL" && itemName != "MED" &&
- itemName != "SAMPLES" && itemName != "DOCUMENTATION" ) {
+ if ( woGuiModules.find( itemName ) == woGuiModules.end() ||
+ woGuiModules[ itemName ] == False ) {
itProd.key()->setOn( false );
itProd.key()->setEnabled( false );
}
QString script = "cd ./config_files/; remove_tmp.sh '";
script += tempFolder->text().stripWhiteSpace() + TEMPDIRNAME;
script += "' ";
- script += QUOTE(DefineDependeces(productsMap));
+ script += QUOTE(getAllProducts(productsMap));
script += " > /dev/null";
___MESSAGE___( "script = " << script.latin1() );
if ( system( script.latin1() ) ) {
if ( aPage == typePage ) {
// installation type page
if ( buttonGrp->id( buttonGrp->selected() ) == -1 )
- binBtn->animateClick(); // set default installation type
+ // set default installation type
+ forceSrc ? srcCompileBtn->animateClick() : binBtn->animateClick();
}
else if ( aPage == platformsPage ) {
// installation platforms page
if ( tempFolder->text().isEmpty() )
parser->setTempDir( tempFolder );
parser->readXmlFile( xmlFileName );
+ // create a map of SALOME modules names, that can support installation without GUI mode
+ if ( woGuiModules.isEmpty() ) {
+ MapProducts::Iterator mapIter;
+ for ( mapIter = productsMap.begin(); mapIter != productsMap.end(); mapIter++ ) {
+ Dependancies dep = mapIter.data();
+ if ( dep.getType() == "component" && dep.supportWoGuiMode() != NotDefined )
+ woGuiModules[ dep.getName() ] = dep.supportWoGuiMode();
+ }
+ }
+
// update required size for each product
updateSizeColumn();
// take into account command line parameters
installType = InstallationType( rbIndex );
// management of the <Remove source and tmp files> check-box
removeSrcBtn->setEnabled( installType == Compile );
+ oneModDirBtn->setEnabled( installType == Binaries /*|| installType == Compile*/ );
+ oneProdDirBtn->setEnabled( installType == Binaries || installType == Compile );
}
else if ( aPage == platformsPage ) {
refPlatform = platBtnGrp->find( rbIndex )->name();
if ( prevType != installType ||
( indexOf( platformsPage ) != -1 ? prevPlat != getPlatform() : false ) ) {
stateChanged = true;
+ oneModDirBtn->setChecked( false );
+ oneProdDirBtn->setChecked( false );
}
}
// ================================================================
if ( nextButton()->text() == tr( "&Stop" ) ) {
statusLab->setText( tr( "Aborting installation..." ) );
shellProcess->kill();
+ modifyLaProc->kill();
while( shellProcess->isRunning() );
statusLab->setText( tr( "Installation has been aborted by user" ) );
return;
void SALOME_InstallWizard::onCancel()
{
shellProcess->kill();
+ modifyLaProc->kill();
+ checkFLibProc->kill();
reject();
}
// ================================================================
void SALOME_InstallWizard::readFromStdout( )
{
___MESSAGE___( "Something was sent to stdout" );
- while ( shellProcess->canReadLineStdout() ) {
- installInfo->append( QString( shellProcess->readLineStdout() ) );
+ QProcess* theProcess = ( QProcess* )sender();
+ while ( theProcess->canReadLineStdout() ) {
+ installInfo->append( QString( theProcess->readLineStdout() ) );
installInfo->scrollToBottom();
}
- QString str( shellProcess->readStdout() );
+ QString str( theProcess->readStdout() );
if ( !str.isEmpty() ) {
installInfo->append( str );
installInfo->scrollToBottom();
void SALOME_InstallWizard::readFromStderr( )
{
___MESSAGE___( "Something was sent to stderr" );
- while ( shellProcess->canReadLineStderr() ) {
- installInfo->append( OUTLINE_TEXT( QString( shellProcess->readLineStderr() ) ) );
+ QProcess* theProcess = ( QProcess* )sender();
+ while ( theProcess->canReadLineStderr() ) {
+ installInfo->append( OUTLINE_TEXT( QString( theProcess->readLineStderr() ) ) );
installInfo->scrollToBottom();
hasErrors = true;
}
- QString str( shellProcess->readStderr() );
+ QString str( theProcess->readStderr() );
if ( !str.isEmpty() ) {
installInfo->append( OUTLINE_TEXT( str ) );
installInfo->scrollToBottom();
