Change pyconf files for use new netgen

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index d8359861e143374f4c48079f67eebf09bbf15a42..49649aed9e57c63bcd0e0c295718d88c617253f7 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -149,7 +149,7 @@ APPLICATION :
         'GUI'
         'GEOM'
         'SMESH'
-        'NETGENPLUGIN'
+        'NETGENPLUGIN' : 'asozinov/32536_port'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
         'GHS3DPRLPLUGIN'
@@ -182,8 +182,8 @@ APPLICATION :
         'pmml'
         'SOLVERLAB'
         'TopIIVolMesh'
-        #'TESTBASE'
-        'CEATESTBASE' : 'SalomeV9'
+        'TESTBASE'
+        #'CEATESTBASE' : 'SalomeV9'
     }
     profile :
     {

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index c260dff69e23a65a27a557d146a30b0fef9e637f..c604a1ba9fe6a7a7c5f4072a2f3de2e75ece1697 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -144,8 +144,8 @@ APPLICATION :
         'MEDCOUPLING'
         'GUI'
         'GEOM'
-        'SMESH' : 'V9_10_0a2'
-        'NETGENPLUGIN' : 'asozinov/32536_win'
+        'SMESH'
+        'NETGENPLUGIN' : 'asozinov/32536_port'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
         'HYBRIDPLUGIN'
@@ -172,7 +172,7 @@ APPLICATION :
         'PARAVISADDONS'
         'pmml'
         'TESTBASE'
-        'CEATESTBASE' : 'SalomeV9'
+        #'CEATESTBASE' : 'SalomeV9'
     }
     profile :
     {

diff --git a/products/netgen.pyconf b/products/netgen.pyconf
index 6b0c09edde7eae5ee44bcddc8f0dfcabdf3eaf5e..e912a1cdd43e62352c9bd0c382e5e1c26b204a5c 100644 (file)
--- a/products/netgen.pyconf
+++ b/products/netgen.pyconf
@@ -27,10 +27,8 @@ default_win:
 version_6_2_2204 :
 {
    build_source : "cmake"
-   #cmake_options : " -DUSE_GUI=OFF -DUSE_PYTHON=OFF -DUSE_MPI=OFF -DUSE_OCC=ON -DUSE_INTERNAL_TCL=OFF -DBUILD_STUB_FILES=OFF -DOCC_INCLUDE_DIR=$CAS_ROOT_DIR/inc -DOCC_LIBRARY_DIR=$CAS_ROOT_DIR/win/vc14/lib -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_STANDARD=17  -DUSE_NATIVE_ARCH=OFF "
    cmake_options : " -DUSE_GUI=OFF -DUSE_PYTHON=OFF -DUSE_MPI=OFF -DUSE_OCC=ON -DUSE_INTERNAL_TCL=OFF -DBUILD_STUB_FILES=OFF -DOCC_INCLUDE_DIR=$CAS_ROOT_DIR/include/opencascade -DOCC_LIBRARY_DIR=$CAS_ROOT_DIR/lib -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_STANDARD=17  -DUSE_NATIVE_ARCH=OFF "
-   #cmake_options : " -DUSE_GUI=OFF -DUSE_PYTHON=OFF -DUSE_MPI=OFF -DUSE_OCC=ON -DUSE_INTERNAL_TCL=OFF -DBUILD_STUB_FILES=OFF -DOCC_INCLUDE_DIR=D:/S/SALOME-9.9.0/W64/CAS76/include/opencascade -DOCC_LIBRARY_DIR=D:/S/SALOME-9.9.0/W64/CAS76/lib -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_STANDARD=17  -DUSE_NATIVE_ARCH=OFF "
-   patches : []
+   patches : ['netgen-6.2.2204-for-SALOME.patch']
    properties :
    {
      incremental : "yes"

diff --git a/salome.pyconf b/salome.pyconf
index dbd68e1779bce754beb46f90d5eecac7d76c618d..13077c2571dee64783e14da6c25279f6ae23037e 100644 (file)
--- a/salome.pyconf
+++ b/salome.pyconf
@@ -4,21 +4,21 @@
 project_path : $PWD
 
 # Where to search the archives of the products
-ARCHIVEPATH : "\\\\titania\\home_projet\\salome-public\\prerequis\\archives"
+ARCHIVEPATH : "/home/salome-public/prerequis/archives:/nfs/home/salome-public/prerequis/archives:/mnt/prerequis/archives"
 ARCHIVEFTP : "ftp.cea.fr/pub/salome/prerequisites"
 # Where to search the pyconf of the applications
-APPLICATIONPATH : $project_path + "\\applications\\"
+APPLICATIONPATH : $project_path + "/applications/"
 # Where to search the pyconf of the products
-PRODUCTPATH : $project_path + "\\products"
+PRODUCTPATH : $project_path + "/products/"
 # Where to search the pyconf of the jobs of the project
-JOBPATH : $project_path + r"\\jobs\\" 
+JOBPATH : $project_path + "/jobs/" 
 # Where to search for licences
-LICENCEPATH : "\\\titania\\home_projet\\salome-public\\prerequis\\LICENCE:\\\\terre\\data\\tmpsalome\\salome\\prerequis\\install\\LICENSE:/data/tmpsalome/salome/prerequis/install/LICENCE:/export/home/salome/prerequis/install/LICENCE:/volatile/salome/prerequis/install/LICENCE:/soft/commun/SALOME/LICENSE"
+LICENCEPATH : "\\\\terre\\data\\tmpsalome\\salome\\prerequis\\install\\LICENSE:/home/salome-public/prerequis/LICENCE:/nfs/home/salome-public/prerequis/LICENCE:/export/home/salome/prerequis/install/LICENCE:/volatile/salome/prerequis/install/LICENCE:/soft/commun/SALOME/LICENSE:/mnt/prerequis/LICENCE"
 
 git_info : 
 {
-    default_git_server : "https://git.salome-platform.org/gitpub/"
-    default_git_server_dev : "https://codev-tuleap.cea.fr/plugins/git/salome/"
+   default_git_server : "https://git.salome-platform.org/gitpub/"
+   default_git_server_dev : "https://codev-tuleap.cea.fr/plugins/git/salome/"
 }
 
 test_bases :