Update to version 7.8.0

4 files changed, 114 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 835a3bf4c7d1..d12a0924dd6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
 # Generated by mksrcinfo v8
-# Fri Jun  3 17:26:47 UTC 2016
+# Tue Dec 20 13:47:59 UTC 2016
 pkgbase = salome-netgenplugin
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - NETGEN plugin
-	pkgver = 7.6.0
-	pkgrel = 2
+	pkgver = 7.8.0
+	pkgrel = 1
 	url = http://www.salome-platform.org
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	depends = salome-smesh>=7.6.0
-	depends = salome-smesh<7.7.0
+	depends = salome-smesh>=7.8.0
+	depends = salome-smesh<7.9.0
+	source = http://files.salome-platform.org/Salome/Salome7.8.0/src7.8.0.tar.gz
 	source = http://downloads.sourceforge.net/netgen-mesher/netgen-4.9.13.tar.gz
 	source = netgen-4.9.13-for-SALOME.patch
 	source = netgen-4.9.13-for-CMake.patch
-	source = salome-netgenplugin.profile
+	source = salome-netgenplugin.sh
+	md5sums = 0f6de10ad9d9c646fce3ca21a7dab46a
 	md5sums = 2d56642ca673106837bcd08ff9913d57
 	md5sums = b19f13b42651b992359eaf0ad4ae346b
 	md5sums = 4ae279ab4558b1719fe1d8d65a1ed1a1
-	md5sums = f938a65ecc17a9586afee6f214743f23
+	md5sums = 9fedc7465dc5853a24b07482c9bc166b
 
 pkgname = salome-netgenplugin
 
diff --git a/PKGBUILD b/PKGBUILD
index b84c61ad2b8d..ae78ef05e0de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,27 @@
 # Maintainer: Michele Mocciola <mickele>
 
 pkgname=salome-netgenplugin
-pkgver=7.6.0
+pkgver=7.8.0
 _netgenver=4.9.13
-pkgrel=2
+pkgrel=1
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - NETGEN plugin"
 url="http://www.salome-platform.org"
-depends=('salome-smesh>=7.6.0' 'salome-smesh<7.7.0')
+depends=("salome-smesh>=${pkgver}" "salome-smesh<${pkgver:0:2}$((${pkgver:2:1}+1)).0")
 arch=('i686' 'x86_64')
 license=('LGPL')
-source=("http://downloads.sourceforge.net/netgen-mesher/netgen-${_netgenver}.tar.gz" "netgen-4.9.13-for-SALOME.patch" "netgen-4.9.13-for-CMake.patch" "salome-netgenplugin.profile")
+source=("http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz" "http://downloads.sourceforge.net/netgen-mesher/netgen-${_netgenver}.tar.gz" "netgen-4.9.13-for-SALOME.patch" "netgen-4.9.13-for-CMake.patch" "${pkgname}.sh")
 options=()
 
-_source=netgenplugin
+# _source=netgenplugin
+_source=NETGENPLUGIN_SRC
 _basedir=/opt/salome
 _installdir=${_basedir}
 _profiledir=${_basedir}/env.d
 _paraviewrootdir=/usr
