Updated

1 files changed, 68 insertions, 34 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 21a7e300ab66..b90df0eab797 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,38 @@
 # Maintainer: Michele Mocciola <mickele>
 
 pkgname=salome-smesh
-pkgver=7.6.0
-pkgrel=4
+pkgver=7.8.0
+pkgrel=1
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - SMESH Module"
 url="http://www.salome-platform.org"
-depends=('salome-geom>=7.6.0' 'salome-geom<7.7.0' 'salome-med>=7.6.0' 'salome-med<7.7.0')
-makedepends=('boost' 'swig2' 'python2-sphinx' 'optipng')
+depends=("salome-geom>=${pkgver}" "salome-geom<${pkgver:0:2}$((${pkgver:2:1}+1)).0" "salome-medcoupling>=${pkgver}" "salome-medcoupling<${pkgver:0:2}$((${pkgver:2:1}+1)).0")
+makedepends=('doxygen' 'boost' 'swig2' 'python2-sphinx' 'optipng')
 arch=('i686' 'x86_64')
 conflicts=()
 provides=()
 license=('LGPL')
-source=("salome-smesh.profile")
+source=("${pkgname}.sh" "http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz")
 
-_source=smesh
-_installdir=/opt/salome
+#_source=smesh
+_source=SMESH_SRC
+_basedir=/opt/salome
+_installdir=${_basedir}
+_profiledir=${_basedir}/env.d
 _paraviewrootdir=/usr
-_paraviewver=4.2
+_paraviewver=5.0
 
 prepare() {
-  msg "Connecting to git server..."
+#  msg "Connecting to git server..."
+#  if [[ -d ${_source} ]] ; then
+#     rm -rf ${_source}
+#  fi
+#  git clone git://git.salome-platform.org/modules/${_source}.git
+#  cd ${_source}
+#  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
+#  msg "GIT checkout done or server timeout"
 
-  if [[ -d ${_source} ]] ; then
-     rm -rf ${_source}
-  fi
-
-  git clone git://git.salome-platform.org/modules/${_source}.git
   cd ${_source}
-  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
 
-  msg "GIT checkout done or server timeout"
-    
   # python -> python2
   for _FILE in `grep -Rl "/usr/bin/env python" * `
   do
@@ -44,20 +46,50 @@ build() {
   source /opt/salome/env.d/salome-geom.sh
   source /opt/salome/env.d/salome-med.sh
 
-  rm -rf "${srcdir}/${_source}/build"
-  mkdir -p "${srcdir}/${_source}/build"
-  cd "${srcdir}/${_source}/build"
-
-  cmake .. \
-     -DCMAKE_INSTALL_PREFIX=$_installdir \
-     -DCMAKE_CXX_STANDARD=98 \
-     -DHDF5_ROOT_DIR=/opt/hdf5-1.8 \
-     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-     -DVTK_DIR="${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}" \
-     -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2 \
-     -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2 \
-     -DSWIG_EXECUTABLE=/usr/bin/swig-2
-
+  cd "${srcdir}/${_source}"
+  rm -rf build
+  mkdir -p build
+  cd build
+  
+  # generic options
+  cmake_options+=" -DCMAKE_BUILD_TYPE=Release"
+  cmake_options+=" -DCMAKE_INSTALL_PREFIX=${_installdir}"
+  cmake_options+=" -DSALOME_BUILD_DOC:BOOL=ON"
+
+  # debug options
+  cmake_options+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF"
+  cmake_options+=" -DSALOME_CMAKE_DEBUG:BOOL=OFF"
+
+  # mpi
+  cmake_options+=" -DSALOME_USE_MPI:BOOL=ON"
+
+  # python2
+  cmake_options+=" -DPYTHON_EXECUTABLE=/usr/bin/python2"
+
+  # sphinx-2
+  cmake_options+=" -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2"
+  cmake_options+=" -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2"
+
+  # swig2
+  cmake_options+=" -DSWIG_EXECUTABLE=/usr/bin/swig-2"
+
+  # vtk
+  cmake_options+=" -DVTK_DIR=${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}"
+
+  # libxml2
+  cmake_options+=" -DLIBXML2_ROOT_DIR=/usr"
+  cmake_options+=" -DLibXml2_DIR=/usr/lib/cmake/libxml2"
+  cmake_options+=" -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2"
+
+  # hdf5-1.8
+  cmake_options+=" -DHDF5_INCLUDE_DIRS:PATH=/usr/include/hdf5_18/"
+  cmake_options+=" -DHDF5_INCLUDE_DIR: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"
+  
+  cmake ${cmake_options} ..
+  
   make
 }
 
@@ -77,10 +109,12 @@ package() {
     optipng -quiet -force -fix ${pkgdir}${_installdir}/${_FILE}
   done
 
-  install -D -m755 "${srcdir}/${pkgname}.profile" \
-                   "${pkgdir}${_installdir}/env.d/${pkgname}.sh"
+  # install profile
+  install -D -m755 "${srcdir}/${pkgname}.sh" \
+                   "${pkgdir}${_profiledir}/${pkgname}.sh"
 
   rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
   rm -f "${pkgdir}${_installdir}/bin/salome/test/CTestTestfile.cmake"
 }
-md5sums=('d339c1021bc8797c7877581b75e5ef23')
+md5sums=('39adab63f05b987bfdd5bbc284ec5f92'
+         '0f6de10ad9d9c646fce3ca21a7dab46a')