9.10.0

3 files changed, 32 insertions, 157 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e80922991ab9..084832780411 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,17 @@
-# Generated by mksrcinfo v8
-# Tue Dec 20 06:10:58 UTC 2016
 pkgbase = salome-medcoupling
-	pkgdesc = MEDCoupling has been extracted from SALOME MED module and distributed as a separate product. This allows external projects to benefit from direct usage of MEDCoupling library for operating on MED files.
-	pkgver = 7.8.0
+	pkgdesc = Field data manipulation library
+	pkgver = 9.10.0
 	pkgrel = 1
-	url = http://www.salome-platform.org/downloads/current-version/
-	arch = i686
+	url = https://www.salome-platform.org
 	arch = x86_64
-	license = GPLv2
-	makedepends = doxygen
-	makedepends = python2-sphinx
-	makedepends = swig2
-	depends = cppunit
-	depends = parmetis3
-	depends = scotch
-	depends = med-salome
+	license = LGPL2+
+	makedepends = swig
+	makedepends = salome-configuration
+	depends = med
 	depends = libxml2
-	source = salome-medcoupling.sh
-	source = http://files.salome-platform.org/Salome/other/medCoupling-7.8.0.tar.gz
-	md5sums = a4206aab23cf0b0056c8c7c943c81683
-	md5sums = 45566e99bba154a89673f75651aad5c9
+	depends = python-scipy
+	depends = metis
+	source = git+https://git.salome-platform.org/gitpub/tools/medcoupling.git#tag=V9_10_0
+	md5sums = SKIP
 
 pkgname = salome-medcoupling
-
diff --git a/PKGBUILD b/PKGBUILD
index e9f5dc6e4d5a..66d014a901a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,105 +1,30 @@
-# Maintainer: Michele Mocciola <mickele>
-     
 pkgname=salome-medcoupling
-pkgver=7.8.0
+pkgver=9.10.0
 pkgrel=1
