updated config files for FD38

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index aab45a52f12f259e3dd307add4dfb575a2b18fe1..3fe9118a8f2c7ee6aed9ecf38c36636db905ee2d 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -38,8 +38,7 @@ APPLICATION :
         alabaster : 'native'
         Babel : 'native'
         boost : 'native'
-        #CAS : {tag : 'V7_5_3p5', section: 'version_CR753_SALOME_PATCH', base: 'no'}
-        CAS : {tag : 'CR780-SALOME-PATCH-33591'}
+        CAS : {tag : 'CR780-SALOME-PATCH-33591', section: 'version_CR780_SALOME_PATCH'}
         catalyst: '2.0'
         C3PO: 'v2.3'
         certifi : 'native'
@@ -364,8 +363,8 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_FD38'                    }
         'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD38'                  }
         'APPLICATION.products.catalyst'         : {tag: '2.0',       base: 'no', section: 'version_2_0_FD38'                    }
-        'APPLICATION.products.gmsh'             : {tag: '4.10.3',    base: 'no', section: 'version_4_10_3_FD38'                 }
+        'APPLICATION.products.gmsh'             : {tag: '4.10.3_with_CAS_7.8', base: 'no', section: 'version_4_10_3_with_CAS_7_8_FD38'}
         'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' }
-        'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                 hpc: 'no'  }
+        'APPLICATION.products.SHAPER'           : {tag:'OCCT780',    base: 'no', section: 'default',                 hpc: 'no'  }
     }
 ]

diff --git a/products/CAS.pyconf b/products/CAS.pyconf
index 817021c0276b0bc2056f2c43f016a232b867a588..ab16b24511dcdd7ce7d6dab4186e686e4e366736 100755 (executable)
--- a/products/CAS.pyconf
+++ b/products/CAS.pyconf
@@ -37,6 +37,41 @@ default :
     }
 }
 
+version_CR780_SALOME_PATCH :
+{
+    name : "CAS"
+    build_source : "cmake"
+    cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
+    get_source : "git"
+    git_info:
+    {
+        repo : "http://git.dev.opencascade.org/repos/occt.git"
+        repo_dev : $repo
+    }
+    environ :
+    {
+        CSF_ShadersDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Shaders"
+        CSF_UnitsLexicon : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Lexi_Expr.dat"
+        CSF_UnitsDefinition : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat"
+        CSF_SHMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "SHMessage"
+        CSF_XSMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "XSMessage"
+        CSF_MDTVTexturesDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Textures"
+        MMGT_REENTRANT : "1"
+        CSF_StandardDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource"
+        CSF_PluginDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource"
+        env_script : $name + ".py"
+    }
+    depend : ['freetype', 'freeimage']
+    build_depend : ["cmake", "doxygen"]
+    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 : "no"
+    }
+}
+
 version_CR780_SALOME_PATCH_win :
 {
     name : "CAS"

diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf
index 847bbb9931a756950a99950e6de6ec7692e34550..f92981da4f65ba2e2cc586292377e60a78f307fe 100644 (file)
--- a/products/gmsh.pyconf
+++ b/products/gmsh.pyconf
@@ -39,6 +39,14 @@ version_4_10_3_with_CAS_7_8:
   patches : ['gmsh-4.10.3-occt780.patch']
 }
 
+version_4_10_3_with_CAS_7_8_FD38:
+{
+  archive_info : {archive_name : "gmsh-4.10.3.tar.gz"}
+  compil_script : "gmsh-4.10.3.sh"
+  depend : ["CAS","lapack","hdf5","medfile", "cgns"]
+  patches : ["gmsh-4.10.3-gc13-fc38.patch", "gmsh-4.10.3-occt780.patch"]
+}
+
 version_4_10_3_with_CAS_7_8_win:
 {
   archive_info : {archive_name : "gmsh-4.10.3.tar.gz"}