]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Add HYBRIDPLUGIN module
authorvsr <vsr@opencascade.com>
Tue, 25 Nov 2014 12:34:40 +0000 (15:34 +0300)
committervsr <vsr@opencascade.com>
Tue, 25 Nov 2014 12:34:40 +0000 (15:34 +0300)
README
config_CentOS_5.5_64bit.xml
config_CentOS_6.3_64bit.xml
config_Debian_6.0_64bit.xml
config_Debian_7_64bit.xml
config_Fedora_18_64bit.xml
config_Mandriva_2010.0_64bit.xml
config_Ubuntu_13.10_64bit.xml
config_files/HYBRIDPLUGIN.sh [new file with mode: 0644]
config_files/build.sh
config_files/common.sh

diff --git a/README b/README
index 0910b7cfe4b6ba04afb135b526532299b4709910..ee5bbbfe2e079f32b8cb446c803d57a18fd3418e 100644 (file)
--- a/README
+++ b/README
           * 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:
           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
index c49d268a873b62ba1ef645d7acf60af8ed5206e4..a61e183befeb87ac1c295e4d56012162d9361fce 100755 (executable)
                    installdiskspace="6650,4728,16670"
                    script="HexoticPLUGIN.sh"/>
     </product>
+    <product name="HYBRIDPLUGIN" 
+             type="component"
+            description="SALOME platform hybrid meshing algorithm plugin. For use this plugin you should add the path to mg-hybrid.bash to your PATH environment variable.">
+      <installation os="CentOS 5.5 64bit"
+                    version="7.5.0" 
+                   disable="false"
+                   woguimode="true"
+                   installdiskspace="4144,1880,13132"
+                   script="HYBRIDPLUGIN.sh"/>
+    </product>
     <product name="COMPONENT"
              type="component"
             description="SALOME platform COMPONENT module">
       <dep>SMESH</dep>
       <dep>BLSURFPLUGIN</dep>
     </product>
+    <product name="HYBRIDPLUGIN">
+      <dep>gcc</dep>
+      <dep>boost</dep>
+      <dep>OpenCascade</dep>
+      <dep>Python</dep>
+      <dep>Swig</dep>
+      <dep>Hdf5</dep>
+      <dep>OmniORB</dep>
+      <dep>Doxygen</dep>
+      <dep>Graphviz</dep>
+      <dep>MeshGems</dep>
+      <dep>KERNEL</dep>
+      <dep>GUI</dep>
+      <dep>GEOM</dep>
+      <dep>SMESH</dep>
+    </product>
     <product name="COMPONENT">
       <dep>gcc</dep>
       <dep>OpenCascade</dep>
index a4ec11062c1d4bf53822a42c4dac7664c7a299a9..83a1d0c0a681eaa26b5bb1fd7fb9674d3365d5e7 100755 (executable)
                    installdiskspace="6650,4728,16670"
                    script="HexoticPLUGIN.sh"/>
     </product>
+    <product name="HYBRIDPLUGIN" 
+             type="component"
+            description="SALOME platform hybrid meshing algorithm plugin. For use this plugin you should add the path to mg-hybrid.bash to your PATH environment variable.">
+      <installation os="CentOS 5.5 64bit"
+                    version="7.5.0" 
+                   disable="false"
+                   woguimode="true"
+                   installdiskspace="4144,1880,13132"
+                   script="HYBRIDPLUGIN.sh"/>
+    </product>
     <product name="COMPONENT"
              type="component"
             description="SALOME platform COMPONENT module">
       <dep>SMESH</dep>
       <dep>BLSURFPLUGIN</dep>
     </product>
+    <product name="HYBRIDPLUGIN">
+      <dep>gcc</dep>
+      <dep>boost</dep>
+      <dep>OpenCascade</dep>
+      <dep>Python</dep>
+      <dep>Swig</dep>
+      <dep>Hdf5</dep>
+      <dep>OmniORB</dep>
+      <dep>Doxygen</dep>
+      <dep>Graphviz</dep>
+      <dep>MeshGems</dep>
+      <dep>KERNEL</dep>
+      <dep>GUI</dep>
+      <dep>GEOM</dep>
+      <dep>SMESH</dep>
+    </product>
     <product name="COMPONENT">
       <dep>OpenCascade</dep>
       <dep>Python</dep>
index d511dc28fd083a5b9abb12a16a1cf347b81651bb..15a25cafd9891aa8eaceb2952d5e5b49cc07d8ca 100755 (executable)
                    installdiskspace="6650,4728,16670"
                    script="HexoticPLUGIN.sh"/>
     </product>
