From: vsr Date: Tue, 25 Nov 2014 12:34:40 +0000 (+0300) Subject: Add HYBRIDPLUGIN module X-Git-Tag: V7_5_0~8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c554e17df00be91a5b6fdcfb6184769bfae49c44;p=tools%2Finstall.git Add HYBRIDPLUGIN module --- diff --git a/README b/README index 0910b7c..ee5bbbf 100644 --- a/README +++ b/README @@ -353,6 +353,7 @@ * GHS3DPRLPLUGIN -> KERNEL, GUI, GEOM, SMESH * BLSURFPLUGIN -> KERNEL, GUI, GEOM, SMESH * HexoticPLUGIN -> KERNEL, GUI, GEOM, SMESH, BLSURFPLUGIN + * HYBRIDPLUGIN -> KERNEL, GUI, GEOM, SMESH * HEXABLOCKPLUGIN -> KERNEL, GUI, GEOM, SMESH, HEXABLOCK Sample modules: @@ -378,8 +379,8 @@ compiling them if you do not plan to use NETGEN and/or GHS3D meshing algorithms and do not want to build samples. - Note: Meshing plug-ins BLSURFPLUGIN, HexoticPLUGIN, GHS3DPLUGIN and - GHS3DPRLPLUGIN require commercial license for the Distene + Note: Meshing plug-ins BLSURFPLUGIN, HexoticPLUGIN, GHS3DPLUGIN, + GHS3DPRLPLUGIN and HYBRIDPLUGIN require commercial license for the Distene meshers in runtime mode. Moreover, BLSURFPLUGIN requires blsurf product at the compilation time. Without it, the BLSURFPLUGIN meshing plugin compilation will fail. Refer diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index c49d268..a61e183 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -156,6 +156,16 @@ installdiskspace="6650,4728,16670" script="HexoticPLUGIN.sh"/> + + + @@ -968,6 +978,22 @@ SMESH BLSURFPLUGIN + + gcc + boost + OpenCascade + Python + Swig + Hdf5 + OmniORB + Doxygen + Graphviz + MeshGems + KERNEL + GUI + GEOM + SMESH + gcc OpenCascade diff --git a/config_CentOS_6.3_64bit.xml b/config_CentOS_6.3_64bit.xml index a4ec110..83a1d0c 100755 --- a/config_CentOS_6.3_64bit.xml +++ b/config_CentOS_6.3_64bit.xml @@ -156,6 +156,16 @@ installdiskspace="6650,4728,16670" script="HexoticPLUGIN.sh"/> + + + @@ -944,6 +954,22 @@ SMESH BLSURFPLUGIN + + gcc + boost + OpenCascade + Python + Swig + Hdf5 + OmniORB + Doxygen + Graphviz + MeshGems + KERNEL + GUI + GEOM + SMESH + OpenCascade Python diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index d511dc2..15a25ca 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -156,6 +156,16 @@ installdiskspace="6650,4728,16670" script="HexoticPLUGIN.sh"/> + + + @@ -944,6 +954,22 @@ SMESH BLSURFPLUGIN + + gcc + boost + OpenCascade + Python + Swig + Hdf5 + OmniORB + Doxygen + Graphviz + MeshGems + KERNEL + GUI + GEOM + SMESH + OpenCascade Python diff --git a/config_Debian_7_64bit.xml b/config_Debian_7_64bit.xml index 17fe620..f0daf66 100644 --- a/config_Debian_7_64bit.xml +++ b/config_Debian_7_64bit.xml @@ -156,6 +156,16 @@ installdiskspace="6650,4728,16670" script="HexoticPLUGIN.sh"/> + + + @@ -944,6 +954,22 @@ SMESH BLSURFPLUGIN + + gcc + boost + OpenCascade + Python + Swig + Hdf5 + OmniORB + Doxygen + Graphviz + MeshGems + KERNEL + GUI + GEOM + SMESH + OpenCascade Python diff --git a/config_Fedora_18_64bit.xml b/config_Fedora_18_64bit.xml index 67eddd7..94fc84a 100755 --- a/config_Fedora_18_64bit.xml +++ b/config_Fedora_18_64bit.xml @@ -156,6 +156,16 @@ installdiskspace="6650,4728,16670" script="HexoticPLUGIN.sh"/> + + + @@ -944,6 +954,22 @@ SMESH BLSURFPLUGIN + + gcc + boost + OpenCascade + Python + Swig + Hdf5 + OmniORB + Doxygen + Graphviz + MeshGems + KERNEL + GUI + GEOM + SMESH + OpenCascade Python diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml index 93732d7..5183802 100755 --- a/config_Mandriva_2010.0_64bit.xml +++ b/config_Mandriva_2010.0_64bit.xml @@ -156,6 +156,16 @@ installdiskspace="6650,4728,16670" script="HexoticPLUGIN.sh"/> + + + @@ -940,6 +950,22 @@ SMESH BLSURFPLUGIN + + gcc + boost + OpenCascade + Python + Swig + Hdf5 + OmniORB + Doxygen + Graphviz + MeshGems + KERNEL + GUI + GEOM + SMESH + OpenCascade Python diff --git a/config_Ubuntu_13.10_64bit.xml b/config_Ubuntu_13.10_64bit.xml index c2b2739..95c91b1 100644 --- a/config_Ubuntu_13.10_64bit.xml +++ b/config_Ubuntu_13.10_64bit.xml @@ -156,6 +156,16 @@ installdiskspace="6650,4728,16670" script="HexoticPLUGIN.sh"/> + + + @@ -944,6 +954,22 @@ SMESH BLSURFPLUGIN + + gcc + boost + OpenCascade + Python + Swig + Hdf5 + OmniORB + Doxygen + Graphviz + MeshGems + KERNEL + GUI + GEOM + SMESH + OpenCascade Python diff --git a/config_files/HYBRIDPLUGIN.sh b/config_files/HYBRIDPLUGIN.sh new file mode 100644 index 0000000..60c3d5a --- /dev/null +++ b/config_files/HYBRIDPLUGIN.sh @@ -0,0 +1,155 @@ +#!/bin/bash -noprofile + +#################################################################################### +# File : HYBRIDPLUGIN.sh +# Created : Thu Nov 25 2014 +# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) +# Project : SALOME +# Module : Installation Wizard +# Copyright : 2002-2014 CEA +# +# This script is the part of the SALOME installation procedure. +# +#################################################################################### + +check_version(){ +if [ -n "${HYBRIDPLUGIN_ROOT_DIR}" ]; then + check_lib_version VERSION ${HYBRIDPLUGIN_ROOT_DIR}/bin/salome + if [ "$?" -eq "0" ]; then + ver=`head -n1 ${HYBRIDPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` + if [ "${ver}" = "${SALOME_VERSION}" ]; then + return 0 + fi + fi + return 0 +elif [ -n "${HYBRIDPLUGIN_SRC_DIR}" ]; then + check_salome_src_version HYBRIDPLUGIN_SRC_DIR + if [ $? -eq 0 ] ; then return 0 ; fi + return 1 +fi +return 1 +} + +print_env_bin(){ +cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh < ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <