spns #19079: rename top-ii-vol SALOME interface

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 867d38c71c6b1434d3579f1ee295507f4e5bebed..8664112cc04a14a2d7e84aec7058cc657903ebd1 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -120,7 +120,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        topo2volmesh: 'develop'
+        TopIIVolMesh: 'develop'
         urllib3 : '1.23'
         URANIE : '4.5.0'
         # SALOME MODULES :
@@ -134,7 +134,7 @@ APPLICATION :
         'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'}
         'GUI' : {verbose : 'yes'}
         'GEOM'
-        'SMESH': {tag: 'master', base: 'no', section: 'version_topo2volmesh'}
+        'SMESH': 'spns/19079'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 7aaafb55081c6822f79e89d6e1d06e2245d66966..ce7a6807bf7f4069031eec1fec2d4f492fdd2a09 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -121,7 +121,7 @@ APPLICATION :
         tbb : 'native'
         tcl : 'native'
         tk : 'native'
-        topo2volmesh: 'develop'
+        TopIIVolMesh: 'develop'
         urllib3 : 'native'
         URANIE : '4.5.0'
 
@@ -136,7 +136,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH' : {tag: 'master', base: 'no', section: 'version_topo2volmesh'}
+        'SMESH' : 'spns/19079'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 0b0d1aba22f4ca98d94528538e8efc914e636b1e..ec77278bb1b612b63238481cc9b1ec87d3e5c681 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -120,7 +120,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        topo2volmesh: 'develop'
+        TopIIVolMesh: 'develop'
         urllib3 : '1.23'
         URANIE : '4.5.0'
         # SALOME MODULES :
@@ -134,7 +134,7 @@ APPLICATION :
         'MEDCOUPLING'
         'GUI'
         'GEOM'
-        'SMESH': {tag: 'master', base: 'no', section: 'version_topo2volmesh'}
+        'SMESH': 'spns/19079'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'

diff --git a/products/SMESH.pyconf b/products/SMESH.pyconf
index c479b231f9a5c0075a862f0ddeea134d4a35bb02..59bab571fd5a4440be0e679c7599fdd3d2f15d21 100644 (file)
--- a/products/SMESH.pyconf
+++ b/products/SMESH.pyconf
@@ -42,7 +42,7 @@ default :
               "tbb"
              ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
-    opt_depend : ['SHAPERSTUDY']
+    opt_depend : ['SHAPERSTUDY', 'TopIIVolMesh']
     patches : []
     check_install : ["share/doc/salome/gui/SMESH/yams/index.html"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
@@ -120,11 +120,6 @@ default_MPI :
              ]
 }
 
