diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | salome-gui.profile | 38 | ||||
| -rw-r--r-- | salome-gui.sh | 62 |
4 files changed, 75 insertions, 48 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Nov 22 22:14:47 UTC 2016 +# Sun Dec 11 21:54:34 UTC 2016 pkgbase = salome-gui pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - GUI Module pkgver = 7.8.0 - pkgrel = 1 + pkgrel = 2 url = http://www.salome-platform.org arch = i686 arch = x86_64 @@ -22,12 +22,12 @@ pkgbase = salome-gui depends = qwt depends = paraview-salome=5.0.1p1 depends = sip - source = salome-gui.profile + source = salome-gui.sh source = salome.desktop source = http://files.salome-platform.org/Salome/Salome7.8.0/src7.8.0.tar.gz - md5sums = 73cd7110827ebb24ae6d2fac087fc4e0 + md5sums = fd7abc074e23a95ed3dabe841faa7586 md5sums = a102063b779e332914ef0b73843e928a - md5sums = 0f6de10ad9d9c646fce3ca21a7dab46a + md5sums = 943a8b7e70c2b5fe6ff9257d0eaaeebb pkgname = salome-gui @@ -2,7 +2,7 @@ pkgname=salome-gui pkgver=7.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - GUI Module" url="http://www.salome-platform.org" depends=("salome-kernel>=${pkgver}" 'salome-kernel<7.9.0' 'qt4' 'python2-pyqt4' 'opencascade>=6.9.0' 'qwt' 'paraview-salome=5.0.1p1' 'sip') @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') conflicts=() provides=() license=('LGPL') -source=("${pkgname}.profile" "salome.desktop" "http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz") +source=("${pkgname}.sh" "salome.desktop" "http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz") _source=GUI_SRC #_source=gui @@ -81,6 +81,9 @@ build() { # python2 cmake_options+=" -DPYTHON_EXECUTABLE=/usr/bin/python2" + # mpi + cmake_options+=" -DSALOME_USE_MPI:BOOL=ON" + # qwt cmake_options+=" -DQWT_ROOT_DIR=/usr" @@ -126,7 +129,7 @@ package() { done # install profile - install -D -m755 "${srcdir}/${pkgname}.profile" \ + install -D -m755 "${srcdir}/${pkgname}.sh" \ "${pkgdir}${_profiledir}/${pkgname}.sh" # install menu entry @@ -144,6 +147,6 @@ package() { ln -s ${_installdir}/share/salome/resources/gui/SalomeApp.xml ${pkgdir}${_installdir} ln -s ${_installdir}/share/salome/resources/gui/LightApp.xml ${pkgdir}${_installdir} } -md5sums=('73cd7110827ebb24ae6d2fac087fc4e0' +md5sums=('fd7abc074e23a95ed3dabe841faa7586' 'a102063b779e332914ef0b73843e928a' - '0f6de10ad9d9c646fce3ca21a7dab46a') + '943a8b7e70c2b5fe6ff9257d0eaaeebb') diff --git a/salome-gui.profile b/salome-gui.profile deleted file mode 100644 index 0f2694798010..000000000000 --- a/salome-gui.profile +++ /dev/null @@ -1,38 +0,0 @@ -# module var -export GUI_ROOT_DIR=/opt/salome - -# local vars -_pythonver=2.7 -_paraviewver=5.0 -_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 -if [[ $PYTHONPATH != *${_gui_pythonpath}* ]]; then - export PYTHONPATH=${_gui_pythonpath}:$PYTHONPATH -fi - -# 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 - -# 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 diff --git a/salome-gui.sh b/salome-gui.sh new file mode 100644 index 000000000000..b355155fc137 --- /dev/null +++ b/salome-gui.sh @@ -0,0 +1,62 @@ +# module var +export GUI_ROOT_DIR=/opt/salome + +# vars +_gui_pythonver=2.7 +_gui_paraviewver=5.0 +_gui_path=$GUI_ROOT_DIR/bin/salome +_gui_librarypath=$GUI_ROOT_DIR/lib/salome +_gui_pythonpath=$GUI_ROOT_DIR/lib/python${_gui_pythonver}/site-packages/salome +_gui_pluginpath=$GUI_ROOT_DIR/lib/paraview +_gui_paraview_pythonpath="/usr/lib/paraview-${_gui_paraviewver}/site-packages:/usr/lib/paraview-${_gui_paraviewver}/site-packages/vtk" +_gui_paraview_librarypath="/usr/lib/paraview-${_gui_paraviewver}" + +# PYTHONPATH +if [[ $PYTHONPATH != ${_gui_pythonpath} && $PYTHONPATH != *:${_gui_pythonpath}&& $PYTHONPATH != ${_gui_pythonpath}:* && $PYTHONPATH != *:${_gui_pythonpath}:* ]]; then + if [[ -z "$PYTHONPATH" ]]; then + export PYTHONPATH=${_gui_pythonpath} + else + export PYTHONPATH=${_gui_pythonpath}:$PYTHONPATH + fi +fi +if [[ $PYTHONPATH != ${_gui_paraview_pythonpath} && $PYTHONPATH != *:${_gui_paraview_pythonpath} && $PYTHONPATH != ${_gui_paraview_pythonpath}:* && $PYTHONPATH != *:${_gui_paraview_pythonpath}:* ]]; then + if [[ -z "$PYTHONPATH" ]]; then + export PYTHONPATH=${_gui_paraview_pythonpath} + else + export PYTHONPATH=${_gui_paraview_pythonpath}:$PYTHONPATH + fi +fi + +# LD_LIBRARY_PATH +if [[ $LD_LIBRARY_PATH != ${_gui_librarypath} && $LD_LIBRARY_PATH != *:${_gui_librarypath} && $LD_LIBRARY_PATH != ${_gui_librarypath}:* && $LD_LIBRARY_PATH != *:${_gui_librarypath}:* ]]; then + if [[ -z "$LD_LIBRARY_PATH" ]]; then + export LD_LIBRARY_PATH=${_gui_librarypath} + else + export LD_LIBRARY_PATH=${_gui_librarypath}:$LD_LIBRARY_PATH + fi +fi +if [[ $LD_LIBRARY_PATH != ${_gui_paraview_librarypath} && $LD_LIBRARY_PATH != *:${_gui_paraview_librarypath} && $LD_LIBRARY_PATH != ${_gui_paraview_librarypath}:* && $LD_LIBRARY_PATH != *:${_gui_paraview_librarypath}:* ]]; then + if [[ -z "$LD_LIBRARY_PATH" ]]; then + export LD_LIBRARY_PATH=${_gui_paraview_librarypath} + else + export LD_LIBRARY_PATH=${_gui_paraview_librarypath}:$LD_LIBRARY_PATH + fi +fi + +# PV_PLUGIN_PATH +if [[ $PV_PLUGIN_PATH != ${_gui_pluginpath} && $PV_PLUGIN_PATH != *:${_gui_pluginpath} && $PV_PLUGIN_PATH != ${_gui_pluginpath}:* && $PV_PLUGIN_PATH != *:${_gui_pluginpath}:* ]]; then + if [ -z "$PV_PLUGIN_PATH" ]; then + export PV_PLUGIN_PATH=${_gui_pluginpath} + else + export PV_PLUGIN_PATH=${_gui_pluginpath}:$PV_PLUGIN_PATH + fi +fi + +# PATH +if [[ $PATH != ${_gui_path} && $PATH != *:${_gui_path} && $PATH != ${_gui_path}:* && $PATH != *:${_gui_path}:* ]]; then + if [ -z "$PATH" ]; then + export PATH=${_gui_path} + else + export PATH=${_gui_path}:$PATH + fi +fi |