Native build: remove PRODUCTS calls in main application pyconf

diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index 4f5cc60b8df7eb6a199a73144155a7ecee559868..8e6ace0c9d9fd85d692d9a901272938da2965001 100644 (file)
--- a/applications/SALOME-9.8.0-native.pyconf
+++ b/applications/SALOME-9.8.0-native.pyconf
@@ -201,15 +201,7 @@ __overwrite__ :
     {
         #
         __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
-        'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
-                                                    'paraview.0005-ParaView_find_cgns.patch',
-                                                    'paraview.0010-ParaView_CATALYST_cmake.patch',
-                                                    'paraview.0008-ParaView_coincident_rendering.patch',
-                                                    'paraview.0017-ParaView_protobuf_crash.patch',
-                                                    'paraview.0015-Paraview_VTKM_ioss.patch'
-                                                    'paraview.0018-spns-26351-autoconvert.patch',
-                                                    'paraview.0019-spns-26344-VTK-OpenMP.patch'
-                                                    ]
+       'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_CO8_FD32_UB20_0_4'}
     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
@@ -218,24 +210,13 @@ __overwrite__ :
         # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here).
         # As this version is compliant too, let's force it as the new minimum needed version.
         __condition__ : "VARS.dist in ['DB10']"
-        'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
-                                                    'paraview.0005-ParaView_find_cgns.patch',
-                                                    'paraview-5.9_qt-minimum-version.patch',
-                                                    'paraview.0003-ParaViewClient_native.patch',
-                                                    'paraview.0010-ParaView_CATALYST_cmake.patch',
-                                                    'paraview.0008-ParaView_coincident_rendering.patch',
-                                                    'paraview.0017-ParaView_protobuf_crash.patch',
-                                                    'paraview.0015-Paraview_VTKM_ioss.patch'
-                                                    'paraview.0018-spns-26351-autoconvert.patch',
-                                                    'paraview.0019-spns-26344-VTK-OpenMP.patch'
-                                                    ]
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10'}
     }
     {
         # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
         # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it.
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'PRODUCTS.sphinxintl.default.properties.pip' : "no"
+        'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base : 'no', section : 'version_0_9_10_no_pip'}
         'APPLICATION.products.cmake' : '3.12.1'
     }
     {
@@ -243,30 +224,22 @@ __overwrite__ :
         __condition__ : "VARS.dist in ['FD34']"
         'APPLICATION.products.omniORB'  : '4.2.4'
         'APPLICATION.products.omniORBpy': '4.2.4'
-        'PRODUCTS.root.version_6_22_02.patches' : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch']
-        'PRODUCTS.qt.default.system_info.rpm' : []
-        'PRODUCTS.qt.default.system_info.rpm_dev' : ["qt5-qtbase-devel"]
-        'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-        'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
+        'APPLICATION.products.PyFMI'    : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip'}
+        'APPLICATION.products.root'     : {tag:'6.22.02', base : 'no', section : 'version_6_22_02_FD34'}
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
-        'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-        'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
+        'APPLICATION.products.PyFMI'    : {tag:'2.5', base:  'no', section : 'version_2_5_no_pip'}
     }
     {
         __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
         'APPLICATION.products.cminpack': 'native'
-        'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-        'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
+        'APPLICATION.products.PyFMI'    : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'}
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.products.statsmodels' :  '0.6.1'  # will fail otherwise -  0.8.0 does not match Cython.
-        'APPLICATION.products.cminpack': '1.3.6'
-        'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
-        'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
-        'PRODUCTS.statsmodels.version_0_6_1.properties.pip' : "no"
-        'PRODUCTS.statsmodels.version_0_6_1.compil_script' : "statsmodels-0.6.1.sh"
+        'APPLICATION.products.cminpack'    : '1.3.6'
+        'APPLICATION.products.PyFMI'       : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'}
+        'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section : 'version_0_6_1_no_pip'}
     }
 ]

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 867a9a67b3340a682d7253530eb8e1fefe0e1c45..e24d8e30860fdc4bac058139e76f4eb725aecf0a 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -239,6 +239,40 @@ version_5_9_0_MPI_int32 :
               ]
 }
 
