Debian 10 feedback : adapt system_info, env_scripts, simplify ParaView and netgen...

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 2d7139a5789e3e236f8d05c677f89538cfe7c4ad..9597caa357e5b280174aad0ad326d28b63a061a8 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -69,8 +69,8 @@ APPLICATION :
         netgen : '5.3.1_with_CAS_7.2'
         nlopt : '2.4.2'
         numpy : 'native'
-        omniORB : '4.2.2'
-        omniORBpy : '4.2.2'
+        omniORB : '4.2.4'
+        omniORBpy : '4.2.4'
         opencv : 'native'
         ospray : '1.8.4'
         packaging : 'native'
@@ -182,3 +182,4 @@ APPLICATION :
 #      'APPLICATION.products.omniORBpy' : 'native'
 #   }
 #]
+

diff --git a/products/PyQt.pyconf b/products/PyQt.pyconf
index 02e29332465ba4035ca28bb341adaf7c70a776dc..81c0f1366d0ac3ccdc20c4dd654bc44968f914cc 100644 (file)
--- a/products/PyQt.pyconf
+++ b/products/PyQt.pyconf
@@ -9,7 +9,7 @@ default :
         rpm : ["python3-qt5"]
         rpm_dev : ["python3-qt5-devel"]
         apt : ["python3-pyqt5"]
-        apt_dev : ["pyqt5-dev"]
+        apt_dev : ["pyqt5-dev", "pyqt5-dev-tools"]
     }
     environ :
     {

diff --git a/products/boost.pyconf b/products/boost.pyconf
index 8019ee221cae7d357db386c56f04734e6ec2d7f2..b98aa622f8c84d2f42f30542ff004701bf87b489 100644 (file)
--- a/products/boost.pyconf
+++ b/products/boost.pyconf
@@ -8,12 +8,8 @@ default :
     {
         rpm : ["boost"]
         rpm_dev : ["boost-devel"]
-        apt : ["libboost-regex", "libboost-thread" , "libboost-serialization",
-               "libboost-chrono", "libboost-filesystem", "libboost-system", 
-               "libboost-date-time", "libboost-graph"]
-        apt_dev : ["libboost-regex-dev", "libboost-thread-dev", "libboost-serialization-dev",
-                   "libboost-chrono-dev", "libboost-filesystem-dev", "libboost-system-dev", 
-                   "libboost-date-time-dev", "libboost-graph-dev"]
+        apt : []
+        apt_dev : ["libboost-all-dev"]
     }
     environ :
     {

diff --git a/products/cgns.pyconf b/products/cgns.pyconf
index 1cc011281e744cb80314ee3746970785c3dd94ba..56e8f04ae478edd841b62820f9b9cc686914f92a 100644 (file)
--- a/products/cgns.pyconf
+++ b/products/cgns.pyconf
@@ -8,7 +8,7 @@ default :
     {
         rpm : ["cgnslib"]
         rpm_dev : ["cgnslib-devel"]
-        apt : ["libcgns3"]
+        apt : ["libcgns3.3"]
         apt_dev : ["libcgns-dev"]
     }
     environ :

diff --git a/products/compil_scripts/ParaView.sh b/products/compil_scripts/ParaView.sh
index 452cbf0c5af1e0836751c590703f3f76bf0e6d22..81c2382e026ae71ae2abef6e9e11db0002add017 100755 (executable)
--- a/products/compil_scripts/ParaView.sh
+++ b/products/compil_scripts/ParaView.sh
@@ -103,11 +103,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF"
 ### Python settings
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_PYTHON:BOOL=ON"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_PYTHON:BOOL=ON"
-if [ "${PYTHON_ROOT_DIR}" == "/usr" ]
+if [ "${PYTHON_ROOT_DIR}" != "/usr" ]
 then
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}m"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib64/libpython${PYTHON_VERSION}m.so"
-else
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION}"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION}.so"
 fi
@@ -164,11 +161,9 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR}"
 
 ### CGNS
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON"
-CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include"
-if [ "$CGNS_ROOT_DIR" == "/usr" ]
+if [ "$CGNS_ROOT_DIR" != "/usr" ]
 then
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib64/libcgns.so"
-else
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so"
 fi
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES"
@@ -187,23 +182,21 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DBoost_NO_SYSTEM_PATHS:BOOL=ON"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF"
 
 ### libxml2 settings
-if [ -n "$LIBXML2_ROOT_DIR" ] 
+if [ -n "$LIBXML2_ROOT_DIR" ]
 then
     # with a native libxml2, do not use these options
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
-    if [ "${LIBXML2_ROOT_DIR}" == "/usr" ]
+    if [ "${LIBXML2_ROOT_DIR}" != "/usr" ]
     then
