From 53e3ff5fd2fe76b48edb73b2adae61b33697ede9 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 25 Dec 2006 15:30:40 +0000 Subject: [PATCH] Implement features: - install and build SALOME module sources - install all products from sources --- config.xml | 30 +++++++++++++++--------------- config_Debian_3.1.xml | 30 +++++++++++++++--------------- config_Mandrake_10.1.xml | 30 +++++++++++++++--------------- config_Mandriva_2006.0.xml | 30 +++++++++++++++--------------- config_Mandriva_2006.0_64.xml | 30 +++++++++++++++--------------- config_RedHatEnterprise_4.xml | 30 +++++++++++++++--------------- config_RedHat_8.0.xml | 30 +++++++++++++++--------------- config_RedHat_9.xml | 30 +++++++++++++++--------------- config_Scientific_4.2.xml | 30 +++++++++++++++--------------- config_Scientific_4.3.xml | 30 +++++++++++++++--------------- src/SALOME_InstallWizard.cxx | 10 +++++++--- 11 files changed, 157 insertions(+), 153 deletions(-) diff --git a/config.xml b/config.xml index 1c5cd14..d1866e9 100644 --- a/config.xml +++ b/config.xml @@ -242,7 +242,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Numeric,Swig,Qt,Hdf,OmniORB,Doxygen,Graphviz,docutils" - installdiskspace="11153" + installdiskspace="90934,11153" temporarydiskspace="0" pickupenv="true" script="KERNEL_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="10313" + installdiskspace="83601,10313" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="10313" + installdiskspace="79189,10313" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="10313" + installdiskspace="83601,10313" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="10313" + installdiskspace="82864,10313" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="11387" + installdiskspace="97824,11387" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="6963" + installdiskspace="104784,6963" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="6963" + installdiskspace="104784,6963" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="6963" + installdiskspace="104784,6963" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="6963" + installdiskspace="104784,6963" temporarydiskspace="0" script="GUI_SRC.sh"/> @@ -266,7 +266,7 @@ supported="install sources" disable="false" dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,KERNELsrc" - installdiskspace="6963" + installdiskspace="104784,6963" temporarydiskspace="0" script="GUI_SRC.sh"/> isSources( item ) ) { - tots += dep.getSize(true); + tots += dep.getSize( !buildSrcBtn->isChecked() ); temps = max( temps, dep.getTempSize() ); } if ( !productsView->isNone( item ) ) @@ -1593,7 +1593,11 @@ void SALOME_InstallWizard::launchScript() } // ... sources ? else if ( productsView->isSources( item ) ) { - shellProcess->addArgument( buildSrcBtn->isChecked() ? "install_source_and_build" : "install_source" ); + shellProcess->addArgument( productsMap[ item ].hasContext( "salome sources" ) && + //!productsMap[ item ].hasContext( "salome binaries" ) && + buildSrcBtn->isChecked() ? + "install_source_and_build" : + "install_source" ); shellProcess->addArgument( QFileInfo( tmpFolder ).absFilePath() ); shellProcess->addArgument( QDir::currentDirPath() + "/Products/SOURCES" ); } @@ -2170,7 +2174,7 @@ void SALOME_InstallWizard::onSelectionChanged() } else if ( productsView->isSources( aItem ) ) { text += "" + tr( "install sources" ) + "" + "
"; - totSize = dep.getSize( true ); + totSize = dep.getSize( !buildSrcBtn->isChecked() ); tempSize = dep.getTempSize(); } else if ( productsView->isNative( aItem ) ) { -- 2.39.2