##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
#!/bin/sh
check_version(){
-if [ -n "${MED_ROOT_DIR}" ]; then
- check_lib_version VERSION ${MED_ROOT_DIR}/bin
+if [ -n "${SMESH_ROOT_DIR}" ]; then
+ check_lib_version VERSION ${SMESH_ROOT_DIR}/bin
if [ "$?" -eq "0" ]; then
- ver=`cat ${MED_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' `
+ ver=`cat ${SMESH_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' `
if [ "$ver" = "1.4.1" ]; then
return 0
fi
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
#!/bin/sh
check_version(){
-if [ -n "${MED_ROOT_DIR}" ]; then
- check_lib_version VERSION ${MED_ROOT_DIR}/bin
+if [ -n "${SUPERV_ROOT_DIR=}" ]; then
+ check_lib_version VERSION ${SUPERV_ROOT_DIR=}/bin
if [ "$?" -eq "0" ]; then
- ver=`cat ${MED_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' `
+ ver=`cat ${SUPERV_ROOT_DIR=}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' `
if [ "$ver" = "1.4.1" ]; then
return 0
fi
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
#!/bin/sh
check_version(){
-if [ -n "${MED_ROOT_DIR}" ]; then
- check_lib_version VERSION ${MED_ROOT_DIR}/bin
+if [ -n "${VISU_ROOT_DIR}" ]; then
+ check_lib_version VERSION ${VISU_ROOT_DIR}/bin
if [ "$?" -eq "0" ]; then
- ver=`cat ${MED_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' `
+ ver=`cat ${VISU_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' `
if [ "$ver" = "1.4.1" ]; then
return 0
fi
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
}
# looks for the native product and collects it's environment (used by make_env())
+++ /dev/null
-#!/bin/sh
-
-check_version()
-{
-# check existance of netgen plugin
-# unfortunarely we can't find anything about netgen plugin version
-if [ -n "$NETGENPLUGINROOT" ]; then
- return 0
-fi
-return 1
-}
-
-print_env()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export NETGENPLUGINROOT=\${INSTALL_ROOT}/${PRODUCT}
-export SALOME_NETGENPluginResources=\${NETGENPLUGINROOT}
-export LD_LIBRARY_PATH=\${NETGENPLUGINROOT}/lib:\${LD_LIBRARY_PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-}
-
-# this product can't be native
-try_native(){
-return 1;
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-makedir ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/netgenplugin1.0.tgz -C ${INSTALL_WORK}
-
-cd ${PRODUCT_WORK}
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-
-mkdir -p ${PRODUCT_DIR}/lib
-cp -f ${PRODUCT_WORK}/.libs/*.so ${PRODUCT_DIR}/lib
-cp -f ${PRODUCT_WORK}/NETGENPlugin_icons.po ${PRODUCT_DIR}
-
-rm -fr ${PRODUCT_WORK}
-print_env
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/netgenplugin1.0.tgz -C ${INSTALL_ROOT}
-
-print_env
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="netgenplugin" ; fi
-export PRODUCT="netgenplugin1.0"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-source ./common.sh
-$PROCEDURE
cout << "All products have been installed successfully" << endl;
#endif
// all products installed successfully
+ QFileInfo fi_sh ( targetFolder->text() + "/env_products.sh");
+ QFileInfo fi_csh( targetFolder->text() + "/env_products.csh");
+ QCheckListItem* itemBin = findItem( "KERNEL-Bin" );
+ QCheckListItem* itemSrc = findItem( "KERNEL-Bin" );
+ if ( itemBin /*&& !productsView->isNone( itemBin )*/ ) {
+ if ( fi_sh.exists() ) {
+ QString script = "cp " + fi_sh.filePath() + " " + targetFolder->text() + "/KERNEL_" + itemBin->text(1) + "/salome.sh";
+ if ( system( script.latin1() ) ) {}
+ }
+ if ( fi_csh.exists() ) {
+ QString script = "cp " + fi_csh.filePath() + " " + targetFolder->text() + "/KERNEL_" + itemBin->text(1) + "/salome.csh";
+ if ( system( script.latin1() ) ) {}
+ }
+ }
+ if ( itemSrc /*&& !productsView->isNone( itemSrc )*/ ) {
+ if ( fi_sh.exists() ) {
+ QString script = "cp " + fi_sh.filePath() + " " + targetFolder->text() + "/KERNEL_SRC_" + itemSrc->text(1) + "/salome.sh";
+ if ( system( script.latin1() ) ) {}
+ }
+ if ( fi_csh.exists() ) {
+ QString script = "cp " + fi_csh.filePath() + " " + targetFolder->text() + "/KERNEL_SRC_" + itemSrc->text(1) + "/salome.csh";
+ if ( system( script.latin1() ) ) {}
+ }
+ }
// <Next> button
nextButton()->setEnabled( true );
nextButton()->setText( tr( "&Next >" ) );
void SALOME_InstallWizard::onLaunchSalome()
{
QCheckListItem* item = 0;
- if ( ( item = findItem( "SalomePro-Bin" ) ) ) {
- QFileInfo fi( targetFolder->text() + "/SalomePro-" + item->text(1) + "/salome" );
+ if ( ( item = findItem( "KERNEL-Bin" ) ) ) {
+ QFileInfo fi( targetFolder->text() + "/KERNEL_" + item->text(1) + "/bin/salome/runSalome" );
if ( fi.exists() ) {
QString script;
- script += "cd " + targetFolder->text() + "/SalomePro-" + item->text(1) + "; ";
+ script += "cd " + targetFolder->text() + "/KERNEL_" + item->text(1) + "; ";
script += "source salome.csh; ";
+ script += "cd bin/salome; ";
//script += "cd bin; ";
//script += "runSalome > /dev/null";
- script += "salome -g > /dev/null";
+ script += "runSalome > /dev/null";
script = "(csh -c '" + script + "')";
#ifdef DEBUG
cout << script.latin1() << endl;
}
else if ( aPage == readmePage ) {
QCheckListItem* item = 0;
- runSalomeBtn->setEnabled( ( item = findItem( "SalomePro-Bin" ) ) &&
- QFileInfo( targetFolder->text() + "/SalomePro-" + item->text(1) + "/salome" ).exists() );
+ runSalomeBtn->setEnabled( ( item = findItem( "KERNEL-Bin" ) ) &&
+ QFileInfo( targetFolder->text() + "/KERNEL_" + item->text(1) + "/bin/salome/runSalome" ).exists() );
finishButton()->setEnabled( true );
}
previousPage = aPage;