]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Update configuration for version 9.7.0
authorvsr <vsr@opencascade.com>
Fri, 30 Apr 2021 06:51:55 +0000 (09:51 +0300)
committervsr <vsr@opencascade.com>
Mon, 3 May 2021 11:19:44 +0000 (14:19 +0300)
14 files changed:
.gitignore [new file with mode: 0644]
config/build_options/occ/options_compilation_salome_master.txt
config/patches/README
config/patches/med.001_cmake_config.patch [new file with mode: 0644]
config/patches/paraview.0008-ParaView_coincident_rendering.patch
config/patches/paraview.0010-ParaView_CATALYST_cmake.patch [new file with mode: 0644]
config/patches/paraview.0011-ParaView_protobuf_crash.patch [new file with mode: 0644]
config/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch [new file with mode: 0644]
config/patches/paraview.1002-ParaView_find_zlib.patch [new file with mode: 0644]
config/patches/pyqt5sip.001_sipBool.patch [new file with mode: 0644]
config/patches/qt.002_xkbcommon.patch [new file with mode: 0644]
config/patches/rkcommon.001_native_tbb.patch [new file with mode: 0644]
config/salome.xml
config/sconfig/salome_config.py

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..c18dd8d
--- /dev/null
@@ -0,0 +1 @@
+__pycache__/
index 2fb8ff837366eb91b03a69a9232fb9a4c2c489bd..30c35930f38624ebda7d531e23f7af10452f4483 100644 (file)
@@ -142,32 +142,35 @@ YACS
 YACSGEN
 > python3 setup.py install --prefix=${YACSGEN_ROOT_DIR}
 
