*** empty log message ***

diff --git a/SALOME_4_0rc1.pdf b/SALOME_4_0rc1.pdf
new file mode 100755 (executable)
index 0000000..b3cf739
Binary files /dev/null and b/SALOME_4_0rc1.pdf differ

diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard
index 609fc03e8474abcb6edfed2bd0b642e116c40037..c605690532370d4c1c489f4e86293711827905a1 100755 (executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ

diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml
index 736138335a8a91d6b8f7ca8fc55486fccb6384ca..d296cf006f71f118a08f3c8fd01b9b3c36abed14 100755 (executable)
--- a/config_Mandriva_2006.0.xml
+++ b/config_Mandriva_2006.0.xml
@@ -454,6 +454,61 @@
           installdiskspace="208"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_BIN.sh"/>
+  <product name="GHS3DPRLPLUGINsrc" 
+           version="4.0.0" 
+           context="salome sources" 
+           description="SMESH plugin from CEA sources."
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,netgen,KERNELsrc,GUIsrc,GEOMsrc,MEDsrc,SMESHsrc"
+          installdiskspace="2516,120"
+          temporarydiskspace="0"
+          script="GHS3DPRLPLUGIN_SRC.sh"/>
+  <product name="GHS3DPRLPLUGINbin" 
+           version="4.0.0" 
+           context="salome binaries" 
+           description="Precompiled SMESH plugin from CEA."
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,netgen,KERNELbin,GUIbin,GEOMbin,MEDbin,SMESHbin"
+          installdiskspace="208"
+          temporarydiskspace="0"
+          script="GHS3DPRLPLUGIN_BIN.sh"/>
+  <product name="HexoticPLUGINsrc" 
+           version="4.0.0" 
+           context="salome sources" 
+           description="SMESH plugin from CEA sources."
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,netgen,KERNELsrc,GUIsrc,GEOMsrc,MEDsrc,SMESHsrc"
+          installdiskspace="2516,120"
+          temporarydiskspace="0"
+          script="HexoticPLUGIN_SRC.sh"/>
+  <product name="HexoticPLUGINbin" 
+           version="4.0.0" 
+           context="salome binaries" 
+           description="Precompiled SMESH plugin from CEA."
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,netgen,KERNELbin,GUIbin,GEOMbin,MEDbin,SMESHbin"
+          installdiskspace="208"
+          temporarydiskspace="0"
+          script="HexoticPLUGIN_BIN.sh"/>
+  <product name="BLSURFPLUGINsrc" 
+           version="4.0.0" 
+           context="salome sources" 
+           description="SMESH plugin from CEA sources."
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,boost,OpenCascade,Python,Swig,Qt,msg2qm,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,netgen,KERNELsrc,GUIsrc,GEOMsrc,MEDsrc,SMESHsrc"
+          installdiskspace="2516,120"
+          temporarydiskspace="0"
+          script="BLSURFPLUGIN_SRC.sh"/>
   <product name="COMPONENTsrc"
            version="4.0.0" 
            context="salome sources" 

diff --git a/config_files/BLSURFPLUGIN_SRC.sh b/config_files/BLSURFPLUGIN_SRC.sh
new file mode 100755 (executable)
index 0000000..59eb3f8
--- /dev/null
+++ b/config_files/BLSURFPLUGIN_SRC.sh
@@ -0,0 +1,107 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : BLSURFPLUGIN_SRC.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2007 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+VERSION="4.0.0"
+
+check_version(){
+if [ -n "${BLSURFPLUGIN_SRC_DIR}" ]; then
+    if [ -f ${BLSURFPLUGIN_SRC_DIR}/configure.in.base ]; then
+       ver=`grep -E "^VERSION=" ${BLSURFPLUGIN_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
+       if [ "$ver" = "${VERSION}" ]; then
+           return 0
+       fi
+    fi
+fi
+return 1
+}
+
+print_env(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export BLSURFPLUGIN_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
+##
+EOF
+
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export BLSURFPLUGIN_SRC_DIR=${BLSURFPLUGIN_SRC_DIR}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+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
+
+check_jb tar xfz ${SOURCE_DIR}/BLSURFPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+prod_bin=`echo $PRODUCT_TYPE | sed "s%src%bin%g"`
+mkdir -p ${INSTALL_ROOT}/BLSURFPLUGIN_${VERSION}
+
+if [ -e ./build.sh ] ; then
+    cp -f ./build.sh ${INSTALL_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INSTALL_ROOT}
+check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT BLSURFPLUGIN
+
+# create environment for the built binaries
+cd $CUR_DIR
+./BLSURFPLUGIN_BIN.sh print_env $INSTALL_WORK $SOURCE_DIR $INSTALL_ROOT $PRODUCT_SEQUENCE $prod_bin
+}
+
+install_binary()
+{
+return 1
+}
+
+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="BLSURFPLUGINsrc" ; fi
+export PRODUCT="BLSURFPLUGIN_SRC_${VERSION}"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 

diff --git a/config_files/GHS3DPRLPLUGIN_BIN.sh b/config_files/GHS3DPRLPLUGIN_BIN.sh
new file mode 100755 (executable)
index 0000000..63759ad
--- /dev/null
+++ b/config_files/GHS3DPRLPLUGIN_BIN.sh
@@ -0,0 +1,114 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : GHS3DPRLPLUGIN_BIN.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2007 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+VERSION="4.0.0"
+
+check_version(){
+if [ -n "${GHS3DPRLPLUGIN_ROOT_DIR}" ]; then
+    check_lib_version VERSION ${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
+       ver=`cat ${GHS3DPRLPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+       if [ "$ver" = "${VERSION}" ]; then
+           return 0
+       fi
+    fi
+  return 0
+fi
+return 1
+}
+
+print_env(){
+
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
+
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GHS3DPRLPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GHS3DPRLPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${GHS3DPRLPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+return 1
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+
+# modify all *.la files
+export GHS3DPRLPLUGIN_ROOT_DIR=${PRODUCT_DIR}
+modif_la_files ${PRODUCT_DIR}
+
+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="GHS3DPRLPLUGINbin" ; fi
+export PRODUCT="GHS3DPRLPLUGIN_${VERSION}"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 

diff --git a/config_files/GHS3DPRLPLUGIN_SRC.sh b/config_files/GHS3DPRLPLUGIN_SRC.sh
new file mode 100755 (executable)
index 0000000..921dbdb
--- /dev/null
+++ b/config_files/GHS3DPRLPLUGIN_SRC.sh
@@ -0,0 +1,107 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : GHS3DPRLPLUGIN_SRC.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2007 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+VERSION="4.0.0"
+
+check_version(){
+if [ -n "${GHS3DPRLPLUGIN_SRC_DIR}" ]; then
+    if [ -f ${GHS3DPRLPLUGIN_SRC_DIR}/configure.in.base ]; then
+       ver=`grep -E "^VERSION=" ${GHS3DPRLPLUGIN_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
+       if [ "$ver" = "${VERSION}" ]; then
+           return 0
+       fi
+    fi
+fi
+return 1
+}
+
+print_env(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GHS3DPRLPLUGIN_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
+##
+EOF
+
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GHS3DPRLPLUGIN_SRC_DIR=${GHS3DPRLPLUGIN_SRC_DIR}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+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
+
+check_jb tar xfz ${SOURCE_DIR}/GHS3DPRLPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+prod_bin=`echo $PRODUCT_TYPE | sed "s%src%bin%g"`
+mkdir -p ${INSTALL_ROOT}/GHS3DPRLPLUGIN_${VERSION}
+
+if [ -e ./build.sh ] ; then
+    cp -f ./build.sh ${INSTALL_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INSTALL_ROOT}
+check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT GHS3DPRLPLUGIN
+
+# create environment for the built binaries
+cd $CUR_DIR
+./GHS3DPRLPLUGIN_BIN.sh print_env $INSTALL_WORK $SOURCE_DIR $INSTALL_ROOT $PRODUCT_SEQUENCE $prod_bin
+}
+
+install_binary()
+{
+return 1
+}
+
+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="GHS3DPRLPLUGINsrc" ; fi
+export PRODUCT="GHS3DPRLPLUGIN_SRC_${VERSION}"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 

diff --git a/config_files/HexoticPLUGIN_BIN.sh b/config_files/HexoticPLUGIN_BIN.sh
new file mode 100755 (executable)
index 0000000..63af617
--- /dev/null
+++ b/config_files/HexoticPLUGIN_BIN.sh
@@ -0,0 +1,114 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : HexoticPLUGIN_BIN.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2007 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+VERSION="4.0.0"
+
+check_version(){
+if [ -n "${HexoticPLUGIN_ROOT_DIR}" ]; then
+    check_lib_version VERSION ${HexoticPLUGIN_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
+       ver=`cat ${HexoticPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
+       if [ "$ver" = "${VERSION}" ]; then
+           return 0
+       fi
+    fi
+  return 0
+fi
+return 1
+}
+
+print_env(){
+
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
+
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HexoticPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if test `uname -m` = "x86_64" ; then
+export LIB_PREFIX=64
+else
+export LIB_PREFIX=""
+fi
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HexoticPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${HexoticPLUGIN_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+return 1
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+
+# modify all *.la files
+export HexoticPLUGIN_ROOT_DIR=${PRODUCT_DIR}
+modif_la_files ${PRODUCT_DIR}
+
+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="HexoticPLUGINbin" ; fi
+export PRODUCT="HexoticPLUGIN_${VERSION}"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 

diff --git a/config_files/HexoticPLUGIN_SRC.sh b/config_files/HexoticPLUGIN_SRC.sh
new file mode 100755 (executable)
index 0000000..85c73e3
--- /dev/null
+++ b/config_files/HexoticPLUGIN_SRC.sh
@@ -0,0 +1,107 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : HexoticPLUGIN_SRC.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2007 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+VERSION="4.0.0"
+
+check_version(){
+if [ -n "${HexoticPLUGIN_SRC_DIR}" ]; then
+    if [ -f ${HexoticPLUGIN_SRC_DIR}/configure.in.base ]; then
+       ver=`grep -E "^VERSION=" ${HexoticPLUGIN_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' ` 
+       if [ "$ver" = "${VERSION}" ]; then
+           return 0
+       fi
+    fi
+fi
+return 1
+}
+
+print_env(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HexoticPLUGIN_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
+##
+EOF
+
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HexoticPLUGIN_SRC_DIR=${HexoticPLUGIN_SRC_DIR}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+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
+
+check_jb tar xfz ${SOURCE_DIR}/HexoticPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+prod_bin=`echo $PRODUCT_TYPE | sed "s%src%bin%g"`
+mkdir -p ${INSTALL_ROOT}/HexoticPLUGIN_${VERSION}
+
+if [ -e ./build.sh ] ; then
+    cp -f ./build.sh ${INSTALL_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INSTALL_ROOT}
+check_jb build.sh -o -b -d -v 0 -p $INSTALL_ROOT HexoticPLUGIN
+
+# create environment for the built binaries
+cd $CUR_DIR
+./HexoticPLUGIN_BIN.sh print_env $INSTALL_WORK $SOURCE_DIR $INSTALL_ROOT $PRODUCT_SEQUENCE $prod_bin
+}
+
+install_binary()
+{
+return 1
+}
+
+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="HexoticPLUGINsrc" ; fi
+export PRODUCT="HexoticPLUGIN_SRC_${VERSION}"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 

diff --git a/config_files/build.csh b/config_files/build.csh
index 9a6a00350ab50efa5e0e532fb11bbda0104340c8..a4caa34657d6d6659313987155aedfa5b958373e 100755 (executable)
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -21,7 +21,7 @@ set is_delete=0
 set verbose_level=2
 set params=""
 set b_params=""
-set modules=(KERNEL GUI GEOM MED SMESH VISU SUPERV NETGENPLUGIN GHS3DPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT)
+set modules=(KERNEL GUI GEOM MED SMESH VISU SUPERV NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT)
 set optim=""
 set is_install=0
 set is_help=0

diff --git a/config_files/build.sh b/config_files/build.sh
index a69232fbbbac881cb8928976d7913844461acd54..7b7f420c098fd79cf60d1911302536b2a30c9e1c 100755 (executable)
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -83,7 +83,7 @@ is_delete=0
 verbose_level=2
 params=""
 b_params=""
-modules="KERNEL GUI GEOM MED SMESH VISU SUPERV NETGENPLUGIN GHS3DPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT"
+modules="KERNEL GUI GEOM MED SMESH VISU SUPERV NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT"
 optim=""
 is_install=0
 is_tui=0

diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index 3a8121ddd0be067464045e522e388527de1e4d1b..583380cea668ad0d40372464bea627e9f20d1920 100644 (file)
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -720,10 +720,12 @@ void SALOME_InstallWizard::setupProductsPage(const bool forceSrc)
   sizeLayout->addWidget( requiredSize, 0, 1 );
   sizeLayout->addWidget( reqLab2,      1, 0 );
   sizeLayout->addWidget( requiredTemp, 1, 1 );
+  // <More...>/<Less...> box super-container :)
+  QVBox* moreLessBox = new QVBox( productsPage );
   //
   // create <More...> mode widgets container
   //
-  moreBox = new QWidget( productsPage );
+  moreBox = new QWidget( moreLessBox );
   QGridLayout* moreBoxLayout = new QGridLayout( moreBox );
   moreBoxLayout->setMargin( 0 ); moreBoxLayout->setSpacing( 6 );
   //
@@ -770,7 +772,7 @@ void SALOME_InstallWizard::setupProductsPage(const bool forceSrc)
   //
   // create <Less...> mode widgets container
   //
-  lessBox = new QWidget( productsPage );
+  lessBox = new QWidget( moreLessBox );
   QGridLayout* lessBoxLayout = new QGridLayout( lessBox );
   lessBoxLayout->setMargin( 0 ); lessBoxLayout->setSpacing( 6 );
   //
@@ -798,13 +800,10 @@ void SALOME_InstallWizard::setupProductsPage(const bool forceSrc)
   pageLayout->addMultiCellWidget( tempLab,      2, 2, 0, 1 );
   pageLayout->addWidget         ( tempFolder,   3,    0    );
   pageLayout->addWidget         ( tempBtn,      3,    1    );
-  pageLayout->addMultiCellWidget( moreBox,      4, 4, 0, 1 );
-  pageLayout->addMultiCellWidget( lessBox,      5, 5, 0, 1 );
-  pageLayout->addMultiCellWidget( line,         6, 6, 0, 1 );
-  pageLayout->addLayout         ( sizeLayout,   7,    0    );
-  pageLayout->addWidget         ( moreBtn,      7,    1    );
-  pageLayout->setRowStretch( 4, 5 );
-  pageLayout->setRowStretch( 5, 5 );
+  pageLayout->addMultiCellWidget( moreLessBox,  4, 4, 0, 1 );
+  pageLayout->addMultiCellWidget( line,         5, 5, 0, 1 );
+  pageLayout->addLayout         ( sizeLayout,   6,    0    );
+  pageLayout->addWidget         ( moreBtn,      6,    1    );
   //
   // xml reader
   //
@@ -1836,7 +1835,7 @@ void SALOME_InstallWizard::reject()
                                   tr( "&Yes" ),
                                   tr( "&No" ),
                                   QString::null,
-                                  0,
+                                  1,
                                   1 ) == 1 ) {
       return;
     }

diff --git a/src/SALOME_ProductsView.cxx b/src/SALOME_ProductsView.cxx
index 5268830d2d86ddcebfbec7de780f90e708db73a2..c68ae029922c408f92fa9bbbea6dd43284858247 100644 (file)
--- a/src/SALOME_ProductsView.cxx
+++ b/src/SALOME_ProductsView.cxx
@@ -129,6 +129,8 @@ void ProductsView::itemActivated( QCheckListItem* item ) {
 // ================================================================
 bool ProductsView::isBinaries( QCheckListItem* item ) const
 {
+  if ( !item ) 
+    return false;
   if ( item->childCount() > 0 && item->isEnabled() ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     while( subItem ) {
@@ -147,6 +149,8 @@ bool ProductsView::isBinaries( QCheckListItem* item ) const
 // ================================================================
 bool ProductsView::isSources( QCheckListItem* item ) const
 {
+  if ( !item ) 
+    return false;
   if ( item->childCount() > 0 && item->isEnabled() ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     while( subItem ) {
@@ -168,6 +172,8 @@ bool ProductsView::isSources( QCheckListItem* item ) const
 // ================================================================
 bool ProductsView::isNative( QCheckListItem* item ) const
 {
+  if ( !item ) 
+    return false;
   if ( item->childCount() > 0 && item->isEnabled() ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     while( subItem ) {
@@ -196,6 +202,8 @@ bool ProductsView::isNone(  QCheckListItem* item ) const
  */
 // ================================================================
 void ProductsView::setBinaries( QCheckListItem* item ) {
+  if ( !item ) 
+    return;
   if ( item->childCount() > 0 ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     QCheckListItem* srcItem = 0;
@@ -228,6 +236,8 @@ void ProductsView::setBinaries( QCheckListItem* item ) {
  */
 // ================================================================
 void ProductsView::setSources( QCheckListItem* item )  {
+  if ( !item ) 
+    return;
   if ( item->childCount() > 0 ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     QCheckListItem* binItem = 0;
@@ -260,6 +270,8 @@ void ProductsView::setSources( QCheckListItem* item )  {
  */
 // ================================================================
 void ProductsView::setNative( QCheckListItem* item )  {
+  if ( !item ) 
+    return;
   if ( item->childCount() > 0 ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     QCheckListItem* binItem = 0;
@@ -291,6 +303,8 @@ void ProductsView::setNative( QCheckListItem* item )  {
  */
 // ================================================================
 void ProductsView::setNone( QCheckListItem* item )  {
+  if ( !item ) 
+    return;
   if ( item->childCount() > 0 ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     while( subItem ) {
@@ -314,6 +328,8 @@ void ProductsView::setNone( QCheckListItem* item )  {
 // ================================================================
 bool ProductsView::hasBinaries( QCheckListItem* item ) const
 {
+  if ( !item ) 
+    return false;
   if ( item->childCount() > 0 ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     while( subItem ) {
@@ -333,6 +349,8 @@ bool ProductsView::hasBinaries( QCheckListItem* item ) const
 // ================================================================
 bool ProductsView::hasSources( QCheckListItem* item ) const
 {
+  if ( !item ) 
+    return false;
   if ( item->childCount() > 0 ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     while( subItem ) {
@@ -352,6 +370,8 @@ bool ProductsView::hasSources( QCheckListItem* item ) const
 // ================================================================
 bool ProductsView::hasNative( QCheckListItem* item ) const
 {
+  if ( !item ) 
+    return false;
   if ( item->childCount() > 0 ) {
     QCheckListItem* subItem = (QCheckListItem*)( item->firstChild() );
     while( subItem ) {
@@ -371,6 +391,8 @@ bool ProductsView::hasNative( QCheckListItem* item ) const
 // ================================================================
 void ProductsView::setItemEnabled( QCheckListItem* item, const bool enable )
 {
+  if ( !item ) 
+    return;
   item->setEnabled( enable );
   QListViewItem* subItem = item->firstChild();
   while( subItem ) {