-pkgdesc="MEDCoupling has been extracted from SALOME MED module and distributed as a separate product. This allows external projects to benefit from direct usage of MEDCoupling library for operating on MED files."
-url="http://www.salome-platform.org/downloads/current-version/"
-license=('GPLv2')
-depends=('cppunit' 'parmetis3' 'scotch' 'med-salome' 'libxml2')
-makedepends=('doxygen' 'python2-sphinx' 'swig2')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-arch=('i686' 'x86_64')
-source=("${pkgname}.sh" "http://files.salome-platform.org/Salome/other/medCoupling-${pkgver}.tar.gz")
-
-_basedir=/opt/salome
-_installdir=${_basedir}
-_profiledir=${_basedir}/env.d
-
-prepare() {
-  cd "${srcdir}"
-
-  if [ -d build ]; then
-    rm -rf build
-  fi
-  mkdir "${srcdir}/build"
+pkgdesc="Field data manipulation library"
+url="https://www.salome-platform.org"
+license=('LGPL2+')
+depends=('med' 'libxml2' 'python-scipy' 'metis') #'scotch' 
+makedepends=('swig' 'salome-configuration')
+arch=('x86_64')
+source=("git+https://git.salome-platform.org/gitpub/tools/medcoupling.git#tag=V9_10_0")
+md5sums=(SKIP)
+
+prepare () {
+  cd medcoupling
+  sed -i "s|FIND_PACKAGE(SalomeHDF5 REQUIRED)|find_package(HDF5 REQUIRED)|g" CMakeLists.txt
 }
 
 build() {
-  cd "${srcdir}/build"
-  
-  local python_version=2.7
-  local cmake_options=""
-
-  local cmake_options=""
-
-  # generic options
-  cmake_options+=" -DCMAKE_BUILD_TYPE=Release"
-  cmake_options+=" -DCMAKE_INSTALL_PREFIX=${_installdir}"
-  #cmake_options+=" -DMEDCOUPLING_BUILD_DOC:BOOL=OFF"
-
-  # debug options
-  cmake_options+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF"
-  cmake_options+=" -DSALOME_CMAKE_DEBUG:BOOL=OFF"
-
-  # mpi
-  cmake_options+=" -DSALOME_USE_MPI:BOOL=ON"
-  cmake_options+=" -DMEDCOUPLING_USE_MPI:BOOL=ON"
-
-  # python2
-  cmake_options+=" -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2"
-
-  # sphinx-2
-  cmake_options+=" -DSPHINX_EXECUTABLE:FILEPATH=/usr/bin/sphinx-build2"
-  cmake_options+=" -DSPHINX_APIDOC_EXECUTABLE:FILEPATH=/usr/bin/sphinx-apidoc2"
-
-  # swig2
-  cmake_options+=" -DSWIG_EXECUTABLE:FILEPATH=/usr/bin/swig-2"
-
-  # libxml2
-  cmake_options+=" -DLIBXML2_ROOT_DIR:PATH=/usr"
-  cmake_options+=" -DLibXml2_DIR:PATH=/usr/lib/cmake/libxml2"
-  cmake_options+=" -DLIBXML2_INCLUDE_DIR:PATH=/usr/include/libxml2"
-
-  # hdf5-1.8
-  cmake_options+=" -DHDF5_INCLUDE_DIRS:PATH=/usr/include/hdf5_18/"
-  cmake_options+=" -DHDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5cc_18"
-  cmake_options+=" -DHDF5_C_LIBRARY_hdf5:FILEPATH=/usr/lib/hdf5_18/libhdf5.so"
-  cmake_options+=" -DHDF5_DIFF_EXECUTABLE:FILEPATH=/usr/bin/h5diff_18"
-
-  # parmetis3
-  cmake_options+=" -DMEDCOUPLING_PARTITIONER_METIS:BOOL=OFF"
-  cmake_options+=" -DMEDCOUPLING_PARTITIONER_PARMETIS:BOOL=ON"
-  cmake_options+=" -DPARMETIS_INCLUDE_DIRS:PATH=/usr/include/parmetis-3"
-  cmake_options+=" -DPARMETIS_LIBRARIES:FILEPATH=/usr/lib/libparmetis-3.so"
-  cmake_options+=" -DPARMETIS_SEQ_LIBRARIES:FILEPATH=/usr/lib/libmetis-4.so"
-  
-
-  cmake ${cmake_options} \
-  	../medCoupling-${pkgver}
-
-  make
+  cmake -S medcoupling -B build \
+    -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
+    -DCONFIGURATION_ROOT_DIR=/usr/share/salome/configuration -DSALOME_USE_MPI=ON \
+    -DMEDCOUPLING_BUILD_DOC=OFF -DMEDCOUPLING_BUILD_TESTS=OFF \
+    -DMEDCOUPLING_PARTITIONER_METIS:BOOL=ON -DMEDCOUPLING_PARTITIONER_PARMETIS:BOOL=ON \
+    -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF
+   make -C build
 }
  
 package() {
-  cd "${srcdir}/build"
-
-  make DESTDIR=${pkgdir} install
-
- 
-  cd ${pkgdir}
-  for _FILE in `grep -Rl "/usr/bin/env python" *`
-  do
-    sed -e "s|/usr/bin/env python|/usr/bin/env python2|" -i ${_FILE}
-  done
-
-  # install profile
-  install -D -m755 "${srcdir}/${pkgname}.sh" \
-                   "${pkgdir}${_profiledir}/${pkgname}.sh"
+  make DESTDIR=${pkgdir} install -C build
 }
-md5sums=('a4206aab23cf0b0056c8c7c943c81683'
-         '45566e99bba154a89673f75651aad5c9')
diff --git a/salome-medcoupling.sh b/salome-medcoupling.sh
deleted file mode 100644
index 9d3f9e1d0b57..000000000000
--- a/salome-medcoupling.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# module var
-export MEDCOUPLING_ROOT_DIR=/opt/salome
-
-# vars
-_medcoupling_pythonver=2.7
-_medcoupling_path=$MEDCOUPLING_ROOT_DIR/bin
-_medcoupling_pythonpath=$MEDCOUPLING_ROOT_DIR/lib/python${_medcoupling_pythonver}/site-packages
-_medcoupling_librarypath=$MEDCOUPLING_ROOT_DIR/lib
-
-# PATH
-if [[ $PATH != ${_medcoupling_path} && $PATH != ${_medcoupling_path}:* && $PATH != *:${_medcoupling_path} && $PATH != *:${_medcoupling_path}:* ]]; then
-    if [[ -z "$PATH" ]]; then
-	export PATH=${_medcoupling_path}
-    else
-	export PATH=${_medcoupling_path}:$PATH
-    fi
-fi
-
-# PYTHONPATH
-if [[ $PYTHONPATH != ${_medcoupling_pythonpath} && $PYTHONPATH != ${_medcoupling_pythonpath}:* && $PYTHONPATH != *:${_medcoupling_pythonpath} && $PYTHONPATH != *:${_medcoupling_pythonpath}:* ]]; then
-    if [[ -z "$PYTHONPATH" ]]; then
-	export PYTHONPATH=${_medcoupling_pythonpath}
-    else
-	export PYTHONPATH=${_medcoupling_pythonpath}:$PYTHONPATH
-    fi
-fi
-if [[ $PYTHONPATH != ${_medcoupling_path} && $PYTHONPATH != ${_medcoupling_path}:* && $PYTHONPATH != *:${_medcoupling_path} && $PYTHONPATH != *:${_medcoupling_path}:* ]]; then
-    if [[ -z "$PATH" ]]; then
-	export PYTHONPATH=${_medcoupling_path}
-    else
-	export PYTHONPATH=${_medcoupling_path}:$PATH
-    fi
-fi
-
-# LD_LIBRARY_PATH
-if [[ $LD_LIBRARY_PATH != ${_medcoupling_librarypath} && $LD_LIBRARY_PATH != ${_medcoupling_librarypath}:* && $LD_LIBRARY_PATH != *:${_medcoupling_librarypath} && $LD_LIBRARY_PATH != *:${_medcoupling_librarypath}:* ]]; then
-    if [[ -z "$LD_LIBRARY_PATH" ]]; then
-	export LD_LIBRARY_PATH=${_medcoupling_librarypath}
-    else
-	export LD_LIBRARY_PATH=${_medcoupling_librarypath}:$LD_LIBRARY_PATH
-    fi
-fi