Removed unneded patch

5 files changed, 116 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea36b373690d..82c9ac171a30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jun  3 17:16:03 UTC 2016
+# Tue Dec 20 06:18:53 UTC 2016
 pkgbase = salome-med
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - MED Module
-	pkgver = 7.6.0
-	pkgrel = 3
+	pkgver = 7.8.0
+	pkgrel = 1
 	url = http://www.salome-platform.org
 	arch = i686
 	arch = x86_64
@@ -12,15 +12,14 @@ pkgbase = salome-med
 	makedepends = boost
 	makedepends = swig2
 	makedepends = python2-sphinx
-	depends = scotch>=6.0.3
-	depends = metis4
-	depends = salome-gui>=7.6.0
-	depends = salome-gui<7.7.0
-	depends = med>=3.0.8
-	source = scotch-bz2.diff
-	source = salome-med.profile
-	md5sums = b7887dda20d38ae64a33547b3d5a1d16
-	md5sums = a261aca89bcad856b3e341d0b58d1398
+	depends = salome-gui>=7.8.0
+	depends = salome-gui<7.9.0
+	depends = salome-medcoupling>=7.8.0
+	depends = salome-medcoupling<7.9.0
+	source = salome-med.sh
+	source = http://files.salome-platform.org/Salome/Salome7.8.0/src7.8.0.tar.gz
+	md5sums = 1757431158da006ae8d853289fbd1b15
+	md5sums = 0f6de10ad9d9c646fce3ca21a7dab46a
 
 pkgname = salome-med
 
diff --git a/PKGBUILD b/PKGBUILD
index 0cc77ce006eb..e0068e9c0921 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,37 @@
 # Maintainer: Michele Mocciola <mickele>
 
 pkgname=salome-med
-pkgver=7.6.0
-pkgrel=3
+pkgver=7.8.0
+pkgrel=1
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - MED Module"
 url="http://www.salome-platform.org"