+version_5_9_0_CO8_FD32_UB20_0_4 :
+{
+    compil_script :  'ParaView-5.9.0.sh'
+    archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"}
+    # two other LATA patches already included in archive
+    patches : ['paraview.0003-ParaViewClient.patch',
+               'paraview.0005-ParaView_find_cgns.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
+               'paraview.0018-spns-26351-autoconvert.patch',
+               'paraview.0019-spns-26344-VTK-OpenMP.patch'
+              ]
+}
+
+version_5_9_0_DB10 :
+{
+    compil_script :  'ParaView-5.9.0.sh'
+    archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"}
+    # two other LATA patches already included in archive
+    patches : ['paraview.0003-ParaViewClient.patch',
+               'paraview.0005-ParaView_find_cgns.patch',
+               'paraview-5.9_qt-minimum-version.patch',
+               'paraview.0003-ParaViewClient_native.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
+               'paraview.0018-spns-26351-autoconvert.patch',
+               'paraview.0019-spns-26344-VTK-OpenMP.patch'
+              ]
+}
+
 version_5_8_0 :
 {
     compil_script :  'ParaView-5.8.0.sh'

diff --git a/products/PyFMI.pyconf b/products/PyFMI.pyconf
index a5b2c816a990954723d4f5986ac3c60a5364c1b5..9a34f368ebc2843515b30375789c9d2940be856f 100644 (file)
--- a/products/PyFMI.pyconf
+++ b/products/PyFMI.pyconf
@@ -26,11 +26,12 @@ default :
     }
 }
 
-version_2_5 :
+version_2_5_no_pip :
 {
+    compil_script : "PyFMI-2.5.sh"
     properties:
     {
       incremental : "yes"
-      pip : "yes"
+      pip : "no"
     }
 }

