Updated to compile on archlinux current

3 files changed, 43 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8e5b2ea3b81..9216d763d1c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Fri Jun  3 17:19:00 UTC 2016
 pkgbase = salome-paravis
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - PARAVIS Module
 	pkgver = 7.6.0
@@ -12,7 +14,7 @@ pkgbase = salome-paravis
 	depends = salome-smesh<7.7.0
 	depends = paraview-salome>=4.1.0
 	source = salome-paravis.profile
-	md5sums = c135f9d48f56ccd950de4c0c09221595
+	md5sums = a99b6ba811522906fe4276efdae5839d
 
 pkgname = salome-paravis
 
diff --git a/PKGBUILD b/PKGBUILD
index 7c512a51ffaf..302d619629f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ license=('LGPL')
 source=(salome-paravis.profile)
 
 _source=paravis
-_installdir=/opt/salome/paravis
+_installdir=/opt/salome
 _paraviewrootdir=/usr
 _paraviewver=4.2
 
@@ -39,11 +39,11 @@ prepare() {
 }
 
 build() {
-  source /etc/salome/profile.d/salome-kernel.sh
-  source /etc/salome/profile.d/salome-gui.sh
-  source /etc/salome/profile.d/salome-med.sh
-  source /etc/salome/profile.d/salome-geom.sh
-  source /etc/salome/profile.d/salome-smesh.sh  
+  source /opt/salome/env.d/salome-kernel.sh
+  source /opt/salome/env.d/salome-gui.sh
+  source /opt/salome/env.d/salome-med.sh
+  source /opt/salome/env.d/salome-geom.sh
+  source /opt/salome/env.d/salome-smesh.sh  
 
   cd "${srcdir}/${_source}"
 
@@ -56,6 +56,8 @@ build() {
 
   cmake .. \
      -DCMAKE_INSTALL_PREFIX="${_installdir}" \
+     -DCMAKE_CXX_STANDARD=98 \
+     -DHDF5_ROOT_DIR=/opt/hdf5-1.8 \
      -DMEDFILE_ROOT_DIR=/usr \
      -DPARAVIEW_ROOT_DIR="${_paraviewrootdir}" \
      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
@@ -73,7 +75,17 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
+  rm "${pkgdir}${_installdir}/bin/salome/test/CTestTestfile.cmake"
+  
+  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}/etc/salome/profile.d/${pkgname}.sh"
+                   "${pkgdir}${_installdir}/env.d/${pkgname}.sh"
+
+  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
 }
-md5sums=('c135f9d48f56ccd950de4c0c09221595')
+md5sums=('a99b6ba811522906fe4276efdae5839d')
diff --git a/salome-paravis.profile b/salome-paravis.profile
index 5834b9fa4720..4d87eced54bd 100644
--- a/salome-paravis.profile
+++ b/salome-paravis.profile
@@ -1,23 +1,38 @@
 # module var
-export PARAVIS_ROOT_DIR=/opt/salome/paravis
+export PARAVIS_ROOT_DIR=/opt/salome
 
 # local vars
 _pythonver=2.7
 _paraviewver=4.2
+_paravis_path=$PARAVIS_ROOT_DIR/bin/salome
+_paravis_librarypath=$PARAVIS_ROOT_DIR/lib/salome
+_paravis_pluginpath=$PARAVIS_ROOT_DIR/lib/paraview
+_paravis_pythonpath=$PARAVIS_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 != *${_paravis_pythonpath}* ]]; then
+  export PYTHONPATH=${_paravis_pythonpath}:$PYTHONPATH
+fi
 if [[ $PYTHONPATH != *${_paraview_pythonpath}* ]]; then
   export PYTHONPATH=${_paraview_pythonpath}:$PYTHONPATH
 fi
-export PYTHONPATH=$PYTHONPATH:$PARAVIS_ROOT_DIR/lib/python${_pythonver}/site-packages
 
 # LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != *${_paravis_librarypath}* ]]; then
+  export LD_LIBRARY_PATH=${_paravis_librarypath}:$LD_LIBRARY_PATH
+fi
 if [[ $LD_LIBRARY_PATH != *${_paraview_librarypath}* ]]; then
   export LD_LIBRARY_PATH=${_paraview_librarypath}:$LD_LIBRARY_PATH
 fi
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PARAVIS_ROOT_DIR/lib/salome
 
-# bin
-export PATH=$PARAVIS_ROOT_DIR/bin/salome:$PATH
\ No newline at end of file
+# PV_PLUGIN_PATH
+if [[ $PV_PLUGIN_PATH != *${_paravis_pluginpath}* ]]; then
+  export PV_PLUGIN_PATH=${_paravis_pluginpath}:$PV_PLUGIN_PATH
+fi
+
+# PATH
+if [[ $PATH != *${_paravis_path}* ]]; then
+  export PATH=${_paravis_path}:$PATH
+fi