From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 19 Jan 2022 10:06:04 +0000 (+0100)
Subject: topo2vol: use CEA repository
X-Git-Tag: V9_9_0~219
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3e293d40353255a0e7dbbc4012f1661aa4d0e272;p=tools%2Fsat_salome.git

topo2vol: use CEA repository
---

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index abfcd8e..b910bbd 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -119,7 +119,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        topo2volmesh: '1.3.0'
+        topo2volmesh: 'develop'
         urllib3 : '1.23'
         URANIE : '4.5.0'
         # SALOME MODULES :
diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index ae2d357..f343f6f 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -118,7 +118,7 @@ APPLICATION :
         tbb : 'native'
         tcl : 'native'
         tk : 'native'
-        topo2volmesh: '1.3.0'
+        topo2volmesh: 'develop'
         urllib3 : 'native'
         URANIE : '4.5.0'
 
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index b3854fa..fb38e38 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -117,7 +117,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        topo2volmesh: '1.3.0'
+        topo2volmesh: 'develop'
         urllib3 : '1.23'
         URANIE : '4.5.0'
         # SALOME MODULES :
diff --git a/products/patches/smesh_spns-19079_topo2volmesh.patch b/products/patches/smesh_spns-19079_topo2volmesh.patch
index 832f448..513a188 100644
--- a/products/patches/smesh_spns-19079_topo2volmesh.patch
+++ b/products/patches/smesh_spns-19079_topo2volmesh.patch
@@ -560,7 +560,7 @@ diff -Naur SMESH_ref/src/Tools/Topo2VolMeshPlug/Topo2VolMeshPluginDialog.ui SMES
 +     </font>
 +    </property>
 +    <property name="text">
-+     <string>Mesh file (XYZ format)</string>
++     <string>DEM input file</string>
 +    </property>
 +    <property name="iconSize">
 +     <size>
diff --git a/products/topo2volmesh.pyconf b/products/topo2volmesh.pyconf
index 03270c2..7c0f722 100644
--- a/products/topo2volmesh.pyconf
+++ b/products/topo2volmesh.pyconf
@@ -3,7 +3,12 @@ default :
     name : "topo2volmesh"
     build_source : "script"
     compil_script :  $name + $VARS.scriptExtension
-    get_source : "archive"
+    get_source : "git"
+    git_info:
+    {
+        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/top_ii_mesh.git"
+        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + /top_ii_mesh.git"
+    }
     system_info :
     {
         rpm : []
@@ -27,9 +32,3 @@ default :
       single_install_dir : "yes"
     }
 }
-
-version_1_3_0:
-{
-  compil_script : "topo2volmesh-1.3.0.sh"
-  patches : ['topo2volmesh-1.3.0-00001.patch']
-}