From df0334b7bd63d9c33045827f9ed1ec1d9fed6c10 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 14 Feb 2022 09:09:09 +0100
Subject: [PATCH] spns #19079: rename top-ii-vol SALOME interface

---
 applications/SALOME-master-MPI.pyconf                      | 4 ++--
 applications/SALOME-master-native.pyconf                   | 4 ++--
 applications/SALOME-master.pyconf                          | 4 ++--
 products/SMESH.pyconf                                      | 7 +------
 products/{topo2volmesh.pyconf => TopIIVolMesh.pyconf}      | 2 +-
 .../compil_scripts/{topo2volmesh.sh => TopIIVolMesh.sh}    | 2 +-
 products/env_scripts/{topo2volmesh.py => TopIIVolMesh.py}  | 2 +-
 7 files changed, 10 insertions(+), 15 deletions(-)
 rename products/{topo2volmesh.pyconf => TopIIVolMesh.pyconf} (97%)
 rename products/compil_scripts/{topo2volmesh.sh => TopIIVolMesh.sh} (97%)
 rename products/env_scripts/{topo2volmesh.py => TopIIVolMesh.py} (83%)

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 867d38c..8664112 100644
--- 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 7aaafb5..ce7a680 100644
--- 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 0b0d1ab..ec77278 100644
--- 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 c479b23..59bab57 100644
--- 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/topo2volmesh.pyconf b/products/TopIIVolMesh.pyconf
similarity index 97%
rename from products/topo2volmesh.pyconf
rename to products/TopIIVolMesh.pyconf
index e7fa2ec..b45dc31 100644
--- a/products/topo2volmesh.pyconf
+++ b/products/TopIIVolMesh.pyconf
@@ -1,6 +1,6 @@
 default :
 {
-    name : "topo2volmesh"
+    name : "TopIIVolMesh"
     build_source : "script"
     compil_script :  $name + $VARS.scriptExtension
     get_source : "git"
diff --git a/products/compil_scripts/topo2volmesh.sh b/products/compil_scripts/TopIIVolMesh.sh
similarity index 97%
rename from products/compil_scripts/topo2volmesh.sh
rename to products/compil_scripts/TopIIVolMesh.sh
index 9b6eb81..6f50baf 100755
--- a/products/compil_scripts/topo2volmesh.sh
+++ b/products/compil_scripts/TopIIVolMesh.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "##########################################################################"
-echo "topo2volmesh" $VERSION
+echo "TopIIVolMesh" $VERSION
 echo "##########################################################################"
 
 export CC=$(which mpicc)
diff --git a/products/env_scripts/topo2volmesh.py b/products/env_scripts/TopIIVolMesh.py
similarity index 83%
rename from products/env_scripts/topo2volmesh.py
rename to products/env_scripts/TopIIVolMesh.py
index b59c1e5..1dadd9f 100644
--- a/products/env_scripts/topo2volmesh.py
+++ b/products/env_scripts/TopIIVolMesh.py
@@ -5,7 +5,7 @@ import os
 import platform
 
 def set_env(env, prereq_dir, version):
-    env.set("TOPO2VOLMESH_ROOT_DIR",prereq_dir)
+    env.set("TOPIIVOLMESH_ROOT_DIR",prereq_dir)
     if not platform.system() == "Windows" :
         env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
 
-- 
2.39.2