-version_topo2volmesh:
-{
-   patches : ['smesh_spns-19079_topo2volmesh.patch']
-}
-
 version_V9_3_0 :
 {
     cmake_options : "-DSALOME_SMESH_USE_CGNS:BOOL=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF"

diff --git a/products/TopIIVolMesh.pyconf b/products/TopIIVolMesh.pyconf
new file mode 100644 (file)
index 0000000..b45dc31
--- /dev/null
+++ b/products/TopIIVolMesh.pyconf
@@ -0,0 +1,35 @@
+default :
+{
+    name : "TopIIVolMesh"
+    build_source : "script"
+    compil_script :  $name + $VARS.scriptExtension
+    get_source : "git"
+    git_info:
+    {
+        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/top_ii_vol.git"
+        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "top_ii_vol.git"
+    }
+    system_info :
+    {
+        rpm : []
+        rpm_dev : []
+        apt : []
+        apt_dev : []
+    }
+    environ :
+    {
+       env_script : $name + ".py"
+    }
+    patches : [] 
+    depend : []
+    opt_depend: ['openmpi']
+    build_depend : ["cmake"]
+    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    install_dir : 'base'
+    properties :
+    {
+      incremental : "yes"
+      single_install_dir : "yes"
+    }
+}

diff --git a/products/compil_scripts/TopIIVolMesh.sh b/products/compil_scripts/TopIIVolMesh.sh
new file mode 100755 (executable)
index 0000000..6f50baf
--- /dev/null
+++ b/products/compil_scripts/TopIIVolMesh.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+echo "##########################################################################"
+echo "TopIIVolMesh" $VERSION
+echo "##########################################################################"
+
+export CC=$(which mpicc)
+export CXX=$(which mpicxx)
+export MPICXX=$(which mpic++)
+
+CONFIGURE_FLAGS=
+CONFIGURE_FLAGS+=" --with-MPICXX=${MPICXX}"
+
+rm -rf $BUILD_DIR
+mkdir $BUILD_DIR
+cd $BUILD_DIR
+
+cp -r $SOURCE_DIR/* .
+
+echo
+echo "*** autoreconf -i"
+autoreconf -i
+if [ $? -ne 0 ]
+then
+    echo "ERROR on autoreconf command"
+    exit 1
+fi
+
+echo
+echo "*** configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS" 
+$BUILD_DIR/configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS
+if [ $? -ne 0 ]
+then
+    echo "ERROR on configure"
+    exit 2
+fi
+echo
+echo "*** make" $MAKE_OPTIONS
+make $MAKE_OPTIONS
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make"
+    exit 3
+fi
+
+echo
+echo "*** make install"
+make install
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make install"
+    exit 4
+fi
+
+echo
+echo "*** Check if node is a virtual machine"
+ISVM=$(hostnamectl status|grep -i chassis:|grep vm)
+if [ ! -z "$ISVM" ]; then
+    echo "*** oversubscribe..."
+    sed -i 's/mpirun -np \$(NP)/mpirun -np \$(NP) --oversubscribe/g' src/*/Makefile.am
+else
+    echo "*** hostnamectl says that $HOSTNAME is *NOT* a virtual machine"
+fi
+
+make check
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make check"
+    exit 5
+fi
+
+echo
+echo "########## END"
+

diff --git a/products/compil_scripts/topo2volmesh.sh b/products/compil_scripts/topo2volmesh.sh
deleted file mode 100755 (executable)
index 9b6eb81..0000000
--- a/products/compil_scripts/topo2volmesh.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-echo "##########################################################################"
-echo "topo2volmesh" $VERSION
-echo "##########################################################################"
-
-export CC=$(which mpicc)
-export CXX=$(which mpicxx)
-export MPICXX=$(which mpic++)
-
-CONFIGURE_FLAGS=
-CONFIGURE_FLAGS+=" --with-MPICXX=${MPICXX}"
-
-rm -rf $BUILD_DIR
-mkdir $BUILD_DIR
-cd $BUILD_DIR
-
-cp -r $SOURCE_DIR/* .
-
-echo
-echo "*** autoreconf -i"
-autoreconf -i
-if [ $? -ne 0 ]
-then
-    echo "ERROR on autoreconf command"
-    exit 1
-fi
-
-echo
-echo "*** configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS" 
-$BUILD_DIR/configure --prefix=$PRODUCT_INSTALL $CONFIGURE_FLAGS
-if [ $? -ne 0 ]
-then
-    echo "ERROR on configure"
-    exit 2
-fi
-echo
-echo "*** make" $MAKE_OPTIONS
-make $MAKE_OPTIONS
-if [ $? -ne 0 ]
-then
-    echo "ERROR on make"
-    exit 3
-fi
-
-echo
-echo "*** make install"
-make install
-if [ $? -ne 0 ]
-then
-    echo "ERROR on make install"
-    exit 4
-fi
-
-echo
-echo "*** Check if node is a virtual machine"
-ISVM=$(hostnamectl status|grep -i chassis:|grep vm)
-if [ ! -z "$ISVM" ]; then
-    echo "*** oversubscribe..."
-    sed -i 's/mpirun -np \$(NP)/mpirun -np \$(NP) --oversubscribe/g' src/*/Makefile.am
-else
-    echo "*** hostnamectl says that $HOSTNAME is *NOT* a virtual machine"
-fi
-
-make check
-if [ $? -ne 0 ]
-then
-    echo "ERROR on make check"
-    exit 5
-fi
-
-echo
-echo "########## END"
-

diff --git a/products/env_scripts/TopIIVolMesh.py b/products/env_scripts/TopIIVolMesh.py
new file mode 100644 (file)
index 0000000..1dadd9f
--- /dev/null
+++ b/products/env_scripts/TopIIVolMesh.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+import os
+import platform
+
+def set_env(env, prereq_dir, version):
+    env.set("TOPIIVOLMESH_ROOT_DIR",prereq_dir)
+    if not platform.system() == "Windows" :
+        env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
+
+def set_nativ_env(env):
+    pass

diff --git a/products/env_scripts/topo2volmesh.py b/products/env_scripts/topo2volmesh.py
deleted file mode 100644 (file)
index b59c1e5..0000000
--- a/products/env_scripts/topo2volmesh.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-#-*- coding:utf-8 -*-
-
-import os
-import platform
-
-def set_env(env, prereq_dir, version):
-    env.set("TOPO2VOLMESH_ROOT_DIR",prereq_dir)
-    if not platform.system() == "Windows" :
-        env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
-
-def set_nativ_env(env):
-    pass

diff --git a/products/topo2volmesh.pyconf b/products/topo2volmesh.pyconf
deleted file mode 100644 (file)
index e7fa2ec..0000000
--- a/products/topo2volmesh.pyconf
+++ /dev/null
@@ -1,35 +0,0 @@
-default :
-{
-    name : "topo2volmesh"
-    build_source : "script"
-    compil_script :  $name + $VARS.scriptExtension
-    get_source : "git"
-    git_info:
-    {
-        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/top_ii_vol.git"
-        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "top_ii_vol.git"
-    }
-    system_info :
-    {
-        rpm : []
-        rpm_dev : []
-        apt : []
-        apt_dev : []
-    }
-    environ :
-    {
-       env_script : $name + ".py"
-    }
-    patches : [] 
-    depend : []
-    opt_depend: ['openmpi']
-    build_depend : ["cmake"]
-    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    install_dir : 'base'
-    properties :
-    {
-      incremental : "yes"
-      single_install_dir : "yes"
-    }
-}