Update of products

[tools/install.git] / src / SALOME_XmlHandler.cxx

diff --git a/src/SALOME_XmlHandler.cxx b/src/SALOME_XmlHandler.cxx
index c21618337ac3acb14deb7e18c37688098223ea10..95af10569648b59cddf59d949cdb6586256a7826 100644 (file)
--- a/src/SALOME_XmlHandler.cxx
+++ b/src/SALOME_XmlHandler.cxx
@@ -230,7 +230,7 @@ void StructureParser::getProductsInfo( const QDomNode &theNode )
       if ( !instNode.isElement() ) 
        continue;
       QDomElement instElem = instNode.toElement();
-      if ( instElem.attribute( "os" ) != myWizard->getPlatform() ) 
+      if ( instElem.attribute( "os" ) != myWizard->getPlatform() && instElem.attribute( "os" ) != "all" ) 
        continue;
       if ( isBoolAttributeSet( instElem.attribute( "disable" ) ) )
        break; // current product is skip
@@ -245,19 +245,14 @@ void StructureParser::getProductsInfo( const QDomNode &theNode )
       QString type = prodElem.attribute( "type" ).stripWhiteSpace().lower();
       bool pickUp = isBoolAttributeSet( instElem.attribute( "pickupenv" ) );
       QString script = instElem.attribute( "script" );
-      InstallationType instType = myWizard->getInstType();
       QStringList typesList = QStringList::split( ",", type );
-      long prodSize = ( instType == Binaries ? (binreq + srcreq) :
-                       instType == Sources ? srcreq : 
-                       cmplreq );
-      if ( typesList.find( "component" ) != typesList.end() ) {
+      if ( typesList.find( "component" ) != typesList.end() )
        element = myModules->addItem( name, 
-                                     QString::number( prodSize ) + " KB", 
+                                     "unknown", 
                                      script );
-                         }
       else
        element = myPrereqs->addItem( name,
-                                     QString::number( prodSize ) + " KB", 
+                                     "unknown", 
                                      script );
       QString descr = QString::null;
       if ( prodElem.attribute( "description" ) != "" )