From c9c64674c5cfe771edf6c09ed8e54a1b9756241b Mon Sep 17 00:00:00 2001
From: Salomon CHUNG <salomon.chung@cea.fr>
Date: Wed, 26 May 2021 08:53:23 +0200
Subject: [PATCH] bt_spn #16769: adding QCO files

See https://codev-tuleap.cea.fr/plugins/tracker/?aid=18828&from_aid=16769#followup_232395
---
 applications/SALOME-9.7.0.pyconf | 34 ++++++++++++++++++++++----------
 products/pmml.pyconf             | 21 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 products/pmml.pyconf

diff --git a/applications/SALOME-9.7.0.pyconf b/applications/SALOME-9.7.0.pyconf
index f10453c..0d09f7c 100644
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.7.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_7_0'
+    tag : 'V9_7_BR'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -23,7 +23,6 @@ APPLICATION :
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
-        SALOME_ACTOR_DELEGATE_TO_VTK : '1'
     }
     products :
     {
@@ -70,6 +69,7 @@ APPLICATION :
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
+        openssl : "native"
         openturns: '1.16'
         openVKL: '0.11.0'
         ospray : '2.4.0'
@@ -78,6 +78,7 @@ APPLICATION :
         petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
+        pmml : {tag : 'DI16769_filter_salome_raw'}
         psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
@@ -91,7 +92,6 @@ APPLICATION :
         requests : '2.19.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
-        salome_system : 'native'
         scipy : '1.4.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -115,7 +115,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_5'}
+        'LIBBATCH' : {tag : 'V2_4_4'}
         'KERNEL'
         'MEDCOUPLING'
         'GUI'
@@ -144,12 +144,12 @@ APPLICATION :
         'CALCULATOR'
         'HELLO'
         'PYHELLO'
-        'EFICAS'
-        'EFICAS_TOOLS'
-        'PY2CPP'
-        'ADAO'
-        'ADAO_INTERFACE'
-        'PARAVISADDONS'
+        'EFICAS' : {tag : 'V9_7_0b1'}
+        'EFICAS_TOOLS' : {tag : 'V9_7_0b1'}
+        'PY2CPP' : {tag: 'v2.0'}
+        'ADAO' : {tag : 'V9_7_0b1'}
+        'ADAO_INTERFACE' : {tag : 'V9_7_0b1'}
+        'PARAVISADDONS' : {tag : 'master'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -188,4 +188,18 @@ __overwrite__ :
    #
     'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch']
   }
+  {
+   __condition__ : "APPLICATION.debug == 'yes'"
+   # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch
+    'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
+                                                 'paraview.0004-ParaView_hdf5.patch',
+                                                 'paraview.0005-ParaView_find_cgns.patch',
+                                                 'paraview.0006-ParaView_find_libxml2.patch',
+                                                 'paraview.0007-ParaView_find_freetype.patch',
+                                                 'paraview-0012-LATA_64BITS_IDS.patch',
+                                                 'ParaView-5.9.0-CATALYST_cmake.patch',
+                                                 'paraview.0008-ParaView_coincident_rendering.patch',
+                                                 'paraview.0015-Paraview_VTKM_ioss.patch',
+                                                 'paraview.0017-ParaView_protobuf_crash.patch']
+  }
 ]
diff --git a/products/pmml.pyconf b/products/pmml.pyconf
new file mode 100644
index 0000000..04eb594
--- /dev/null
+++ b/products/pmml.pyconf
@@ -0,0 +1,21 @@
+default :
+{
+    name : "pmml"
+    build_source : "cmake"
+    get_source : "git"
+    git_info :
+    {
+        repo : "https://codev-tuleap.cea.fr/plugins/git/salome/pmml.git"
+        repo_dev : $repo
+    }
+    environ :
+    {
+        env_script : $name + ".py"
+    }
+    build_depend : ["cmake", "Python", "libxml2"]
+    depend : []
+    opt_depend : ["swig", "doxygen"]
+    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    install_dir : 'base'
+}
-- 
2.39.2