-_paraviewver=4.2
+_paraviewver=5.0
 
 prepare(){
-  cd "netgen-${_netgenver}"
+  cd "${srcdir}/netgen-${_netgenver}"
   patch -Np1 -i "${srcdir}/netgen-4.9.13-for-SALOME.patch"
   patch -Np1 -i "${srcdir}/netgen-4.9.13-for-CMake.patch"
   chmod u+x ./build_cmake
@@ -28,15 +29,17 @@ prepare(){
   sed -e "s|-avoid-version||" -i nglib/Makefile.am
   sed -e "s|-avoid-version||" -i nglib/Makefile.in
 
-  cd "${srcdir}"
-  msg "Connecting to git server..."
-  if [[ -d ${_source} ]] ; then
-     rm -rf ${_source}
-  fi
-  git clone git://git.salome-platform.org/plugins/${_source}.git
-  cd ${_source}
-  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
-  msg "GIT checkout done or server timeout"
+#  cd "${srcdir}"
+#  msg "Connecting to git server..."
+#  if [[ -d ${_source} ]] ; then
+#     rm -rf ${_source}
+#  fi
+#  git clone git://git.salome-platform.org/plugins/${_source}.git
+#  cd ${_source}
+#  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
+#  msg "GIT checkout done or server timeout"
+
+  cd ${srcdir}/${_source}
 
   # python -> python2
   for _FILE in `grep -Rl "/usr/bin/env python" * `
@@ -63,6 +66,7 @@ build() {
   cmake -DCMAKE_INSTALL_PREFIX=${_installdir} \
         -DCASROOT=/opt/opencascade
   make
+  # temporary install of netgen
   make DESTDIR="${srcdir}" install
 
   rm -rf "${srcdir}/${_source}/build"
@@ -72,14 +76,32 @@ build() {
   source ${_profiledir}/salome-gui.sh
   source ${_profiledir}/salome-geom.sh
   source ${_profiledir}/salome-smesh.sh
-  cmake .. \
-     -DCMAKE_INSTALL_PREFIX=${_installdir} \
-     -DCMAKE_CXX_STANDARD=98 \
-     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-     -DSWIG_EXECUTABLE=/usr/bin/swig-2 \
-     -DVTK_DIR="${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}" \
-     -DCAS_ROOT_DIR=/opt/opencascade \
-     -DNETGEN_ROOT_DIR="${srcdir}${_installdir}"
+
+  # generic options
+  cmake_options+=" -DCMAKE_BUILD_TYPE=Release"
+  cmake_options+=" -DCMAKE_INSTALL_PREFIX=${_installdir}"
+  cmake_options+=" -DCMAKE_CXX_STANDARD=98"
+
+  # debug options
+  cmake_options+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF"
+  cmake_options+=" -DSALOME_CMAKE_DEBUG:BOOL=OFF"
+
+  # python2
+  cmake_options+=" -DPYTHON_EXECUTABLE=/usr/bin/python2"
+
+  # mpi
+  cmake_options+=" -DSALOME_USE_MPI:BOOL=ON"
+
+  # VTK
+  cmake_options+=" -DVTK_DIR=${_paraviewrootdir}/lib/cmake/paraview-${_paraviewver}"
+
+  # swig
+  cmake_options+=" -DSWIG_EXECUTABLE=/usr/bin/swig-2"
+
+  # link to local copy og netgen
+  cmake_options+=" -DNETGEN_ROOT_DIR=${srcdir}${_installdir}"
+
+  cmake ${cmake_options} ..
 
   make
 }
@@ -107,10 +129,15 @@ package() {
     optipng -quiet -force -fix ${pkgdir}${_installdir}${_FILE}
   done
 
-  install -D -m755 "${srcdir}/${pkgname}.profile" \
-                   "${pkgdir}${_profiledir}/$pkgname.sh"
+  # install profile
+  install -D -m755 "${srcdir}/${pkgname}.sh" \
+                   "${pkgdir}${_profiledir}/${pkgname}.sh"
+
+  # remove conflicting file
+  rm -f ${pkgdir}${_installdir}/bin/salome/VERSION
 }
-md5sums=('2d56642ca673106837bcd08ff9913d57'
+md5sums=('0f6de10ad9d9c646fce3ca21a7dab46a'
+         '2d56642ca673106837bcd08ff9913d57'
          'b19f13b42651b992359eaf0ad4ae346b'
          '4ae279ab4558b1719fe1d8d65a1ed1a1'
-         'f938a65ecc17a9586afee6f214743f23')
+         '9fedc7465dc5853a24b07482c9bc166b')
diff --git a/salome-netgenplugin.profile b/salome-netgenplugin.profile
deleted file mode 100644
index 911e653bb32e..000000000000
--- a/salome-netgenplugin.profile
+++ /dev/null
@@ -1,30 +0,0 @@
-export NETGEN_ROOT_DIR=/opt/salome
-export NETGENPLUGIN_ROOT_DIR=/opt/salome
-
-_pythonver=2.7
-_netgen_path=$NETGEN_ROOT_DIR/bin/salome
-_netgenplugin_path=$NETGENPLUGIN_ROOT_DIR/bin/salome
-_netgen_librarypath=$NETGEN_ROOT_DIR/lib
-_netgenplugin_librarypath=$NETGENPLUGIN_ROOT_DIR/lib/salome
-_netgenplugin_pythonpath=$NETGENPLUGIN_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
-
-# PYTHONPATH
-if [[ $PYTHONPATH != *${_netgenplugin_pythonpath}* ]]; then
-  export PYTHONPATH=${_netgenplugin_pythonpath}:$PYTHONPATH
-fi
-
-# LD_LIBRARY_PATH
-if [[ $LD_LIBRARY_PATH != *${_netgen_librarypath}* ]]; then
-  export LD_LIBRARY_PATH=${_netgen_librarypath}:$LD_LIBRARY_PATH
-fi
-if [[ $LD_LIBRARY_PATH != *${_netgenplugin_librarypath}* ]]; then
-  export LD_LIBRARY_PATH=${_netgenplugin_librarypath}:$LD_LIBRARY_PATH
-fi
-
-# PATH
-if [[ $PATH != *${_netgen_path}* ]]; then
-  export PATH=${_netgen_path}:$PATH
-fi
-if [[ $PATH != *${_netgenplugin_path}* ]]; then
-  export PATH=${_netgenplugin_path}:$PATH
-fi
diff --git a/salome-netgenplugin.sh b/salome-netgenplugin.sh
new file mode 100644
index 000000000000..2460d427ce03
--- /dev/null
+++ b/salome-netgenplugin.sh
@@ -0,0 +1,50 @@
+export NETGEN_ROOT_DIR=/opt/salome
+export NETGENPLUGIN_ROOT_DIR=/opt/salome
+
+_netgenplugin_pythonver=2.7
+_netgen_path=$NETGEN_ROOT_DIR/bin/salome
+_netgenplugin_path=$NETGENPLUGIN_ROOT_DIR/bin/salome
+_netgen_librarypath=$NETGEN_ROOT_DIR/lib
+_netgenplugin_librarypath=$NETGENPLUGIN_ROOT_DIR/lib/salome
+_netgenplugin_pythonpath=$NETGENPLUGIN_ROOT_DIR/lib/python${_netgenplugin_pythonver}/site-packages/salome
+
+# PYTHONPATH
+if [[ $PYTHONPATH != ${_netgenplugin_pythonpath} && $PYTHONPATH != *:${_netgenplugin_pythonpath}&& $PYTHONPATH != ${_netgenplugin_pythonpath}:* && $PYTHONPATH != *:${_netgenplugin_pythonpath}:* ]]; then
+    if [[ -z "$PYTHONPATH" ]]; then
+	export PYTHONPATH=${_netgenplugin_pythonpath}
+    else
+	export PYTHONPATH=${_netgenplugin_pythonpath}:$PYTHONPATH
+    fi
+fi
+
+# LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != ${_netgenplugin_librarypath} && $LD_LIBRARY_PATH != *:${_netgenplugin_librarypath} && $LD_LIBRARY_PATH != ${_netgenplugin_librarypath}:* && $LD_LIBRARY_PATH != *:${_netgenplugin_librarypath}:* ]]; then
+    if [[ -z "$LD_LIBRARY_PATH" ]]; then
+	export LD_LIBRARY_PATH=${_netgenplugin_librarypath}
+    else
+	export LD_LIBRARY_PATH=${_netgenplugin_librarypath}:$LD_LIBRARY_PATH
+    fi
+fi
+if [[ $LD_LIBRARY_PATH != ${_netgen_librarypath} && $LD_LIBRARY_PATH != *:${_netgen_librarypath} && $LD_LIBRARY_PATH != ${_netgen_librarypath}:* && $LD_LIBRARY_PATH != *:${_netgen_librarypath}:* ]]; then
+    if [[ -z "$LD_LIBRARY_PATH" ]]; then
+	export LD_LIBRARY_PATH=${_netgen_librarypath}
+    else
+	export LD_LIBRARY_PATH=${_netgen_librarypath}:$LD_LIBRARY_PATH
+    fi
+fi
+
+# PATH
+if [[ $PATH != ${_netgenplugin_path} && $PATH != *:${_netgenplugin_path} && $PATH != ${_netgenplugin_path}:* && $PATH != *:${_netgenplugin_path}:* ]]; then
+    if [ -z "$PATH" ]; then
+	export PATH=${_netgenplugin_path}
+    else
+	export PATH=${_netgenplugin_path}:$PATH
+    fi
+fi
+if [[ $PATH != ${_netgen_path} && $PATH != *:${_netgen_path} && $PATH != ${_netgen_path}:* && $PATH != *:${_netgen_path}:* ]]; then
+    if [ -z "$PATH" ]; then
+	export PATH=${_netgen_path}
+    else
+	export PATH=${_netgen_path}:$PATH
+    fi
+fi