-depends=('scotch>=6.0.3' 'metis4' 'salome-gui>=7.6.0' 'salome-gui<7.7.0')
-if test "$CARCH" == x86_64; then
-  depends+=('med-salome>=3.0.8')
-else
-  depends+=('med>=3.0.8')
-fi
+depends=("salome-gui>=${pkgver}" "salome-gui<${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')
 arch=('i686' 'x86_64')
 license=('LGPL')
-source=(scotch-bz2.diff salome-med.profile)
+source=("${pkgname}.sh" "http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz")
+OPTIONS+=(debug !strip)
 
-_source=med
-_installdir=/opt/salome
+_source=MED_SRC
+# _source=med
+_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"
 
-  # scotch-6 requires bz2
-  patch -Np1 -i ../scotch-bz2.diff
-  
   # python -> python2
   for _FILE in `grep -Rl "/usr/bin/env python" * `
   do
@@ -47,33 +42,40 @@ prepare() {
 build() {
   source /opt/salome/env.d/salome-kernel.sh
   source /opt/salome/env.d/salome-gui.sh
+  source /opt/salome/env.d/salome-medcoupling.sh
 
   rm -rf "${srcdir}/${_source}/build"
   mkdir "${srcdir}/${_source}/build"
   cd "${srcdir}/${_source}/build"
 
-  #   -DSALOME_CMAKE_DEBUG=ON
-  #   -DSCOTCH_INCLUDE_DIRS=/usr/include/scotch \
-  #   -DSCOTCH_LIBRARIES=/usr/lib/libscotch.so \
-  #   -DSCOTCH_ERR_LIBRARIES=/usr/lib/libscotcherr.so \
-  #   -DBZ2_LIBRARIES=/usr/lib/libbz2.so \
-
-  cmake .. \
-     -DCMAKE_INSTALL_PREFIX=$_installdir \
-     -DCMAKE_CXX_STANDARD=98 \
-     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-     -DSALOME_MED_PARTITIONER_METIS=On \
-     -DMETIS_INCLUDE_DIRS=/usr/include/metis-4 \
-     -DMETIS_LIBRARIES=/usr/lib/libmetis-4.so \
-     -DSALOME_MED_PARTITIONER_PARMETIS=Off \
-     -DSALOME_MED_PARTITIONER_SCOTCH=On \
-     -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2 \
-     -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2 \
-     -DVTK_DIR="${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}" \
-     -DLIBXML2_ROOT_DIR=/usr \
-     -DLibXml2_DIR=/usr/lib/cmake/libxml2 \
-     -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
-     -DSWIG_EXECUTABLE=/usr/bin/swig-2
+  local cmake_options=""
+
+  # generic options
+  # cmake_options+=" -DCMAKE_BUILD_TYPE=Release"
+  cmake_options+=" -DCMAKE_BUILD_TYPE=Debug"
+  cmake_options+=" -DCMAKE_INSTALL_PREFIX=${_installdir}"
+
+  # debug options
+  cmake_options+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
+  cmake_options+=" -DSALOME_CMAKE_DEBUG:BOOL=ON"
+
+  # 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}"
+  
+  cmake ${cmake_options} ..
 
   make
 }
@@ -85,16 +87,14 @@ package() {
   
   for _FILE in `find -L ${pkgdir}${_installdir} -iname *.py`
   do
-    sed -i -e "s|${srcdir}||" ${_FILE}
     sed -i -e "s|${pkgdir}||" ${_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"
   rm -f "${pkgdir}${_installdir}/adm_local/unix/config_files/check_GUI.m4"
 }
-md5sums=('b7887dda20d38ae64a33547b3d5a1d16'
-         'a261aca89bcad856b3e341d0b58d1398')
+md5sums=('1757431158da006ae8d853289fbd1b15'
+         '0f6de10ad9d9c646fce3ca21a7dab46a')
diff --git a/salome-med.profile b/salome-med.profile
deleted file mode 100644
index 2e4363dc5e68..000000000000
--- a/salome-med.profile
+++ /dev/null
@@ -1,32 +0,0 @@
-# module var
-export MED_ROOT_DIR=/opt/salome
-
-# local vars
-_pythonver=2.7
-_paraviewver=4.2
-_med_path=$MED_ROOT_DIR/bin/salome
-_med_librarypath=$MED_ROOT_DIR/lib/salome
-_med_pythonpath=$MED_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
-_paraview_pythonpath="/usr/lib/paraview-${_paraviewver}/site-packages/:/usr/lib/paraview-${_paraviewver}/site-packages/vtk"
-_paraview_librarypath="/usr/lib/paraview-${_paraviewver}"
-
-# PYTHONPATH
-if [[ $PYTHONPATH != *${_med_pythonpath}* ]]; then
-  export PYTHONPATH=${_med_pythonpath}:$PYTHONPATH
-fi
-if [[ $PYTHONPATH != *${_paraview_pythonpath}* ]]; then
-  export PYTHONPATH=${_paraview_pythonpath}:$PYTHONPATH
-fi
-
-# LD_LIBRARY_PATH
-if [[ $LD_LIBRARY_PATH != *${_med_librarypath}* ]]; then
-  export LD_LIBRARY_PATH=${_med_librarypath}:$LD_LIBRARY_PATH
-fi
-if [[ $LD_LIBRARY_PATH != *${_paraview_librarypath}* ]]; then
-  export LD_LIBRARY_PATH=${_paraview_librarypath}:$LD_LIBRARY_PATH
-fi
-
-# PATH
-if [[ $PATH != *${_med_path}* ]]; then
-  export PATH=${_med_path}:$PATH
-fi
diff --git a/salome-med.sh b/salome-med.sh
new file mode 100644
index 000000000000..de9d54c2172f
--- /dev/null
+++ b/salome-med.sh
@@ -0,0 +1,52 @@
+# module var
+export MED_ROOT_DIR=/opt/salome
+
+# local vars
+_med_pythonver=2.7
+_med_paraviewver=5.0
+_med_path=$MED_ROOT_DIR/bin/salome
+_med_librarypath=$MED_ROOT_DIR/lib/salome
+_med_pythonpath=$MED_ROOT_DIR/lib/python${_med_pythonver}/site-packages/salome
+_med_paraview_pythonpath="/usr/lib/paraview-${_med_paraviewver}/site-packages/:/usr/lib/paraview-${_med_paraviewver}/site-packages/vtk"
+_med_paraview_librarypath="/usr/lib/paraview-${_med_paraviewver}"
+
+# PYTHONPATH
+if [[ $PYTHONPATH != ${_med_pythonpath} && $PYTHONPATH != *:${_med_pythonpath} && $PYTHONPATH != ${_med_pythonpath}:* && $PYTHONPATH != *:${_med_pythonpath}:* ]]; then
+    if [[ -z "$PYTHONPATH" ]]; then
+	export PYTHONPATH=${_med_pythonpath}
+    else
+	export PYTHONPATH=${_med_pythonpath}:$PYTHONPATH
+    fi
+fi
+if [[ $PYTHONPATH != ${_med_paraview_pythonpath} && $PYTHONPATH != *:${_med_paraview_pythonpath} && $PYTHONPATH != ${_med_paraview_pythonpath}:* && $PYTHONPATH != *:${_med_paraview_pythonpath}:* ]]; then
+    if [[ -z "$PYTHONPATH" ]]; then
+	export PYTHONPATH=${_med_paraview_pythonpath}
+    else
+	export PYTHONPATH=${_med_paraview_pythonpath}:$PYTHONPATH
+    fi
+fi
+
+# LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != ${_med_librarypath} && $LD_LIBRARY_PATH != *:${_med_librarypath} && $LD_LIBRARY_PATH != ${_med_librarypath}:* && $LD_LIBRARY_PATH != *:${_med_librarypath}:* ]]; then
+    if [[ -z "$LD_LIBRARY_PATH" ]]; then
+	export LD_LIBRARY_PATH=${_med_librarypath}
+    else
+	export LD_LIBRARY_PATH=${_med_librarypath}:$LD_LIBRARY_PATH
+    fi
+fi
+if [[ $LD_LIBRARY_PATH != ${_med_paraview_librarypath} && $LD_LIBRARY_PATH != *:${_med_paraview_librarypath} && $LD_LIBRARY_PATH != ${_med_paraview_librarypath}:* && $LD_LIBRARY_PATH != *:${_med_paraview_librarypath}:* ]]; then
+    if [[ -z "$LD_LIBRARY_PATH" ]]; then
+	export LD_LIBRARY_PATH=${_med_paraview_librarypath}
+    else
+	export LD_LIBRARY_PATH=${_med_paraview_librarypath}:$LD_LIBRARY_PATH
+    fi
+fi
+
+# PATH
+if [[ $PATH != ${_med_path} && $PATH != *:${_med_path} && $PATH != ${_med_path}:* && $PATH != *:${_med_path}:* ]]; then
+    if [[ -z "$PATH" ]]; then
+	export PATH=${_med_path}
+    else
+	export PATH=${_med_path}:$PATH
+    fi
+fi
diff --git a/scotch-bz2.diff b/scotch-bz2.diff
deleted file mode 100644
index 4e726a4f316e..000000000000
--- a/scotch-bz2.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur MED_SRC_7.4.0.orig/adm_local/cmake_files/FindScotch.cmake MED_SRC_7.4.0/adm_local/cmake_files/FindScotch.cmake
---- MED_SRC_7.4.0.orig/adm_local/cmake_files/FindScotch.cmake	2015-02-27 19:22:28.242443238 +0100
-+++ MED_SRC_7.4.0/adm_local/cmake_files/FindScotch.cmake	2015-02-27 20:50:38.817115068 +0100
-@@ -28,7 +28,8 @@
- 
- FIND_LIBRARY(SCOTCH_LIBRARIES scotch)
- FIND_LIBRARY(SCOTCH_ERR_LIBRARIES scotcherr)
--SET(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${SCOTCH_ERR_LIBRARIES})
-+FIND_LIBRARY(BZ2_LIBRARIES bz2)
-+SET(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZ2_LIBRARIES} ${SCOTCH_ERR_LIBRARIES})
- FIND_PATH(SCOTCH_INCLUDE_DIRS scotch.h PATH_SUFFIXES "/scotch")
- 
- INCLUDE(FindPackageHandleStandardArgs)