Updated to current

4 files changed, 57 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58c805a03803..49ac2be28390 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jun  3 17:08:54 UTC 2016
 pkgbase = salome-gui
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - GUI Module
 	pkgver = 7.6.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.salome-platform.org
 	arch = i686
 	arch = x86_64
@@ -22,10 +24,8 @@ pkgbase = salome-gui
 	depends = sip
 	source = salome-gui.profile
 	source = salome.desktop
-	source = salome
-	md5sums = 26d2dead4610fe2653f9f9cdf72d33d0
+	md5sums = 0e0fe54828a8a191a8424355ac138946
 	md5sums = a102063b779e332914ef0b73843e928a
-	md5sums = c47b2bb9e51120089bd3169c2298abf3
 
 pkgname = salome-gui
 
diff --git a/PKGBUILD b/PKGBUILD
index 09214f99479c..4e694192b782 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=salome-gui
 pkgver=7.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - GUI Module"
 url="http://www.salome-platform.org"
 depends=('salome-kernel>=7.6.0' 'salome-kernel<7.7.0' 'qt4' 'python2-pyqt4' 'opencascade>=6.9.0' 'qwt' 'paraview-salome=4.2.0' 'sip')
@@ -11,10 +11,12 @@ arch=('i686' 'x86_64')
 conflicts=()
 provides=()
 license=('LGPL')
-source=("${pkgname}.profile" "salome.desktop" "salome")
+source=("${pkgname}.profile" "salome.desktop")
 
 _source=gui
-_installdir=/opt/salome/gui
+_basedir=/opt/salome
+_installdir=${_basedir}
+_profiledir=${_basedir}/env.d
 _paraviewrootdir=/usr
 _paraviewver=4.2
 
@@ -59,12 +61,16 @@ prepare(){
 }
 
 build() {
-  source /etc/salome/profile.d/salome-kernel.sh
+  source "${_profiledir}/salome-kernel.sh"
 
   cd "$srcdir/$_source"
 
+  #   -DCMAKE_BUILD_TYPE=Debug \
+
   cmake . \
      -DCMAKE_INSTALL_PREFIX=${_installdir} \
+     -DCMAKE_CXX_STANDARD=98 \
+     -DHDF5_ROOT_DIR=/opt/hdf5-1.8 \
      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
      -DOPENGL_ROOT_DIR=/usr \
      -DQWT_ROOT_DIR=/usr \
@@ -84,8 +90,15 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
+  for _FILE in `find -L ${pkgdir}${_installdir} -iname *.py`
+  do
+    sed -i -e "s|${srcdir}||" ${_FILE}
+    sed -i -e "s|${pkgdir}||" ${_FILE}
+  done
+
   # install profile
-  install -D -m755 "${srcdir}/${pkgname}.profile" "${pkgdir}/etc/salome/profile.d/${pkgname}.sh"
+  install -D -m755 "${srcdir}/${pkgname}.profile" \
+                   "${pkgdir}${_profiledir}/${pkgname}.sh"
 
   # install menu entry
   install -D -m 644 "${srcdir}/${_source}/src/LightApp/resources/icon_applogo.png" "${pkgdir}/usr/share/pixmaps/salome.png"
@@ -96,11 +109,11 @@ package() {
     optipng -quiet -force -fix ${pkgdir}${_installdir}${_FILE}
   done
 
-  install -D -m755 "${srcdir}/salome" \
-                   "${pkgdir}/usr/bin/salome"
-
   sed -e "s|GEOM,SMESH,HEXABLOCK,MED,YACS,PARAVIS|GEOM,SMESH,HEXABLOCK,MED,YACS,PARAVIS,EFICAS,ASTER|" -i ${pkgdir}${_installdir}/share/salome/resources/gui/SalomeApp.xml
+
+  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
+  ln -s ${_installdir}/share/salome/resources/gui/SalomeApp.xml ${pkgdir}${_installdir}
+  ln -s ${_installdir}/share/salome/resources/gui/LightApp.xml ${pkgdir}${_installdir}
 }
-md5sums=('26d2dead4610fe2653f9f9cdf72d33d0'
-         'a102063b779e332914ef0b73843e928a'
-         'c47b2bb9e51120089bd3169c2298abf3')
+md5sums=('0e0fe54828a8a191a8424355ac138946'
+         'a102063b779e332914ef0b73843e928a')
diff --git a/salome b/salome
deleted file mode 100755
index d089c54a981b..000000000000
--- a/salome
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-for _FILE in `ls /etc/salome/profile.d/salome-*.sh`
-do
-    source ${_FILE}
-done
-
-/opt/salome/kernel/bin/salome/runSalome
diff --git a/salome-gui.profile b/salome-gui.profile
index 25e21dfe2619..13912e6981e7 100644
--- a/salome-gui.profile
+++ b/salome-gui.profile
@@ -1,15 +1,38 @@
-export GUI_ROOT_DIR=/opt/salome/gui
+# module var
+export GUI_ROOT_DIR=/opt/salome
 
-_paraview_pythonpath="/usr/lib/paraview-4.2/site-packages/:/usr/lib/paraview-4.1/site-packages/vtk"
+# local vars
+_pythonver=2.7
+_paraviewver=4.2
+_gui_path=$GUI_ROOT_DIR/bin/salome
+_gui_librarypath=$GUI_ROOT_DIR/lib/salome
+_gui_pythonpath=$GUI_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
+_gui_pluginpath=$GUI_ROOT_DIR/lib/paraview
+_paraview_pythonpath="/usr/lib/paraview-${_paraviewver}/site-packages/:/usr/lib/paraview-${_paraviewver}/site-packages/vtk"
+_paraview_librarypath="/usr/lib/paraview-${_paraviewver}"
+
+# PYTHONPATH
 if [[ $PYTHONPATH != *${_paraview_pythonpath}* ]]; then
   export PYTHONPATH=${_paraview_pythonpath}:$PYTHONPATH
 fi
-export PYTHONPATH=$GUI_ROOT_DIR/lib/python2.7/site-packages/salome:$PYTHONPATH
+if [[ $PYTHONPATH != *${_gui_pythonpath}* ]]; then
+  export PYTHONPATH=${_gui_pythonpath}:$PYTHONPATH
+fi
 
-_paraview_librarypath="/usr/lib/paraview-4.2"
+# LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != *${_gui_librarypath}* ]]; then
+  export LD_LIBRARY_PATH=${_gui_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=$GUI_ROOT_DIR/lib/salome:$LD_LIBRARY_PATH
 
-export PATH=$GUI_ROOT_DIR/bin/salome:$PATH
\ No newline at end of file
+# PV_PLUGIN_PATH
+if [[ $PV_PLUGIN_PATH != *${_gui_pluginpath}* ]]; then
+  export PV_PLUGIN_PATH=${_gui_pluginpath}:$PV_PLUGIN_PATH
+fi
+
+# PATH
+if [[ $PATH != *${_gui_path}* ]]; then
+  export PATH=${_gui_path}:$PATH
+fi