+    <product name="HYBRIDPLUGIN" 
+             type="component"
+            description="SALOME platform hybrid meshing algorithm plugin. For use this plugin you should add the path to mg-hybrid.bash to your PATH environment variable.">
+      <installation os="CentOS 5.5 64bit"
+                    version="7.5.0" 
+                   disable="false"
+                   woguimode="true"
+                   installdiskspace="4144,1880,13132"
+                   script="HYBRIDPLUGIN.sh"/>
+    </product>
     <product name="COMPONENT"
              type="component"
             description="SALOME platform COMPONENT module">
       <dep>SMESH</dep>
       <dep>BLSURFPLUGIN</dep>
     </product>
+    <product name="HYBRIDPLUGIN">
+      <dep>gcc</dep>
+      <dep>boost</dep>
+      <dep>OpenCascade</dep>
+      <dep>Python</dep>
+      <dep>Swig</dep>
+      <dep>Hdf5</dep>
+      <dep>OmniORB</dep>
+      <dep>Doxygen</dep>
+      <dep>Graphviz</dep>
+      <dep>MeshGems</dep>
+      <dep>KERNEL</dep>
+      <dep>GUI</dep>
+      <dep>GEOM</dep>
+      <dep>SMESH</dep>
+    </product>
     <product name="COMPONENT">
       <dep>OpenCascade</dep>
       <dep>Python</dep>
index 17fe620fa040819c87575c9576353a581b71d1f4..f0daf6628e6f85d8e18d052292eaed51a5001b2f 100644 (file)
                    installdiskspace="6650,4728,16670"
                    script="HexoticPLUGIN.sh"/>
     </product>
+    <product name="HYBRIDPLUGIN" 
+             type="component"
+            description="SALOME platform hybrid meshing algorithm plugin. For use this plugin you should add the path to mg-hybrid.bash to your PATH environment variable.">
+      <installation os="CentOS 5.5 64bit"
+                    version="7.5.0" 
+                   disable="false"
+                   woguimode="true"
+                   installdiskspace="4144,1880,13132"
+                   script="HYBRIDPLUGIN.sh"/>
+    </product>
     <product name="COMPONENT"
              type="component"
             description="SALOME platform COMPONENT module">
       <dep>SMESH</dep>
       <dep>BLSURFPLUGIN</dep>
     </product>
+    <product name="HYBRIDPLUGIN">
+      <dep>gcc</dep>
+      <dep>boost</dep>
+      <dep>OpenCascade</dep>
+      <dep>Python</dep>
+      <dep>Swig</dep>
+      <dep>Hdf5</dep>
+      <dep>OmniORB</dep>
+      <dep>Doxygen</dep>
+      <dep>Graphviz</dep>
+      <dep>MeshGems</dep>
+      <dep>KERNEL</dep>
+      <dep>GUI</dep>
+      <dep>GEOM</dep>
+      <dep>SMESH</dep>
+    </product>
     <product name="COMPONENT">
       <dep>OpenCascade</dep>
       <dep>Python</dep>
index 67eddd7d18d7dbcfbf37cd77dd73917642be5a96..94fc84a63a317153c50061988f33359280eace02 100755 (executable)
                    installdiskspace="6650,4728,16670"
                    script="HexoticPLUGIN.sh"/>
     </product>
+    <product name="HYBRIDPLUGIN" 
+             type="component"
+            description="SALOME platform hybrid meshing algorithm plugin. For use this plugin you should add the path to mg-hybrid.bash to your PATH environment variable.">
+      <installation os="CentOS 5.5 64bit"
+                    version="7.5.0" 
+                   disable="false"
+                   woguimode="true"
+                   installdiskspace="4144,1880,13132"
+                   script="HYBRIDPLUGIN.sh"/>
+    </product>
     <product name="COMPONENT"
              type="component"
             description="SALOME platform COMPONENT module">
       <dep>SMESH</dep>
       <dep>BLSURFPLUGIN</dep>
     </product>
+    <product name="HYBRIDPLUGIN">
+      <dep>gcc</dep>
+      <dep>boost</dep>
+      <dep>OpenCascade</dep>
+      <dep>Python</dep>
+      <dep>Swig</dep>
+      <dep>Hdf5</dep>
+      <dep>OmniORB</dep>
+      <dep>Doxygen</dep>
+      <dep>Graphviz</dep>
+      <dep>MeshGems</dep>
+      <dep>KERNEL</dep>
+      <dep>GUI</dep>
+      <dep>GEOM</dep>
+      <dep>SMESH</dep>
+    </product>
     <product name="COMPONENT">
       <dep>OpenCascade</dep>
       <dep>Python</dep>