diff --git a/products/compil_scripts/PyFMI-2.5.sh b/products/compil_scripts/PyFMI-2.5.sh
index 09004f849862d8e88f449ed043c680d134ac7be2..fcc9e022047902c0aaa4958dc4acb215927f9af0 100755 (executable)
--- a/products/compil_scripts/PyFMI-2.5.sh
+++ b/products/compil_scripts/PyFMI-2.5.sh
@@ -13,10 +13,10 @@ cd $BUILD_DIR
 cp -R $SOURCE_DIR/* .
 
 rm -f $BUILD_DIR/src/pyfmi/*.c
-mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages
+#mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages
 export PATH=$(pwd)/bin:$PATH
 export PYTHONPATH=$(pwd):$PYTHONPATH
-export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
+#export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
 
 echo
 echo "*** build with $PYTHONBIN"
@@ -29,12 +29,18 @@ fi
 
 echo
 echo "*** install with $PYTHONBIN"
-$PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL --fmil-home=$PRODUCT_INSTALL
+$PYTHONBIN setup.py install --prefix=$PRODUCT_INSTALL --fmil-home=$FMIL_HOME
 if [ $? -ne 0 ]
 then
     echo "ERROR on install"
     exit 3
 fi
 
+# ensure that lib is used
+if [ -d "$PRODUCT_INSTALL/lib64" ]; then
+    echo "WARNING: renaming lib64 directory to lib"
+    mv $PRODUCT_INSTALL/lib64 $PRODUCT_INSTALL/lib
+fi
+
 echo
 echo "########## END"

diff --git a/products/qt.pyconf b/products/qt.pyconf
index 2d9eb44ac66e3fca9e777b55379a371e10ae5ad1..f472e68dff303dfda30202c334e7fdab0e02478e 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -4,13 +4,6 @@ default:
     build_source : "script"
     compil_script : $name + $VARS.scriptExtension
     get_source : "archive"
-    system_info : 
-    {
-        rpm : []
-        rpm_dev : ["qt5-devel"]
-        apt : []
-        apt_dev : ["qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
-    }
     environ :
     {
        env_script : $name + ".py"

diff --git a/products/root.pyconf b/products/root.pyconf
index d89de2d99f4cefc9d03ad67469030db061637b3e..6b4aa8cafdb87b700b71d07240598f907c4ed2cb 100644 (file)
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -75,6 +75,13 @@ version_6_22_02_win:
     patches : []
 }
 
+# these two patches cannot be merged - compilation issue on UB20 otherwise
+version_6_22_02_FD34:
+{
+    get_source : "archive"
+    patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch']
+}
+
 version_6_16_00:
 {
     get_source : "archive"

diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf
index 79935af1d3b1705f6d9bac242b92459c002f1fac..9378de21a17d1681b603e138a99b28e0571ec727 100644 (file)
--- a/products/salome_system.pyconf
+++ b/products/salome_system.pyconf
@@ -30,18 +30,19 @@ default :
         apt_dev : ["libssl-dev", "gcc", "make", "sed", "g++", "libexpat1-dev", "libfontconfig1-dev", "flex", "bison",
                    "libglu1-mesa-dev", "perl", "libxcb-dri2-0-dev", "libxkbcommon-dev", "libxkbcommon-x11-dev", "bzip2",
                    "libxi-dev", "libxt-dev", "libxmu-dev", "libxpm-dev", "libxft-dev", "automake", "libtool", "libjpeg-dev",
-                   "cmake", "libicu-dev", "libopenmpi-dev", "libreadline-dev", "libhwloc-dev", "libsqlite3-dev"]
+                   "cmake", "libicu-dev", "libopenmpi-dev", "libreadline-dev", "libhwloc-dev", "libsqlite3-dev",
+                  "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
 
         # specific to some plateform(s)
         "CO7" :
         {
             rpm : ["lz4"]
-            rpm_dev : ["perl"]
+            rpm_dev : ["perl", "qt5-devel"]
         }
         "CO8-FD30-FD32" :
         {
             rpm : ["lz4"]
-            rpm_dev : ["perl-interpreter"]
+            rpm_dev : ["perl-interpreter", "qt5-devel"]
         }
         "DB08" :
         {
@@ -82,7 +83,7 @@ default :
         "FD34" :
         {
            rpm : ["lz4-libs"] 
-           rpm_dev : ["lz4-devel"]
+           rpm_dev : ["lz4-devel", "qt5-qtbase-devel"]
         }
         
     }

diff --git a/products/sphinxintl.pyconf b/products/sphinxintl.pyconf
index eb410100a345195d11577f846bb27e05eb407a01..9d17a7d4d17aa5738e5b48c4b3106b2a23f1a9c2 100644 (file)
--- a/products/sphinxintl.pyconf
+++ b/products/sphinxintl.pyconf
@@ -52,4 +52,13 @@ version_2_0_0_win_dbg :
       incremental : "yes"
       pip : "no"
     }
+}
+
+version_0_9_10_no_pip :
+{
+    properties:
+    {
+      incremental : "yes"
+      pip : "no"
+    }
 }
\ No newline at end of file

diff --git a/products/statsmodels.pyconf b/products/statsmodels.pyconf
index decc12d8e2c501e37ea29a49b3bf5f0be4437b9e..1a3be2c39871c4db0d8bb94e9d05835aed3f3430 100644 (file)
--- a/products/statsmodels.pyconf
+++ b/products/statsmodels.pyconf
@@ -44,3 +44,13 @@ version_0_6_1:
       pip : "yes"
     }
 }
+
+version_0_6_1_no_pip:
+{
+   compil_script : "statsmodels-0.6.1" + $VARS.scriptExtension
+   properties:
+    {
+      incremental : "yes"
+      pip : "no"
+    }
+}