-        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib64/libxml2.so"
-    else
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2"
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so"
+        CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
     fi
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DLIBXML2_XMLLINT_EXECUTABLE=${LIBXML2_ROOT_DIR}/bin/xmllint"
 fi
 
 ### freetype settings
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON"
-if [ -n "$FREETYPE_ROOT_DIR" ] 
+if [ -n "$FREETYPE_ROOT_DIR" ]
 then
     # with a native freetype, do not use these options
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DFREETYPE_INCLUDE_DIRS:STRING=${FREETYPE_ROOT_DIR}/include/freetype2"

diff --git a/products/compil_scripts/netgen_5_3_1.sh b/products/compil_scripts/netgen_5_3_1.sh
index dd148ae62ac066a1656d5fcdbd56863d265b3e86..824af2e440cb6675e582cbead6a0f232f7af028d 100755 (executable)
--- a/products/compil_scripts/netgen_5_3_1.sh
+++ b/products/compil_scripts/netgen_5_3_1.sh
@@ -61,27 +61,21 @@ echo "*** configure"
 BFLAG="-m64"
 OLEVEL="-O2"
 
-if [ "${TCLHOME}" == '/usr' ]
+if [ "${TCLHOME}" != '/usr' ]
 then
-    TCL_LIB_DIR=${TCLHOME}/lib64
-else
-    TCL_LIB_DIR=${TCLHOME}/lib
+    TCK_TK_OPTIONS="--with-tcl=${TCL_LIB_DIR} --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include"
 fi
 echo ./configure --prefix=${PRODUCT_INSTALL} \
     --with-occ=${CASROOT} \
-    --with-tcl=${TCL_LIB_DIR} \
-    --with-tk=${TCL_LIB_DIR} \
     --disable-openmp \
-    --with-tclinclude=${TCLHOME}/include \
+    ${TCL_TK_OPTIONS} \
     CXXFLAGS="-I${CASROOT}/include/opencascade ${OLEVEL} ${BFLAG} -std=c++0x"
 ./configure --prefix=${PRODUCT_INSTALL} \
     --with-occ=${CASROOT} \
-    --with-tcl=${TCL_LIB_DIR} \
-    --with-tk=${TCL_LIB_DIR} \
     --disable-openmp \
-    --with-tclinclude=${TCLHOME}/include \
+    ${TCL_TK_OPTIONS} \
     CXXFLAGS="-I${CASROOT}/include/opencascade ${OLEVEL} ${BFLAG} -std=c++0x" #-std=gnu++11" #-std=c++11 -std=c++0x"
-    
+
 if [ $? -ne 0 ]
 then
     echo "error on configure"

diff --git a/products/env_scripts/qt.py b/products/env_scripts/qt.py
index 8d42bb3f85885b09913a897765e1eb85f99c9cbe..40865edd51311fa03b15e78ac9b6ad0d6e5a10ab 100644 (file)
--- a/products/env_scripts/qt.py
+++ b/products/env_scripts/qt.py
@@ -23,14 +23,20 @@ def set_env(env, prereq_dir, version):
         env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))
 
 def set_nativ_env(env):
+
+    if "debian" in platform.platform() :
+        qt_lib_dir='/usr/lib/x86_64-linux-gnu'
+    else :
+        qt_lib_dir='/usr/lib64'
+
     env.set('QT5_ROOT_DIR', '/usr')
-    env.set('Qt5Core_DIR', '/usr/lib64/cmake/Qt5Core')
-    env.set('Qt5Gui_DIR', '/usr/lib64/cmake/Qt5Gui')
-    env.set('Qt5Widgets_DIR', '/usr/lib64/cmake/Qt5Widgets')
-    env.set('Qt5Network_DIR', '/usr/lib64/cmake/Qt5Network')
-    env.set('Qt5Xml_DIR', '/usr/lib64/cmake/Qt5Xml')
-    env.set('Qt5OpenGL_DIR', '/usr/lib64/cmake/Qt5OpenGL')
-    env.set('Qt5PrintSupport_DIR', '/usr/lib64/cmake/Qt5PrintSupport')
-    env.set('Qt5Help_DIR', '/usr/lib64/cmake/Qt5Help')
-    env.set('Qt5Test_DIR', '/usr/lib64/cmake/Qt5Test')
-    env.set('Qt5X11Extras_DIR', '/usr/lib64/cmake/Qt5X11Extras')
+    env.set('Qt5Core_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Core'))
+    env.set('Qt5Gui_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Gui'))
+    env.set('Qt5Widgets_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Widgets'))
+    env.set('Qt5Network_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Network'))
+    env.set('Qt5Xml_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Xml'))
+    env.set('Qt5OpenGL_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5OpenGL'))
+    env.set('Qt5PrintSupport_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5PrintSupport'))
+    env.set('Qt5Help_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Help'))
+    env.set('Qt5Test_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5Test'))
+    env.set('Qt5X11Extras_DIR', os.path.join(qt_lib_dir, 'cmake/Qt5X11Extras'))