index 93732d7dc31bf7c28afc96f22b4051f6f912f53a..5183802ed5078bd9b0c2d892df518ccf7a6cf578 100755 (executable)
                    installdiskspace="6650,4728,16670"
                    script="HexoticPLUGIN.sh"/>
     </product>
+    <product name="HYBRIDPLUGIN" 
+             type="component"
+            description="SALOME platform hybrid meshing algorithm plugin. For use this plugin you should add the path to mg-hybrid.bash to your PATH environment variable.">
+      <installation os="CentOS 5.5 64bit"
+                    version="7.5.0" 
+                   disable="false"
+                   woguimode="true"
+                   installdiskspace="4144,1880,13132"
+                   script="HYBRIDPLUGIN.sh"/>
+    </product>
     <product name="COMPONENT"
              type="component"
             description="SALOME platform COMPONENT module">
       <dep>SMESH</dep>
       <dep>BLSURFPLUGIN</dep>
     </product>
+    <product name="HYBRIDPLUGIN">
+      <dep>gcc</dep>
+      <dep>boost</dep>
+      <dep>OpenCascade</dep>
+      <dep>Python</dep>
+      <dep>Swig</dep>
+      <dep>Hdf5</dep>
+      <dep>OmniORB</dep>
+      <dep>Doxygen</dep>
+      <dep>Graphviz</dep>
+      <dep>MeshGems</dep>
+      <dep>KERNEL</dep>
+      <dep>GUI</dep>
+      <dep>GEOM</dep>
+      <dep>SMESH</dep>
+    </product>
     <product name="COMPONENT">
       <dep>OpenCascade</dep>
       <dep>Python</dep>
index c2b27397ff9bacce97da2c92883f739840dde973..95c91b14a1b2f67e20155bf090616721dad0b23d 100644 (file)
                    installdiskspace="6650,4728,16670"
                    script="HexoticPLUGIN.sh"/>
     </product>
+    <product name="HYBRIDPLUGIN" 
+             type="component"
+            description="SALOME platform hybrid meshing algorithm plugin. For use this plugin you should add the path to mg-hybrid.bash to your PATH environment variable.">
+      <installation os="CentOS 5.5 64bit"
+                    version="7.5.0" 
+                   disable="false"
+                   woguimode="true"
+                   installdiskspace="4144,1880,13132"
+                   script="HYBRIDPLUGIN.sh"/>
+    </product>
     <product name="COMPONENT"
              type="component"
             description="SALOME platform COMPONENT module">
       <dep>SMESH</dep>
       <dep>BLSURFPLUGIN</dep>
     </product>
+    <product name="HYBRIDPLUGIN">
+      <dep>gcc</dep>
+      <dep>boost</dep>
+      <dep>OpenCascade</dep>
+      <dep>Python</dep>
+      <dep>Swig</dep>
+      <dep>Hdf5</dep>
+      <dep>OmniORB</dep>
+      <dep>Doxygen</dep>
+      <dep>Graphviz</dep>
+      <dep>MeshGems</dep>
+      <dep>KERNEL</dep>
+      <dep>GUI</dep>
+      <dep>GEOM</dep>
+      <dep>SMESH</dep>
+    </product>
     <product name="COMPONENT">
       <dep>OpenCascade</dep>
       <dep>Python</dep>