-CGNS
+cgns
 > cmake -DCMAKE_INSTALL_PREFIX:STRING=${CGNS_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCGNS_BUILD_SHARED:BOOL=ON -DCGNS_ENABLE_HDF5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake -DHDF5_INCLUDE_PATH:PATH=${HDF5_ROOT_DIR}/include -DHDF5_LIBRARY:FILEPATH=${HDF5_ROOT_DIR}/lib/libhdf5.so -DHDF5_NEED_ZLIB=ON ${CGNS_SRC_DIR}
 
-Cython
+cython
 > python3 setup.py install --prefix=${CYTHON_ROOT_DIR}
 
-CAS
+occt (Open CASCADE Technology)
 > cmake -DINSTALL_DIR:STRING=${CAS_ROOT_DIR} -D3RDPARTY_TCL_DIR:PATH=${TCLTK_ROOT_DIR} -DUSE_TBB:BOOL=ON -D3RDPARTY_TBB_DIR:PATH=${TBB_ROOT_DIR} -D3RDPARTY_FREETYPE_DIR:PATH=${FREETYPE_ROOT_DIR} -DUSE_FREEIMAGE:BOOL=ON -D3RDPARTY_FREEIMAGE_DIR:PATH=${FREEIMAGE_ROOT_DIR} -DCMAKE_BUILD_TYPE:STRING=Release ${CAS_SRC_DIR}
 
-Paraview
-cmake -DCMAKE_INSTALL_PREFIX:STRING=${PARAVIEW_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=-m64 -DCMAKE_C_FLAGS:STRING=-m64 -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON -DPARAVIEW_BUILD_TESTING:BOOL=OFF -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON -DVTK_ENABLE_OSPRAY:BOOL=ON -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib64/cmake/embree-3.3.0 -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DVTK_USE_64BIT_IDS:BOOL=ON -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES -DPARAVIEW_USE_QT:BOOL=ON -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF -DPARAVIEW_USE_PYTHON:BOOL=ON -DVTK_WRAP_PYTHON:BOOL=ON -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python3.6 -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON -DVTK_NO_PYTHON_THREADS:BOOL=OFF -DVTK_PYTHON_VERSION:STRING=3 -DVTK_WRAP_JAVA:BOOL=OFF -DPARAVIEW_USE_MPI:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5 -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR} -DBoost_NO_BOOST_CMAKE:BOOL=ON -DBoost_NO_SYSTEM_PATHS:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2 -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF ${PARAVIEW_SRC_DIR}
+paraview
+cmake -DCMAKE_INSTALL_PREFIX:STRING=${PARAVIEW_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=-m64 -DCMAKE_C_FLAGS:STRING=-m64 -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_LIBDIR:STRING=lib -DPARAVIEW_BUILD_TESTING:BOOL=OFF -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON -DOpenGL_GL_PREFERENCE:STRING=LEGACY -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON -DVTK_ENABLE_OSPRAY:BOOL=ON -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib/cmake/embree-${VERSION_EMBREE} -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -Drkcommon_DIR:PATH=${RKCOMMON_ROOT_DIR}/lib/cmake/rkcommon-${VERSION_RKCOMMON} -Dopenvkl_DIR:PATH=${OPENVKL_ROOT_DIR}/lib/cmake/openvkl-${VERSION_OPENVKL} -DVTK_USE_64BIT_IDS:BOOL=ON -DVTK_REPORT_OPENGL_ERRORS:BOOL=OFF -DVTK_MODULE_ENABLE_VTK_RenderingLOD:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_FiltersCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_CommonCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOCore:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOEnSight:INTERNAL=YES -DVTK_MODULE_ENABLE_VTK_IOInfovis:INTERNAL=YES -DPARAVIEW_USE_QT:BOOL=ON -DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=OFF -DPARAVIEW_USE_PYTHON:BOOL=ON -DVTK_WRAP_PYTHON:BOOL=ON -DPython3_INCLUDE_DIR:STRING=${PYTHON_ROOT_DIR}/include/python3.6 -DPython3_LIBRARY:STRING=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON -DVTK_NO_PYTHON_THREADS:BOOL=OFF -DVTK_PYTHON_VERSION:STRING=3 -DVTK_WRAP_JAVA:BOOL=OFF -DPARAVIEW_USE_MPI:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON -DHDF5_DIR:PATH=${HDF5_ROOT_DIR}/share/cmake/hdf5 -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DBOOST_ROOT:PATH=${BOOST_ROOT_DIR} -DBoost_NO_BOOST_CMAKE:BOOL=ON -DBoost_NO_SYSTEM_PATHS:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON -DLIBXML2_INCLUDE_DIR:STRING=${LIBXML2_ROOT_DIR}/include/libxml2 -DLIBXML2_LIBRARIES:STRING=${LIBXML2_ROOT_DIR}/lib/libxml2.so -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_ParaView_cgns:BOOL=ON -DCGNS_INCLUDE_DIR:PATH=${CGNS_ROOT_DIR}/include -DCGNS_LIBRARY:PATH=${CGNS_ROOT_DIR}/lib/libcgns.so -DVTK_MODULE_ENABLE_ParaView_cgns:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSReader:INTERNAL=YES -DVTK_MODULE_ENABLE_ParaView_VTKExtensionsCGNSWriter:INTERNAL=YES -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON -DPARAVIEW_PLUGIN_ENABLE_Moments:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SLACTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF -DPARAVIEW_USE_CATALYST:BOOL=ON -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON ${PARAVIEW_SRC_DIR}
 
-Pillow
+pillow
 > python3 ./setup.py install --prefix=${PILLOW_ROOT_DIR}
 
-PyQt
-> python3 ./configure.py -b ${PYQT5_ROOT_DIR}/bin -d ${PYQT5_ROOT_DIR} -v ${PYQT5_ROOT_DIR}/sip  --confirm-license --designer-plugindir=${PYQT5_ROOT_DIR}/plugins/designer --qml-plugindir=${PYQT5_ROOT_DIR}/plugins/qml --no-qsci-api --sip-incdir=${SIP_ROOT_DIR}/include/python3.6
+pyqtsip
+> python3 ./setup.py install --prefix=${PYQTSIP_ROOT_DIR}
 
-Python3
+pyqt
+> python3 ./configure.py -b ${PYQT5_ROOT_DIR}/bin -d ${PYQT5_ROOT_DIR} -v ${PYQT5_ROOT_DIR}/sip --stubsdir=${PYQT5_ROOT_DIR}/PyQt5 --confirm-license --designer-plugindir=${PYQT5_ROOT_DIR}/plugins/designer --qml-plugindir=${PYQT5_ROOT_DIR}/plugins/qml --no-qsci-api
+
+python3
 > ./configure --prefix=${PYTHON_ROOT_DIR} --enable-shared --with-threads --with-libs=-lstdc++ --without-pymalloc --enable-optimizations CFLAGS=-m64 CXXFLAGS=-m64 CPPFLAGS=-I${TCLTK_ROOT_DIR}/include LDFLAGS=-L${TCLTK_ROOT_DIR}/lib 
 
-Sphinx and Sphinx related products
+sphinx (and related products)
  * alabaster
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
- * Babel
+ * babel
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
  
  * certifi
@@ -188,10 +191,10 @@ Sphinx and Sphinx related products
  * imagesize
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
- * Jinja2
+ * jinja2
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
- * MarkupSafe
+ * markupSafe
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
  * packaging
@@ -200,7 +203,7 @@ Sphinx and Sphinx related products
  * pockets
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
- * Pygments
+ * pygments
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
  * pyparsing
@@ -221,12 +224,9 @@ Sphinx and Sphinx related products
  * snowballstemmer
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
- * Sphinx
+ * sphinx
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
  
- * sphinxcontrib-napoleon
- > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
-
  * sphinxcontrib-websupport
  > python3 ./setup.py install --prefix=${SPHINX_ROOT_DIR}
 
@@ -239,14 +239,14 @@ Sphinx and Sphinx related products
 boost
 > ./bootstrap.sh  --prefix=${BOOST_ROOT_DIR} --with-toolset=gcc --with-python=${PYTHON_ROOT_DIR}/bin/python3
 
-CMake
+cmake
 > ./configure --prefix=${CMAKE_ROOT_DIR}
 
 doxygen
 > cmake -DCMAKE_INSTALL_PREFIX:STRING=${DOXYGEN_ROOT_DIR} ${DOXYGEN_SRC_DIR}
 
 embree
-> cmake -DCMAKE_INSTALL_PREFIX:STRING=${EMBREE_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -DEMBREE_TUTORIALS:BOOL=OFF -DEMBREE_TASKING_SYSTEM:STRING=TBB -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DEMBREE_ISA_AVX512SKX:BOOL=OFF -DEMBREE_ISPC_SUPPORT:BOOL=ON ${EMBREE_SRC_DIR}
+> cmake -DCMAKE_INSTALL_PREFIX:STRING=${EMBREE_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -DEMBREE_TUTORIALS:BOOL=OFF -DEMBREE_TASKING_SYSTEM:STRING=TBB -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -DEMBREE_ISA_AVX512SKX:BOOL=OFF -DEMBREE_ISPC_SUPPORT:BOOL=ON -DCMAKE_INSTALL_LIBDIR:STRING=lib ${EMBREE_SRC_DIR}
 
 freeimage (no specific configuration procedure, options are passed to make)
 > make -f Makefile.gnu
@@ -261,7 +261,7 @@ gmsh
 graphvis
 > ./configure --prefix=${GRAPHVIS_ROOT_DIR} --disable-rpath --disable-tcl --disable-perl --disable-php --disable-ocaml --disable-lua --disable-java --disable-guile --disable-sharp --disable-swig --disable-python --disable-r --disable-ruby --without-expat --without-qt CFLAGS=-m64 CXXFLAGS=-m64
 
-h5py and h5py related products
+h5py (and related products)
  * nose
  > python3 ./setup.py install --prefix=${H5PY_ROOT_DIR}
 
@@ -274,16 +274,16 @@ h5py and h5py related products
 hdf5
 > cmake -DCMAKE_INSTALL_PREFIX:STRING=${HDF5_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DHDF5_ENABLE_THREADSAFE:BOOL=ON -DALLOW_UNSUPPORTED:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON -DHDF5_BUILD_HL_LIB:BOOL=ON -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON ${HDF5_SRC_DIR}
 
-ispc (no specific configuration procedure)
-> make
+ispc (install from binaries package)
+> tar xzf ${ISPC_ARCHIVE} -C ${ISPC_ROOT_DIR}
 
 libxml2
 > ./configure --prefix=${LIBXML2_ROOT_DIR}
 
 llvm
-> cmake -DCMAKE_INSTALL_PREFIX:STRING=${LLVM_ROOT_DIR} CMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/python3.6 -DLLVM_INSTALL_UTILS:BOOL=ON -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN:BOOL=ON -DLLVM_ENABLE_DUMP:BOOL=ON ${LLVM_SRC_DIR}
+> cmake -DCMAKE_INSTALL_PREFIX:STRING=${LLVM_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DPYTHON_EXECUTABLE:STRING=${PYTHON_ROOT_DIR}/bin/python3.6 -DLLVM_INSTALL_UTILS:BOOL=ON -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN:BOOL=ON -DLLVM_ENABLE_DUMP:BOOL=ON ${LLVM_SRC_DIR}
 
-matplotlib and matplotlib related products
+matplotlib (and related products)
  * cycler
  > python3 ./setup.py install --prefix=${MATPLOTLIB_ROOT_DIR}
  
@@ -300,6 +300,9 @@ medfile
 > cmake -DCMAKE_INSTALL_PREFIX:STRING=${MEDFILE_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON -DMEDFILE_BUILD_TESTS:BOOL=OFF -DMEDFILE_INSTALL_DOC:BOOL=ON -DMEDFILE_BUILD_PYTHON:BOOL=ON -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_ROOT_DIR}/include/python3.6 -DPYTHON_LIBRARY:FILEPATH=${PYTHON_ROOT_DIR}/lib/libpython3.6.so -DHDF5_ROOT:PATH=${HDF5_ROOT_DIR} -DMED_MEDINT_TYPE=long ${MEDFILE_SRC_DIR}
 (note: build as FFLAGS=-fdefault-integer-8 cmake ${cmake_options})
 
+mesa
+> configure --prefix=${MESA_ROOT_DIR} --enable-opengl --disable-gles1 --disable-gles2 --disable-va --disable-xvmc --disable-vdpau --enable-shared-glapi --disable-texture-float --enable-llvm --disable-llvm-shared-libs --with-llvm-prefix=${LLVM_ROOT_DIR} --with-gallium-drivers=swrast --disable-dri --with-dri-drivers= --disable-egl --with-platforms=x11 --disable-gbm --enable-glx=gallium-xlib --disable-osmesa --enable-gallium-osmesa --enable-autotools
+
 metis
 > make config prefix=${METIS_ROOT_DIR} shared=1
 
@@ -316,19 +319,18 @@ netgen
 nlopt 
 > ./configure --prefix=${NLOPT_ROOT_DIR} --enable-shared --with-python PYTHON=`which python3` PYTHON_CONFIG=`which python3-config` CFLAGS=-m64 -fPIC CPPFLAGS=-m64 -fPIC
 
-numpy and numpy related products
+numpy (and related products)
  * lapack
- > cmake -DCMAKE_INSTALL_PREFIX:STRING=${NUMPY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_FLAGS:STRING=-fPIC -DCMAKE_C_FLAGS:STRING=-fPIC ${LAPACK_SRC_DIR}
+ > cmake -DCMAKE_INSTALL_PREFIX:STRING=${NUMPY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_LIBDIR:STRING=lib -DCMAKE_CXX_FLAGS:STRING=-fPIC -DCMAKE_C_FLAGS:STRING=-fPIC ${LAPACK_SRC_DIR}
 
  * numpy
  > python3 ./setup.py install --prefix=${NUMPY_ROOT_DIR}
 
-omniorb and omniorbpy
- * omniorb
- > ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3
+omniorb
+> ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3
 
- * omniorbpy
- > ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3
+omniorbpy
+> ./configure --prefix=${OMNIORB_ROOT_DIR} PYTHON=${PYTHON_ROOT_DIR}/bin/python3
 
 opencv
 > cmake -DCMAKE_INSTALL_PREFIX:STRING=${OPENCV_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_opencv_java:BOOL=OFF -DWITH_GTK:BOOL=OFF -DWITH_LAPACK:BOOL=OFF ${OPENCV_SRC_DIR}
@@ -336,18 +338,27 @@ opencv
 openmpi
 > ./configure --prefix=${OPENMPI_ROOT_DIR} CFLAGS=-m64 CXXFLAGS=-m64
 
+openvkl
+> cmake -DCMAKE_INSTALL_PREFIX:STRING=${OPENVKL_ROOT_DIR} -DCMAKE_INSTALL_LIBDIR:STRING=lib -DBUILD_TESTING:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -Drkcommon_DIR:PATH=${RKCOMMON_ROOT_DIR}/lib/cmake/rkcommon-${VERSION_RKCOMMON} -DBUILD_EXAMPLES:BOOL=OFF ${OPENVKL_SRC_DIR}
+
 ospray
-> cmake -DCMAKE_INSTALL_PREFIX:STRING=${OSPRAY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -Dembree_DIR:PATH=${EMBREE_ROOT_DIR} -DOSPRAY_TASKING_SYSTEM:STRING=TBB -DTBB_ROOT:PATH=${TBB_ROOT_DIR} ${OSPRAY_SRC_DIR}
+> cmake -DCMAKE_INSTALL_PREFIX:STRING=${OSPRAY_ROOT_DIR} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER:STRING=clang++ -DCMAKE_C_COMPILER:STRING=clang -DOSPRAY_TASKING_SYSTEM:STRING=TBB -DOSPRAY_ENABLE_APPS:BOOL=OFF -DTBB_ROOT:PATH=${TBB_ROOT_DIR} -Dembree_DIR:PATH=${EMBREE_ROOT_DIR}/lib/cmake/embree-${VERSION_EMBREE} -Drkcommon_DIR:PATH=${RKCOMMON_ROOT_DIR}/lib/cmake/rkcommon-${VERSION_RKCOMMON} -Dopenvkl_DIR:PATH=${OPENVKL_ROOT_DIR}/lib/cmake/openvkl-${VERSION_OPENVKL} ${OSPRAY_SRC_DIR}
 
 planegcs
 > cmake -DCMAKE_INSTALL_PREFIX:STRING=${PLANEGCS_ROOT_DIR} ${PLANEGCS_SRC_DIR}
 
+psutil
+> python3 ./setup.py install --prefix=${PSUTIL_ROOT_DIR}
+
 qt5
-> ./configure -prefix ${QT5_ROOT_DIR} -no-separate-debug-info -opensource -confirm-license -release -nomake tests
+> ./configure -prefix ${QT5_ROOT_DIR} -no-separate-debug-info -opensource -confirm-license -release -no-rpath -verbose -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -nomake examples -nomake tests
 
 qwt
 > ./qmake
 
+rkcommon
+> cmake -DCMAKE_INSTALL_PREFIX=${RKCOMMON_ROOT_DIR} -DCMAKE_INSTALL_LIBDIR:STRING=lib -DBUILD_TESTING:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=Release ${RKCOMMON_SRC_DIR}
+
 scipy
 > python3 ./setup.py install --prefix=${SCIPY_ROOT_DIR}
 
@@ -355,20 +366,22 @@ scotch (no specific configuration procedure, options are passed to make)
 > make prefix=${SCOTCH_ROOT_DIR}
 
 sip
-> python3 ./configure.py -b ${SIP_ROOT_DIR}/bin -d ${SIP_ROOT_DIR}/lib/python3.6/site-packages -e ${SIP_ROOT_DIR}/include/python3.6 -v ${SIP_ROOT_DIR}/sip -p linux-g++-64
+> python3 ./setup.py install --prefix=${SIP_ROOT_DIR}
 
 swig
 > ./configure --prefix=${SWIG_ROOT_DIR} --with-boost=${BOOST_ROOT_DIR} --with-python3=${PYTHON_ROOT_DIR}/bin/python3 --without-octave --with-tcl=${TCLTK_ROOT_DIR} --program-suffix=3.0 CFLAGS=-m64 CXXFLAGS=-m64
 
-tcltk and tclx
- * tcl
- > ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --enable-64bit
+tbb (no specific configuration procedure, use pre-compiled binaries from the tbb web-site)
+> tar xzf ${TBB_ARCHIVE} -C ${TBB_ROOT_DIR}
+
+tcl
+> ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --enable-64bit
 
- * tclx
- > ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --with-tk=${TCLTK_ROOT_DIR}/lib --enable-64bit
+tclx
+> ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --with-tk=${TCLTK_ROOT_DIR}/lib --enable-64bit
 
- * tk
- > ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --enable-64bit
+tk
+> ./configure --prefix=${TCLTK_ROOT_DIR} --enable-gcc --enable-shared --enable-threads --with-tcl=${TCLTK_ROOT_DIR}/lib --enable-64bit
 
-tbb (no specific configuration procedure, use pre-compiled binaries from the tbb web-site)
-> tar xzf ${TBB_ARCHIVE} -C ${TBB_ROOT_DIR}
+toml
+> python3 ./setup.py install --prefix=${TOML_ROOT_DIR}
index 1b3dd0ad2622e17a05a1c7386926ebf0b35aa6ff..f4d6bea82abbbac879c9add2d7a6f191b0900485 100644 (file)
@@ -3,14 +3,11 @@ This directory containes patches needed to build SALOME pre-requisites.
 Comments
 ========
 
-1. graphvis
-   ! Additional patch is applied to binaries installation of grapvis to correct config6 via sed utility.
+1. graphviz
+   ! Additional patch is applied to binaries installation of grapviz via sed utility; this corrects config6 to decrease size of produced png images  
 
 2. qwt
    ! Patch which contains hardcoded path to qwt install directory is applied via sed utility. It is impossible to create such a patch using diff syntax.
 
-3. omniorb
-   ! Additional patch is applied to installed omniorb in order to set correct path to python3 executable.
-
-4. paraview
-   ! Post install patch is applied to ${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-5.6/UseParaView.cmake in order to add 'find_package(ospray REQUIRED)' to the end of this file.
+3. omniorbpy
+   ! Additional patch is applied via sed to installed omniidl executables in order to set correct path to omniORB directory.
diff --git a/config/patches/med.001_cmake_config.patch b/config/patches/med.001_cmake_config.patch
new file mode 100644 (file)
index 0000000..d980c7c
--- /dev/null
@@ -0,0 +1,121 @@
+diff -Naur med-4.1.0_SRC.orig/CMakeLists.txt med-4.1.0_SRC.new/CMakeLists.txt
+--- med-4.1.0_SRC.orig/CMakeLists.txt  2020-03-12 18:45:46.000000000 +0300
++++ med-4.1.0_SRC.new/CMakeLists.txt   2021-03-19 16:07:10.097210739 +0300
+@@ -101,7 +101,7 @@
+ IF(WIN32 AND NOT CYGWIN)
+    SET(INSTALL_CMAKE_CONFIG_DIR cmake)
+ ELSE()
+-   SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
++   SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION})
+ ENDIF()
+ SET(INSTALL_INCLUDE_DIR include)
+diff -Naur med-4.1.0_SRC.orig/CMakeLists.txt.in med-4.1.0_SRC.new/CMakeLists.txt.in
+--- med-4.1.0_SRC.orig/CMakeLists.txt.in       2020-03-03 16:53:39.000000000 +0300
++++ med-4.1.0_SRC.new/CMakeLists.txt.in        2021-03-19 16:50:43.589542683 +0300
+@@ -101,7 +101,7 @@
+ IF(WIN32 AND NOT CYGWIN)
+    SET(INSTALL_CMAKE_CONFIG_DIR cmake)
+ ELSE()
+-   SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
++   SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION})
+ ENDIF()
+ SET(INSTALL_INCLUDE_DIR include)
+diff -Naur med-4.1.0_SRC.orig/config/cmake_files/MEDFileConfig.cmake.in med-4.1.0_SRC.new/config/cmake_files/MEDFileConfig.cmake.in
+--- med-4.1.0_SRC.orig/config/cmake_files/MEDFileConfig.cmake.in       2020-02-24 14:08:41.000000000 +0300
++++ med-4.1.0_SRC.new/config/cmake_files/MEDFileConfig.cmake.in        2021-03-19 14:26:06.733900990 +0300
+@@ -39,13 +39,13 @@
+ IF(MEDFILE_BUILD_SHARED_LIBS)
+   SET(MEDFILE_C_LIBRARIES medC)
+   SET(MEDFILE_EXTRA_LIBRARIES medimportengine)
++  SET(MEDFILE_LIBRARIES medC medfwrap med)
+ ENDIF()
+ IF(MEDFILE_BUILD_STATIC_LIBS)
+   SET(MEDFILE_C_LIBRARIES medC_static)
+   SET(MEDFILE_EXTRA_LIBRARIES medimportengine_static)
++  SET(MEDFILE_LIBRARIES medC_static med_static medfwrap_static)
+ ENDIF()
+-# For now we don't expose Fortran bindings:
+-SET(MEDFILE_LIBRARIES ${MEDFILE_C_LIBRARIES})
+ # Package root dir:
+ SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
+diff -Naur med-4.1.0_SRC.orig/src/CMakeLists.txt med-4.1.0_SRC.new/src/CMakeLists.txt
+--- med-4.1.0_SRC.orig/src/CMakeLists.txt      2020-03-12 18:45:46.000000000 +0300
++++ med-4.1.0_SRC.new/src/CMakeLists.txt       2021-03-19 14:21:15.342441002 +0300
+@@ -113,7 +113,7 @@
+       SOVERSION 11
+       VERSION   11.0.1)
+     TARGET_LINK_LIBRARIES(medfwrap medC)
+-    INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS medfwrap EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+     # Add Shared MED library
+     ADD_LIBRARY(med SHARED MEDiterators.c)
+@@ -124,7 +124,7 @@
+     TARGET_LINK_LIBRARIES(med medfwrap)    
+    
+     # Install only the resulting library:
+-    INSTALL(TARGETS med EXPORT medTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS med EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+   ENDIF()
+   ######### Static Libraries ##########
+@@ -137,7 +137,7 @@
+     ADD_LIBRARY(medfwrap_static STATIC ${medfort_wrap_SOURCES})
+     SET_TARGET_PROPERTIES(medfwrap_static PROPERTIES OUTPUT_NAME medfwrap)
+     TARGET_LINK_LIBRARIES(medfwrap_static medC_static)
+-    INSTALL(TARGETS medfwrap_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS medfwrap_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+     
+     # Add Static MED library
+     ADD_LIBRARY(med_static STATIC MEDiterators.c)
+@@ -145,7 +145,7 @@
+     TARGET_LINK_LIBRARIES(med_static medfwrap_static)
+     # Install only the resulting library:  
+-    INSTALL(TARGETS med_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS med_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+   ENDIF()
+   
+ ENDIF(CMAKE_Fortran_COMPILER_WORKS)
+diff -Naur med-4.1.0_SRC.orig/src/CMakeLists.txt.in med-4.1.0_SRC.new/src/CMakeLists.txt.in
+--- med-4.1.0_SRC.orig/src/CMakeLists.txt.in   2019-07-03 19:09:45.000000000 +0300
++++ med-4.1.0_SRC.new/src/CMakeLists.txt.in    2021-03-19 16:48:53.988720349 +0300
+@@ -113,7 +113,7 @@
+       SOVERSION @MED_CMAKE_SO_MAJ@
+       VERSION   @MED_CMAKE_SO_MAJ@.@MED_CMAKE_SO_MIN@.@MED_CMAKE_SO_REL@)
+     TARGET_LINK_LIBRARIES(medfwrap medC)
+-    INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS medfwrap EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+     # Add Shared MED library
+     ADD_LIBRARY(med SHARED MEDiterators.c)
+@@ -124,7 +124,7 @@
+     TARGET_LINK_LIBRARIES(med medfwrap)    
+    
+     # Install only the resulting library:
+-    INSTALL(TARGETS med EXPORT medTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS med EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+   ENDIF()
+   ######### Static Libraries ##########
+@@ -137,7 +137,7 @@
+     ADD_LIBRARY(medfwrap_static STATIC ${medfort_wrap_SOURCES})
+     SET_TARGET_PROPERTIES(medfwrap_static PROPERTIES OUTPUT_NAME medfwrap)
+     TARGET_LINK_LIBRARIES(medfwrap_static medC_static)
+-    INSTALL(TARGETS medfwrap_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS medfwrap_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+     
+     # Add Static MED library
+     ADD_LIBRARY(med_static STATIC MEDiterators.c)
+@@ -145,7 +145,7 @@
+     TARGET_LINK_LIBRARIES(med_static medfwrap_static)
+     # Install only the resulting library:  
+-    INSTALL(TARGETS med_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
++    INSTALL(TARGETS med_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
+   ENDIF()
+   
+ ENDIF(CMAKE_Fortran_COMPILER_WORKS)
index 2c38df69e1bc4fcfe3c15ddee2e9ee65c070985c..a1e25e7fc8666fee05f0324921a83dff7c4931d8 100644 (file)
@@ -1,6 +1,6 @@
-diff -Naur ParaView-5.8.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml ParaView-5.8.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml
---- ParaView-5.8.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml       2020-03-23 13:30:04.000000000 +0300
-+++ ParaView-5.8.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml      2020-04-27 19:07:56.559333300 +0300
+diff -Naur ParaView-5.9.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml ParaView-5.9.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml
+--- ParaView-5.9.0_SRC_orig/Remoting/Views/Resources/utilities_remotingviews.xml
++++ ParaView-5.9.0_SRC_modif/Remoting/Views/Resources/utilities_remotingviews.xml
 @@ -31,7 +31,7 @@
        <DoubleVectorProperty name="PolygonOffsetParameters"
          command="SetPolygonOffsetParameters"
@@ -28,10 +28,10 @@ diff -Naur ParaView-5.8.0_SRC_orig/Remoting/Views/Resources/utilities_remotingvi
          panel_visibility="advanced">
          <DoubleRangeDomain name="range" />
          <Documentation>
-diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx ParaView-5.8.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx
---- ParaView-5.8.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx   2020-03-23 13:31:28.000000000 +0300
-+++ ParaView-5.8.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx  2020-04-27 18:07:54.639203400 +0300
-@@ -35,11 +35,11 @@
+diff -Naur ParaView-5.9.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx ParaView-5.9.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx
+--- ParaView-5.9.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx
++++ ParaView-5.9.0_SRC_modif/VTK/Rendering/Core/vtkMapper.cxx
+@@ -36,11 +36,11 @@
  static double vtkMapperGlobalResolveCoincidentTopologyZShift = 0.01;
  static int vtkMapperGlobalResolveCoincidentTopologyPolygonOffsetFaces = 1;
  
@@ -46,32 +46,34 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/Core/vtkMapper.cxx ParaView-5.8
 +static double vtkMapperGlobalResolveCoincidentTopologyLineOffsetUnits = 1.0;
 +static double vtkMapperGlobalResolveCoincidentTopologyPointOffsetUnits = 0.0;
  
- // Construct with initial range (0,1).
- vtkMapper::vtkMapper()
-diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx ParaView-5.8.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx
---- ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx  2020-03-23 13:31:28.000000000 +0300
-+++ ParaView-5.8.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx 2020-04-27 18:12:49.486483700 +0300
-@@ -1963,7 +1963,6 @@
-   float factor = 0.0;
-   float offset = 0.0;
-   this->GetCoincidentParameters(ren, actor, factor, offset);
--  vtkOpenGLCamera* cam = (vtkOpenGLCamera*)(ren->GetActiveCamera());
+ vtkCxxSetObjectMacro(vtkMapper, Selection, vtkSelection);
  
-   // if we need an offset handle it here
-   // The value of .000016 is suitable for depth buffers
-@@ -1974,23 +1973,26 @@
+diff -Naur ParaView-5.9.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx ParaView-5.9.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx
+--- ParaView-5.9.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx
++++ ParaView-5.9.0_SRC_modif/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper.cxx
+@@ -2430,42 +2430,26 @@
    {
      std::string FSSource = shaders[vtkShader::Fragment]->GetSource();
  
--    if (cam->GetParallelProjection())
-+    if (factor != 0.0)
-     {
+-    if (ren->GetActiveCamera()->GetParallelProjection())
+-    {
 -      vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", "uniform float cCValue;");
+-      if (this->DrawingTubesOrSpheres(*this->LastBoundBO, actor))
+-      {
+-        vtkShaderProgram::Substitute(
+-          FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragDepth + cCValue;\n");
+-      }
+-      else
+-      {
+-        vtkShaderProgram::Substitute(
+-          FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragCoord.z + cCValue;\n");
+-      }
++    if (factor != 0.0)
++    {
 +      vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec", 
 +        "uniform float cfactor;\n"
 +        "uniform float coffset;");
-       vtkShaderProgram::Substitute(
--        FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragCoord.z + cCValue;\n");
++       vtkShaderProgram::Substitute(
 +        FSSource, 
 +        "//VTK::UniformFlow::Impl",
 +        "float cscale = length(vec2(dFdx(gl_FragCoord.z),dFdy(gl_FragCoord.z)));\n"
@@ -82,27 +84,39 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper
      }
      else
      {
-       vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec",
+-      vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec",
 -        "uniform float cCValue;\n"
 -        "uniform float cSValue;\n"
 -        "uniform float cDValue;");
--      vtkShaderProgram::Substitute(FSSource, "//VTK::Depth::Impl",
--        "float Zdc = gl_FragCoord.z*2.0 - 1.0;\n"
--        "  float Z2 = -1.0*cDValue/(Zdc + cCValue) + cSValue;\n"
--        "  float Zdc2 = -1.0*cCValue - cDValue/Z2;\n"
--        "  gl_FragDepth = Zdc2*0.5 + 0.5;\n");
+-      if (this->DrawingTubesOrSpheres(*this->LastBoundBO, actor))
+-      {
+-        vtkShaderProgram::Substitute(FSSource, "//VTK::Depth::Impl",
+-          "float Zdc = gl_FragDepth*2.0 - 1.0;\n"
+-          "  float Z2 = -1.0*cDValue/(Zdc + cCValue) + cSValue;\n"
+-          "  float Zdc2 = -1.0*cCValue - cDValue/Z2;\n"
+-          "  gl_FragDepth = Zdc2*0.5 + 0.5;\n");
+-      }
+-      else
+-      {
+-        vtkShaderProgram::Substitute(FSSource, "//VTK::Depth::Impl",
+-          "float Zdc = gl_FragCoord.z*2.0 - 1.0;\n"
+-          "  float Z2 = -1.0*cDValue/(Zdc + cCValue) + cSValue;\n"
+-          "  float Zdc2 = -1.0*cCValue - cDValue/Z2;\n"
+-          "  gl_FragDepth = Zdc2*0.5 + 0.5;\n");
+-      }
++       vtkShaderProgram::Substitute(FSSource, "//VTK::Coincident::Dec",
 +        "uniform float coffset;");
 +      vtkShaderProgram::Substitute(
 +        FSSource, "//VTK::Depth::Impl", "gl_FragDepth = gl_FragCoord.z + 0.000016*coffset;\n");
      }
      shaders[vtkShader::Fragment]->SetSource(FSSource);
    }
-@@ -2110,14 +2112,12 @@
+@@ -2586,14 +2570,13 @@
    // Have the renderpasses changed?
    vtkMTimeType renderPassMTime = this->GetRenderPassStageMTime(actor);
  
 -  vtkOpenGLCamera* cam = (vtkOpenGLCamera*)(ren->GetActiveCamera());
--
    // shape of input data changed?
    float factor, offset;
    this->GetCoincidentParameters(ren, actor, factor, offset);
@@ -111,13 +125,13 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper
 -    ((cam->GetParallelProjection() != 0.0) ? 0x08 : 0) + ((offset != 0.0) ? 0x10 : 0) +
 +    ((factor != 0.0) ? 0x08 : 0) + ((offset != 0.0) ? 0x10 : 0) +
      (this->VBOs->GetNumberOfComponents("scalarColor") ? 0x20 : 0) +
-     ((this->VBOs->GetNumberOfComponents("tcoord") % 4) << 6);
-@@ -2381,6 +2381,19 @@
-     lineWidth[1] = 2.0 * actor->GetProperty()->GetLineWidth() / vp[3];
+     (vtkOpenGLRenderer::SafeDownCast(ren)->GetUseSphericalHarmonics() ? 0x40 : 0) +
+     (actor->GetProperty()->GetCoatStrength() > 0.0 ? 0x80 : 0) +
+@@ -2910,6 +2893,19 @@
+     lineWidth[1] = 2.0 * propLineWidth / vp[3];
      cellBO.Program->SetUniform2f("lineWidthNVC", lineWidth);
    }
-+  
++   
 +  // handle coincident
 +  if (cellBO.Program->IsUniformUsed("coffset"))
 +  {
@@ -130,10 +144,10 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper
 +      cellBO.Program->SetUniformf("cfactor", factor);
 +    }
 +  }
+   vtkOpenGLCheckErrorMacro("failed after UpdateShader");
  }
  
- //-----------------------------------------------------------------------------
-@@ -2436,25 +2449,6 @@
+@@ -2995,25 +2991,6 @@
      }
    }
  
@@ -156,6 +170,7 @@ diff -Naur ParaView-5.8.0_SRC_orig/VTK/Rendering/OpenGL2/vtkOpenGLPolyDataMapper
 -    }
 -  }
 -
-   // If the VBO coordinates were shifted and scaled, apply the inverse transform
-   // to the model->view matrix:
-   vtkOpenGLVertexBufferObject* vvbo = this->VBOs->GetVBO("vertexMC");
+   vtkNew<vtkMatrix3x3> env;
+   if (program->IsUniformUsed("envMatrix"))
+   {
+
diff --git a/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch b/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch
new file mode 100644 (file)
index 0000000..9c12894
--- /dev/null
@@ -0,0 +1,34 @@
+diff -Naur ParaView-5.9.0_ref/CMakeLists.txt ParaView-5.9.0/CMakeLists.txt
+--- ParaView-5.9.0_ref/CMakeLists.txt  2021-02-04 15:22:04.000000000 +0100
++++ ParaView-5.9.0/CMakeLists.txt      2021-03-01 15:48:43.101402815 +0100
+@@ -831,7 +831,7 @@
+ # Test to check that we can process all of the Catalyst editions
+ #------------------------------------------------------------------------------
+ if (BUILD_TESTING AND PARAVIEW_USE_PYTHON AND UNIX AND NOT APPLE)
+-if (FALSE) # XXX(FIXME)
++if (TRUE) # XXX(FIXME)
+   # disabling till we Catalyst editions are fixed post modularization
+   add_test( NAME GenerateCatalystEditions
+     COMMAND ${CMAKE_COMMAND}
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in     2021-03-01 15:51:58.110940810 +0100
+@@ -1,6 +1,6 @@
+ # Catalyst Package config file.
+ cmake_policy(PUSH)
+-cmake_policy(VERSION 3.13)
++cmake_policy(VERSION 3.12)
+ set(CATALYST_VERSION "@CATALYST_VERSION@")
+ set(CATALYST_ABI_VERSION "@CATALYST_ABI_VERSION@")
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt     2021-03-01 15:56:02.640910857 +0100
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.13...3.16 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.12...3.16 FATAL_ERROR)
+ project(CATALYST VERSION 2.0 LANGUAGES C CXX)
+ #------------------------------------------------------------------------------
diff --git a/config/patches/paraview.0011-ParaView_protobuf_crash.patch b/config/patches/paraview.0011-ParaView_protobuf_crash.patch
new file mode 100644 (file)
index 0000000..a9623e9
--- /dev/null
@@ -0,0 +1,14 @@
+diff -Naur ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
+index e171735139..47784ec70e 100644
+--- ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx
++++ ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
+@@ -300,7 +300,7 @@ void vtkInitializationHelper::Finalize()
+   vtkProcessModule::Finalize();
+   // Optional:  Delete all global objects allocated by libprotobuf.
+-  google::protobuf::ShutdownProtobufLibrary();
++  //google::protobuf::ShutdownProtobufLibrary();
+ }
+ //----------------------------------------------------------------------------
+
diff --git a/config/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch b/config/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch
new file mode 100644 (file)
index 0000000..fae772a
--- /dev/null
@@ -0,0 +1,29 @@
+diff -Naur ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake
+--- ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake       2021-04-15 12:41:13.691878300 +0300
++++ ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake      2021-04-15 12:50:29.348516100 +0300
+@@ -65,11 +65,20 @@
+   if (arg_INSTALL_EXPORT_DEFAULT)
+     set (_exports EXPORT Catalyst)
+   endif()
+-  if (arg_LIBRARY_DESTINATION)
+-    install(
+-      TARGETS ${arg_TARGET}
+-      ${_exports}
+-      LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
++  if(WIN32)
++    if (arg_LIBRARY_DESTINATION)
++      install(
++        TARGETS ${arg_TARGET}
++        ${_exports}
++        RUNTIME DESTINATION ${arg_LIBRARY_DESTINATION})
++    endif()
++  else()
++    if (arg_LIBRARY_DESTINATION)
++      install(
++        TARGETS ${arg_TARGET}
++        ${_exports}
++        LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
++    endif()
+   endif()
+ endfunction()
+
diff --git a/config/patches/paraview.1002-ParaView_find_zlib.patch b/config/patches/paraview.1002-ParaView_find_zlib.patch
new file mode 100644 (file)
index 0000000..c811a23
--- /dev/null
@@ -0,0 +1,15 @@
+diff -Naur ParaView-5.8.0_SRC_orig/VTK/CMake/patches/3.13/FindZLIB.cmake ParaView-5.8.0_SRC_modif/VTK/CMake/patches/3.13/FindZLIB.cmake
+--- ParaView-5.8.0_SRC_orig/VTK/CMake/patches/3.13/FindZLIB.cmake      2020-03-23 13:31:26.000000000 +0300
++++ ParaView-5.8.0_SRC_modif/VTK/CMake/patches/3.13/FindZLIB.cmake     2020-04-13 14:13:11.214692753 +0300
+@@ -52,6 +52,11 @@
+
+ set(_ZLIB_SEARCHES)
+
++SET(ZLIB_ROOT_DIR $ENV{ZLIB_ROOT_DIR} CACHE PATH "PATH TO zlib.")
++IF(ZLIB_ROOT_DIR)
++  LIST(APPEND CMAKE_PREFIX_PATH "${ZLIB_ROOT_DIR}")
++ENDIF(ZLIB_ROOT_DIR)
++
+ # Search ZLIB_ROOT first if it is set.
+ if(ZLIB_ROOT)
+   set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
diff --git a/config/patches/pyqt5sip.001_sipBool.patch b/config/patches/pyqt5sip.001_sipBool.patch
new file mode 100644 (file)
index 0000000..b33b4da
--- /dev/null
@@ -0,0 +1,14 @@
+--- PyQt5_sip-12.8.1/sipint.h  2020-08-29 13:27:37.000000000 +0300
++++ PyQt5_sip-12.8.1/sipint.h.new      2021-03-17 12:06:11.287544763 +0300
+@@ -177,9 +177,9 @@
+ void sipOMAddObject(sipObjectMap *om, sipSimpleWrapper *val);
+ int sipOMRemoveObject(sipObjectMap *om, sipSimpleWrapper *val);
+-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
++//#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define sipSetBool(p, v)    (*(_Bool *)(p) = (v))
+-#endif
++//#endif
+ #ifdef __cplusplus
diff --git a/config/patches/qt.002_xkbcommon.patch b/config/patches/qt.002_xkbcommon.patch
new file mode 100644 (file)
index 0000000..692861d
--- /dev/null
@@ -0,0 +1,18 @@
+--- qt-everywhere-src-5.12.10/qtbase/src/gui/configure.json    2021-03-17 12:16:55.144830165 +0300
++++ qt-everywhere-src-5.12.10/qtbase/src/gui/configure.json.new        2021-03-17 12:16:41.605223710 +0300
+@@ -758,13 +758,13 @@
+             "use": "xcb"
+         },
+         "xkbcommon": {
+-            "label": "xkbcommon >= 0.5.0",
++            "label": "xkbcommon >= 0.4.3",
+             "test": {
+                 "main": "xkb_context_new(XKB_CONTEXT_NO_FLAGS);"
+             },
+             "headers": [ "xkbcommon/xkbcommon.h" ],
+             "sources": [
+-                { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" },
++                { "type": "pkgConfig", "args": "xkbcommon >= 0.4.3" },
+                 "-lxkbcommon"
+             ]
+         },
diff --git a/config/patches/rkcommon.001_native_tbb.patch b/config/patches/rkcommon.001_native_tbb.patch
new file mode 100644 (file)
index 0000000..fdf3156
--- /dev/null
@@ -0,0 +1,12 @@
+--- rkcommon-1.5.1/cmake/FindTBB.cmake 2021-03-09 14:26:46.000000000 +0300
++++ rkcommon-1.5.1/cmake/FindTBB.cmake.new     2021-03-17 12:26:35.339966172 +0300
+@@ -269,8 +269,7 @@
+ function(rk_tbb_find_include_directory)
+   find_path(TBB_INCLUDE_DIR
+     NAMES "${_TBB_HEADER}"
+-    HINTS "${TBB_ROOT}/${_TBB_INCLUDE_SUBDIR}"
+-    NO_PACKAGE_ROOT_PATH)
++    HINTS "${TBB_ROOT}/${_TBB_INCLUDE_SUBDIR}")
+ endfunction()
+ #===============================================================================
index e74ad28d15fb0aa85ce9cc38934e6fd9b761bb3a..12d22a0a3edebce4389148114ce8fcb86cefa50a 100644 (file)
@@ -1,19 +1,21 @@
 <!DOCTYPE config>
-<config comment="SALOME 9.6" name="V9_6_0">
+<config comment="SALOME 9.6" name="V9_7_0">
   <product name="alabaster" version="0.7.6" />
   <product name="babel" version="2.6.0" />
   <product name="boost" version="1.58.0" />
   <product name="certifi" version="2018.4.16" />
-  <product name="cgns" version="3.3.1" />
+  <product name="cgns" version="4.1.1" />
   <product name="chardet" version="3.0.4" />
   <product name="click" version="6.7" />
   <product name="cmake" version="3.12.1" />
-  <product name="cycler" version="0.10.0" />
   <product name="cppunit" version="1.12.1" />
+  <product name="cycler" version="0.10.0" />
   <product name="cython" version="0.25.2" />
   <product name="dateutils" version="2.4.2" />
   <product name="docutils" version="0.12" />
   <product name="doxygen" version="1.8.14" />
+  <product name="eigen" version="3.2.7" />
+  <product name="embree" version="3.12.2" />
   <product name="freeimage" version="3.16.0">
     <patches>
       <patch comment="Fix compilation problems" name="freeimage.001_sources.patch" sha1="d6272a9ac10f9bbbbe6e395185dda2abc11b1d1e" />
       <patch comment="Fix build procedure" name="graphviz.001_build_procedure.patch" sha1="4b227e20ad416e8f08911fa907b66deb1d359102" />
     </patches>
   </product>
-  <product name="hdf5" version="1.10.3" >
+  <product name="hdf5" version="1.10.3">
     <patches>
       <patch comment="Fix problem with threads libaray" name="hdf5.001_threads_threads.patch" sha1="b0c783d7232f2b061b461e9409222c2d69b7fe49" />
     </patches>
   </product> 
-  <product name="homardtool" version="11.12" />
+  <product name="h5py" version="2.5.0" />
   <product name="idna" version="2.7" />
   <product name="imagesize" version="1.0.0" />
-  <product name="ispc" vesrion="1.9.2" />
-  <product name="h5py" version="2.5.0" />
+  <product name="ispc" version="1.9.2" />
   <product name="jinja2" version="2.7.3" />
   <product name="kiwisolver" version="1.0.1" />
   <product name="lapack" version="3.7.0" />
       <patch comment="Fix build procedure: create configuration file properly" name="matplotlib.001_build_procedure.patch" sha1="e01651c9160f7a2a73311ba0cbf1686385bea301" />
     </patches>
   </product>
-  <product name="medfile" version="4.1.0" /> 
-  <product name="meshgems" version="2.10.4" />
+  <product name="medfile" version="4.1.0">
+    <patches>
+      <patch comment="Correct cmake configuration file" name="med.001_cmake_config.patch" sha1="64592f806ab4b05154abfc7074dadcba4256a019" />
+    </patches>
+  </product>
+  <product name="mesa" version="19.0.8" />
+  <product name="meshgems" version="2.12.1" />
   <product name="metis" version="5.1.0" />
   <product name="mpich2" version="1.4.1p1" />
   <product name="mpi4py" version="1.3.1" />
   </product>
   <product name="nlopt" version="2.4.2" />
   <product name="nose" version="1.3.7" />
-  <product name="numpy" version="1.15.1" >
+  <product name="numpy" version="1.15.1">
     <patches>
       <patch comment="Fix problem with shell command" name="numpy.001_shell.patch" sha1="d004dfb9053fcc7bcdc021e8c7aa3eb552a80452" />
     </patches>
   </product>
-  <product name="occt" version="7.4.0p2" />
+  <product name="occt" version="7.5.0p1" />
   <product name="omniorb" version="4.2.2" />
   <product name="omniorbpy" version="4.2.2" />
   <product name="opencv" version="3.2.0">
     </patches>
   </product>
   <product name="openmpi" version="1.8.5" />
-  <product name="ospray" version="1.8.4" />
+  <product name="openvkl" version="0.11.0" />
+  <product name="ospray" version="2.4.0" />
   <product name="packaging" version="17.1" />
-  <product name="paraview" version="5.8.0">
+  <product name="paraview" version="5.9.0">
     <patches>
-      <patch comment="Patch for LATA Reader" name="paraview.0001-LATA-reader.patch" sha1="d1b723eab368e716f7bee33e4064c839a7055b34" />
-      <patch comment="Patches for Visit Bridge " name="paraview.0002-vtkUnstructuredGridRelevantPointsFilter-fix-for-poly.patch" sha1="ac843a5d0135b4c9d657dc92e0e69007cca84d1d" />
       <patch comment="Patch for ParaView client" name="paraview.0003-ParaViewClient.patch" sha1="5a09612a69ecb13831062f36eee50a02b82370da" />
       <patch comment="Patch for ParaView HDF5" name="paraview.0004-ParaView_hdf5.patch" sha1="b34706a3bb5e6873b0c94726e565624928994a57" />
       <patch comment="Patch for ParaView CNGS's detection procedure" name="paraview.0005-ParaView_find_cgns.patch" sha1="b48b6008506607eaedbbeb662ca822903bcc274d" />
       <patch comment="Patch for ParaView libxml2's detection procedure" name="paraview.0006-ParaView_find_libxml2.patch" sha1="adc67576f12ca3b6abc06be2960495029c24c2a6" />
       <patch comment="Patch for ParaView freetype's detection procedure" name="paraview.0007-ParaView_find_freetype.patch" sha1="58a8b25b56fb325134129445c2ac90d7d4115980" />
-      <patch comment="Patch to fix ParaView bug with rendering coincident topology" name="paraview.0008-ParaView_coincident_rendering.patch" sha1="45f74561b5301187bd73ee10f0c266c1345c8666" />
-      <patch comment="Patch for volume mapper (fix crash)" name="paraview.0009-ParaView_volume_mapper.patch" sha1="a14b75914c76d15897e470c2948cb8fea9377f5a" />
+      <patch comment="Patch to fix ParaView bug with rendering coincident topology" name="paraview.0008-ParaView_coincident_rendering.patch" sha1="8c61f791b6a14d9a565f35ba44a51b8215cfa3ed" />
+      <patch comment="Patch for CATALYST plugin" name="paraview.0010-ParaView_CATALYST_cmake.patch" sha1="c6140c0ee3e23cae98389c363e8945a6c7e5d61c" />
+      <patch comment="Patch to prevent crahs on ParaView exit" name="paraview.0011-ParaView_protobuf_crash.patch" sha1="f99abafb92f9aaa9a3e2f14069d5c1666e460a07" />
+      <patch comment="Additional patch for CATALYST plugin (Windows)" name="paraview.1001-ParaView_windows_catalyst_cmake.patch" sha1="e7e9dba93d04834246f30859e95fcc3b19888344" />
+      <patch comment="Patch for ParaView zlib's detection procedure (Windows)" name="paraview.1002-ParaView_find_zlib.patch" sha1="2221adf14cbb2ec063409f82ed93ad759d1efb98" />
     </patches>
   </product>
   <product name="pillow" version="7.1.1" />  
   <product name="pkgconfig" version="1.1.0" />
+  <product name="planegcs" version="0.18">
+    <patches>
+      <patch comment="Patch planegcs for shaper needs" name="planegcs.001_for_shaper.patch" sha1="2f210b3cc4cb4b59aea1dcd05df406a36342981a" />
+    </patches>
+  </product>
+  <product name="pockets" version="0.6.2" />
+  <product name="psutil" version="5.8.0" />
   <product name="pygments" version="2.0.2" />
   <product name="pyparsing" version="2.0.3" />
-  <product name="pyqt" version="5.9.0" />
+  <product name="pyqt" version="5.15.3" />
+  <product name="pyqtsip" version="12.8.1">
+    <patches>
+      <patch comment="Fix undefined symbol sipSetBool" name="pyqt5sip.001_sipBool.patch" sha1="9fa714c393c8daa6a6dfb96cb38468026f18d2b3" />
+    </patches>
+  </product>
   <product name="python" version="3.6.0" />
   <product name="pytz" version="2015.4" />
-  <product name="qt" version="5.9.1">
+  <product name="qt" version="5.12.10">
     <patches>
-      <patch comment="Fix problem with proxy factory (WebKit)." name="qt.001_proxy_factory.patch" sha1="7bf00a49425d1e7158e4d98f0dcba625b8462b1a" />
+      <patch comment="Patch to downgrade xkbcommo requirements" name="qt.002_xkbcommon.patch" sha1="e85dd94d3b848901ceff504671a9f48d6dc73ff4" />
     </patches>
   </product>
   <product name="qwt" version="6.1.2" />
+  <product name="rkcommon" version="1.5.1">
+    <patches>
+      <patch comment="Patch to prevent picking native TBB" name="rkcommon.001_native_tbb.patch" sha1="b3d454c3ba0a1d5dcee8da8c6c55ca4d0e70d11b" />
+    </patches>
+  </product>
   <product name="requests" version="2.19.1" />
   <product name="scipy" version="0.18.1" />
   <product name="scotch" version="6.0.4">
     </patches>
   </product>
   <product name="setuptools" version="38.4.0" />
-  <product name="sip" version="4.19.3" />
+  <product name="sip" version="5.5.0" />
   <product name="six" version="1.10.0" />
   <product name="snowballstemmer" version="1.2.1" />
   <product name="sphinx" version="1.7.6" />
-  <product name="sphinxcontrib-napoleon" version="0.6.1" />
   <product name="sphinxcontrib-websupport" version="1.1.0" />
   <product name="sphinx-intl" version="1.9.10" />
   <product name="swig" version="3.0.12" />
+  <product name="tbb" version="4.4" />
   <product name="tcltk" version="8.6.0" />
   <product name="tclx" version="8.4.1" />
-  <product name="tbb" version="4.4" />
+  <product name="toml" version="0.10.2" />
   <product name="urllib3" version="1.23" />
-  <product name="eigen" version="3.2.7" />
-  <product name="embree" version="3.3.0" >
-    <patches>
-      <patch comment="Patch for CentOS-6 platform" name="embree.001_centos6.patch" sha1="63fe01e0c3da109bc092525f9573188e0c5625ea" />
-    </patches>
-  </product>
-  <product name="planegcs" version="0.18" >
-    <patches>
-      <patch comment="Patch planegcs for shaper needs" name="planegcs.001_for_shaper.patch" sha1="2f210b3cc4cb4b59aea1dcd05df406a36342981a" />
-    </patches>
-  </product>
-  <product name="pockets" version="0.6.2" />
-  <product comment="SALOME Geometry module" name="geom" version="9_6_0" />
-  <product comment="SALOME GUI module" name="gui" version="9_6_0" />
-  <product comment="SALOME HexaBlock module" name="hexablock" version="9_6_0" />
-  <product comment="SALOME Homard module" name="homard" version="9_6_0" />
-  <product comment="SALOME JobManager module" name="jobmanager" version="9_6_0" />
-  <product comment="SALOME Kernel module" name="kernel" version="9_6_0" />
-  <product comment="SALOME Med module" name="med" version="9_6_0" />
-  <product comment="SALOME ParaVis module" name="paravis" version="9_6_0" />
-  <product comment="SALOME Mesh module" name="smesh" version="9_6_0" />
-  <product comment="SALOME YACS module" name="yacs" version="9_6_0" />
-  <product comment="SALOME MG-CadSurf meshing plugin" name="blsurfplugin" version="9_6_0" />
-  <product comment="SALOME MG-Tetra meshing plugin" name="ghs3dplugin" version="9_6_0" />
-  <product comment="SALOME MG-Tetra_HPC meshing plugin" name="ghs3dprlplugin" version="9_6_0" />
-  <product comment="SALOME MG-Hexa meshing plugin" name="hexoticplugin" version="9_6_0" />
-  <product comment="SALOME HexaBlock meshing plugin" name="hexablockplugin" version="9_6_0" />
-  <product comment="SALOME MG-Hybrid meshing plugin" name="hybridplugin" version="9_6_0" />
-  <product comment="SALOME Netgen meshing plugin" name="netgenplugin" version="9_6_0" />
-  <product comment="SALOME Gmsh meshing plugin" name="gmshplugin" version="9_6_0" />
-  <product comment="SALOME Documentation tool" name="documentation" version="9_6_0" />
-  <product comment="SALOME Hxx2salome tool" name="hxx2salome" version="9_6_0" />
-  <product comment="libBatch library" name="libbatch" version="V2_4_4" />
-  <product comment="SALOME MedCoupling library" name="medcoupling" version="9_6_0" />
-  <product comment="SALOME Tutorial" name="tutorial" version="9_6_0" />
-  <product comment="SALOME YacsGen tool" name="yacsgen" version="9_6_0" />
-  <product comment="SALOME AtomGen sample module" name="atomgen" version="9_6_0" />
-  <product comment="SALOME Atomic sample module" name="atomic" version="9_6_0" />
-  <product comment="SALOME AtomSolv sample module" name="atomsolv" version="9_6_0" />
-  <product comment="SALOME Calculator sample module" name="calculator" version="9_6_0" />
-  <product comment="SALOME Component sample module" name="component" version="9_6_0" />
-  <product comment="SALOME data files" name="samples" version="9_6_0" />
-  <product comment="SALOME DscCode sample module" name="dsccode" version="9_6_0" />
-  <product comment="SALOME Hello sample module" name="hello" version="9_6_0" />
-  <product comment="SALOME Light sample module" name="light" version="9_6_0" />
-  <product comment="SALOME PyCalculator sample module" name="pycalculator" version="9_6_0" />
-  <product comment="SALOME PyHello sample module" name="pyhello" version="9_6_0" />
-  <product comment="SALOME PyLight sample module" name="pylight" version="9_6_0" />
-  <product comment="SALOME Randomizer sample module" name="randomizer" version="9_6_0" />
-  <product comment="SALOME Sierpinsky sample module" name="sierpinsky" version="9_6_0" />
+  <product comment="libBatch library" name="libbatch" version="V2_4_5" />
+  <product comment="SALOME Geometry module" name="geom" version="V9_7_0" />
+  <product comment="SALOME GUI module" name="gui" version="V9_7_0" />
+  <product comment="SALOME HexaBlock module" name="hexablock" version="V9_7_0" />
+  <product comment="SALOME Homard module" name="homard" version="V9_7_0" />
+  <product comment="SALOME JobManager module" name="jobmanager" version="V9_7_0" />
+  <product comment="SALOME Kernel module" name="kernel" version="V9_7_0" />
+  <product comment="SALOME Med module" name="med" version="V9_7_0" />
+  <product comment="SALOME ParaVis module" name="paravis" version="V9_7_0" />
+  <product comment="SALOME Mesh module" name="smesh" version="V9_7_0" />
+  <product comment="SALOME YACS module" name="yacs" version="V9_7_0" />
+  <product comment="SALOME MG-CadSurf meshing plugin" name="blsurfplugin" version="V9_7_0" />
+  <product comment="SALOME MG-Tetra meshing plugin" name="ghs3dplugin" version="V9_7_0" />
+  <product comment="SALOME MG-Tetra_HPC meshing plugin" name="ghs3dprlplugin" version="V9_7_0" />
+  <product comment="SALOME MG-Hexa meshing plugin" name="hexoticplugin" version="V9_7_0" />
+  <product comment="SALOME HexaBlock meshing plugin" name="hexablockplugin" version="V9_7_0" />
+  <product comment="SALOME MG-Hybrid meshing plugin" name="hybridplugin" version="V9_7_0" />
+  <product comment="SALOME Netgen meshing plugin" name="netgenplugin" version="V9_7_0" />
+  <product comment="SALOME Gmsh meshing plugin" name="gmshplugin" version="V9_7_0" />
+  <product comment="SALOME Documentation tool" name="documentation" version="V9_7_0" />
+  <product comment="SALOME Hxx2salome tool" name="hxx2salome" version="V9_7_0" />
+  <product comment="SALOME MedCoupling library" name="medcoupling" version="V9_7_0" />
+  <product comment="SALOME Tutorial" name="tutorial" version="V9_7_0" />
+  <product comment="SALOME YacsGen tool" name="yacsgen" version="V9_7_0" />
+  <product comment="SALOME AtomGen sample module" name="atomgen" version="V9_7_0" />
+  <product comment="SALOME Atomic sample module" name="atomic" version="V9_7_0" />
+  <product comment="SALOME AtomSolv sample module" name="atomsolv" version="V9_7_0" />
+  <product comment="SALOME Calculator sample module" name="calculator" version="V9_7_0" />
+  <product comment="SALOME Component sample module" name="component" version="V9_7_0" />
+  <product comment="SALOME data files" name="samples" version="V9_7_0" />
+  <product comment="SALOME DscCode sample module" name="dsccode" version="V9_7_0" />
+  <product comment="SALOME Hello sample module" name="hello" version="V9_7_0" />
+  <product comment="SALOME Light sample module" name="light" version="V9_7_0" />
+  <product comment="SALOME PyCalculator sample module" name="pycalculator" version="V9_7_0" />
+  <product comment="SALOME PyHello sample module" name="pyhello" version="V9_7_0" />
+  <product comment="SALOME PyLight sample module" name="pylight" version="V9_7_0" />
+  <product comment="SALOME Randomizer sample module" name="randomizer" version="V9_7_0" />
+  <product comment="SALOME Sierpinsky sample module" name="sierpinsky" version="V9_7_0" />
 </config>
index 07deee685e6342c2cb94356b7073ce6cb3b934ff..0f86af304704ddc6737a76b1bcf1b076c7b13ae3 100644 (file)
@@ -79,6 +79,7 @@ __all__ = [
     "commentAttr",
     "versionAttr",
     "urlAttr",
+    "sha1Attr",
     "supportedTags",
     "supportedAttributes",
     "tagAttributes",
@@ -144,6 +145,12 @@ def urlAttr():
     """
     return "url"
 
+def sha1Attr():
+    """
+    Return XML attribute for sha1 parameter (string).
+    """
+    return "sha1"
+
 def supportedTags():
     """
     Return list of all supported XML tags (list of strings).
@@ -154,7 +161,7 @@ def supportedAttributes():
     """
     Return list of all supported XML attributes (list of strings).
     """
-    return [nameAttr(), commentAttr(), versionAttr(), urlAttr()]
+    return [nameAttr(), commentAttr(), versionAttr(), urlAttr(), sha1Attr()]
     
 def tagAttributes(tag, force = False):
     """
@@ -191,6 +198,7 @@ def tagAttributes(tag, force = False):
         pass
         attrs[urlAttr()]      = False
         attrs[commentAttr()]  = False
+        attrs[sha1Attr()]     = False
     return attrs
 
 def tagChildren(tag):
@@ -261,6 +269,7 @@ class CfgTool(object):
         """
         self.enc = "utf-8"
         self.cfgFile = cfgFile if cfgFile else defaultConfFile()
+        self.parents = {}
         try:
             self.tree = ET.parse(self.cfgFile).getroot()
             self._checkConfig()
@@ -275,7 +284,7 @@ class CfgTool(object):
                 raise Exception("bad XML file %s: %s" % (self.cfgFile, str(e)))
             pass
         except Exception as e:
-            raise Exception("unkwnown error: %s" % str(e))
+            raise Exception("unknown error: %s" % str(e))
         pass
     
     def encoding(self):
@@ -486,7 +495,7 @@ class CfgTool(object):
         Return value is new XML element (xml.etree.ElementTree.Element).
         """
         child = ET.SubElement(elem, tag)
-        child._parent = elem # set parent!!!
+        self.parents[child] = elem # set parent!!!
         return child
 
     def _processTarget(self, target):
@@ -596,7 +605,7 @@ class CfgTool(object):
         path = []
         while elem is not None:
             path.append(_mkname(elem))
-            elem = elem._parent if hasattr(elem, "_parent") else None
+            elem = self.parents.get(elem)
             pass
         path.reverse()
         return pathSeparator().join(path)
@@ -729,7 +738,7 @@ class CfgTool(object):
             # check all childrens recursively
             children = elem.getchildren()
             for child in children:
-                child._parent = elem # set parent!!!
+                self.parents[child] = elem # set parent!!!
                 self._checkTag(child, elem.tag, errors)
                 pass
             pass