diff --git a/products/freeimage.pyconf b/products/freeimage.pyconf
index 5f993e6f1bb348bc947380cbed8affe731f221e5..d5e5671817853d616ed9f6a444c367b075e5e5da 100644 (file)
--- a/products/freeimage.pyconf
+++ b/products/freeimage.pyconf
@@ -8,7 +8,7 @@ default :
     {
         rpm : ["freeimage"]
         rpm_dev : ["freeimage-devel"]
-        apt : ["libfreeimage"]
+        apt : ["libfreeimage3"]
         apt_dev : ["libfreeimage-dev"]
     }
     patches : []

diff --git a/products/freetype.pyconf b/products/freetype.pyconf
index a245ca43d2b23d23b0527e1952cc5fadc90e84af..32109e4ce942b7e77b09225bd2c33dfe3e564346 100755 (executable)
--- a/products/freetype.pyconf
+++ b/products/freetype.pyconf
@@ -8,7 +8,7 @@ default :
     {
         rpm : ["freetype"]
         rpm_dev : ["freetype-devel"]
-        apt : ["libfreetype"]
+        apt : ["libfreetype6"]
         apt_dev : ["libfreetype6-dev"]
     }
     environ :

diff --git a/products/qt.pyconf b/products/qt.pyconf
index db2e9b9944cc626935514c767d6ec10a98589841..8f5ad45b07a78fd946379ae51b1296044dd01733 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -8,8 +8,8 @@ default:
     {
         rpm : []
         rpm_dev : ["qt5-devel"]
-        apt : ["build-essential"]
-        apt_dev : ["libgl1-mesa-dev"]
+        apt : []
+        apt_dev : ["qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
     }
     environ :
     {

diff --git a/products/qwt.pyconf b/products/qwt.pyconf
index 036c2219e87a0951c6647f3b232d48ce185fb86f..8e1538f652dca8db9ee5020e3485169645249a26 100644 (file)
--- a/products/qwt.pyconf
+++ b/products/qwt.pyconf
@@ -8,7 +8,7 @@ default :
     {
        rpm : ["qwt-qt5"]
        rpm_dev : ["qwt-qt5-devel"]
-       apt : ["libqwt-qt5"]
+       apt : ["libqwt-qt5-6"]
        apt_dev : ["libqwt-qt5-dev"]
     }
     environ :

diff --git a/products/scotch.pyconf b/products/scotch.pyconf
index ce6a726c8bbf7c0a2875a67bbe70253ee5b298c1..837fcaca3e6c2f9afbed2f869cc3014e4f7f3538 100644 (file)
--- a/products/scotch.pyconf
+++ b/products/scotch.pyconf
@@ -8,7 +8,7 @@ default :
     {
         rpm : ["scotch"]
         rpm_dev : ["scotch-devel"]
-        apt : ["libscotch"]
+        apt : []
         apt_dev : ["libscotch-dev"]
     }
     environ :

diff --git a/products/snowballstemmer.pyconf b/products/snowballstemmer.pyconf
index 13b7d96be71e90ae29e0c8b6a2fa3e80aa68f7f2..eebcc5843b8d6780558fa57d2c242ab10b900aea 100644 (file)
--- a/products/snowballstemmer.pyconf
+++ b/products/snowballstemmer.pyconf
@@ -8,7 +8,7 @@ default :
     {
         rpm : ["python3-snowballstemmer"]
         rpm_dev : []
-        apt : ["python3-snowballstemmer"]
+        apt : ["python3-stemmer"]
         apt_dev : []
     }
     environ :

diff --git a/products/sphinxintl.pyconf b/products/sphinxintl.pyconf
index 7932453a910c49033e9e3dd7e340bc10ed116ada..fba6498690c458939170b4c1cef3e94ad9dd9ab2 100644 (file)
--- a/products/sphinxintl.pyconf
+++ b/products/sphinxintl.pyconf
@@ -4,6 +4,13 @@ default :
     build_source : "script"
     compil_script :  'pip_install' + $VARS.scriptExtension
     get_source : "archive"
+    system_info :
+    {
+        rpm : []
+        rpm_dev : []
+        apt : ["sphinx-intl"]
+        apt_dev : []
+    }
     environ :
     {
         env_script : "sphinxintl.py"

diff --git a/products/tbb.pyconf b/products/tbb.pyconf
index f72e1a17ded6aefa8f2d5899810ad2043ff15a86..f9cf2b516f17c7848cd855b2fcf628b1e0e2a111 100644 (file)
--- a/products/tbb.pyconf
+++ b/products/tbb.pyconf
@@ -8,7 +8,7 @@ default :
     {
         rpm : ["tbb"]
         rpm_dev : ["tbb-devel"]
-        apt : ["libtbb"]
+        apt : ["libtbb2"]
         apt_dev : ["libtbb-dev"]
     }
     environ :