diff --git a/config_files/HYBRIDPLUGIN.sh b/config_files/HYBRIDPLUGIN.sh
new file mode 100644 (file)
index 0000000..60c3d5a
--- /dev/null
@@ -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 <<EOF 
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export HYBRIDPLUGIN_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" = "1" ] ; then
+    export LD_LIBRARY_PATH=\${HYBRIDPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HYBRIDPLUGIN_ROOT_DIR}/lib/salome:\${HYBRIDPLUGIN_ROOT_DIR}/lib/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 ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
+export HYBRIDPLUGIN_SRC_DIR=\${INST_ROOT}/${PRODUCT_SRC}
+##
+EOF
+
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/${SHRC}
+
+check_jb tar xfz ${SOURCE_DIR}/HYBRIDPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+if [ -e ./build.sh ] && [ ! -e ${INST_ROOT}/build.sh ]; then
+    cp -f ./build.sh ${INST_ROOT}
+fi
+
+CUR_DIR=`pwd`
+cd ${INST_ROOT}
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
+    check_jb ./build.sh -d -p ${INST_ROOT} -DSALOME_BUILD_GUI=OFF HYBRIDPLUGIN
+else
+    check_jb ./build.sh -d -p ${INST_ROOT} HYBRIDPLUGIN
+fi
+
+cd ${CUR_DIR}
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+    test -d ${INST_ROOT}/"HYBRIDPLUGIN_BUILD" && rm -fr ${INST_ROOT}/"HYBRIDPLUGIN_BUILD"
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/${SHRC}
+
+# create a module directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+if [ ${INST_WITH_GUI} = "FALSE" ] ; then
+    check_jb tar xfz ${SOURCE_DIR}/HYBRIDPLUGINWOGUIbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+else
+    check_jb tar xfz ${SOURCE_DIR}/HYBRIDPLUGINbinariesV${SALOME_VERSION}.tar.gz -C ${PRODUCT_DIR}
+fi
+check_jb tar xfz ${SRC_DIR}/HYBRIDPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
+
+# modify all *.la files
+export HYBRIDPLUGIN_ROOT_DIR=${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHYBRIDPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHYBRIDPLUGINTargets-release.cmake 
+
+# to generate environment scripts
+try_preinstalled
+}
+
+source ./common.sh
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+SRC_DIR=$8;
+shift
+REMOVE_SRC_TMP=$8;
+shift
+INST_WITH_GUI=$9;
+shift
+SINGLE_DIR=$9;
+if [ -n "${SINGLE_DIR}" ] ; then SINGLE_DIR=${SDIR_NAME}; fi
+export PRODUCT="HYBRIDPLUGIN_${SALOME_VERSION}"
+export PRODUCT_SRC="HYBRIDPLUGIN_SRC_${SALOME_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
+${PROCEDURE} 
index 38cbd1dfb806608a6799e205f83205b4de094cc4..8fcf743c82d15c2774579e8d4501b1d47be09f8a 100755 (executable)
@@ -27,7 +27,7 @@ def_install_dir="$(pwd)/INSTALL"
 # default modules list
 def_modules=""
 def_modules="${def_modules} KERNEL GUI GEOM MED SMESH PARAVIS YACS HOMARD HEXABLOCK JOBMANAGER"
-def_modules="${def_modules} NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN HEXABLOCKPLUGIN"
+def_modules="${def_modules} NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN HYBRIDPLUGIN HEXABLOCKPLUGIN"
 def_modules="${def_modules} COMPONENT CALCULATOR PYCALCULATOR HELLO PYHELLO LIGHT PYLIGHT"
 def_modules="${def_modules} RANDOMIZER SIERPINSKY ATOMIC ATOMGEN ATOMSOLV DOCUMENTATION"
 
@@ -115,7 +115,7 @@ supports_wogui()
 {
     local res
     case $1 in
-       KERNEL | GEOM | MED | SMESH | NETGENPLUGIN | GHS3DPLUGIN | GHS3DPRLPLUGIN | BLSURFPLUGIN | HexoticPLUGIN ) res=0 ;;
+       KERNEL | GEOM | MED | SMESH | NETGENPLUGIN | GHS3DPLUGIN | GHS3DPRLPLUGIN | BLSURFPLUGIN | HexoticPLUGIN | HYBRIDPLUGIN ) res=0 ;;
        YACS | HEXABLOCK | HEXABLOCKPLUGIN ) res=0 ;;
        * ) res=1 ;;
     esac
index c2d0042056c356cca937f8b5e090a4396011db3c..95317fa488afc97d564a2345886a076134740554 100755 (executable)
@@ -1057,7 +1057,7 @@ modif_cfg_file(){
     local sm
     local smvar
     for sm in LIBBATCH SIMANIO KERNEL GUI GEOM MED SMESH PARAVIS YACS HEXABLOCK HOMARD JOBMANAGER \
-       NETGENPLUGIN BLSURFPLUGIN GHS3DPLUGIN GHS3DPRLPLUGIN HexoticPLUGIN HEXABLOCKPLUGIN \
+       NETGENPLUGIN BLSURFPLUGIN GHS3DPLUGIN GHS3DPRLPLUGIN HexoticPLUGIN HYBRIDPLUGIN HEXABLOCKPLUGIN \
        CALCULATOR PYCALCULATOR COMPONENT HELLO PYHELLO LIGHT PYLIGHT ATOMIC ATOMGEN ATOMSOLV RANDOMIZER SIERPINSKY ; do
        smvar=${sm}_ROOT_DIR
        if [ "${!smvar}" != "" ] ; then