Modified to compile with current

3 files changed, 82 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 337bc7ccc62e..331e6c922dce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jun  3 17:06:42 UTC 2016
 pkgbase = salome-kernel
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - KERNEL Module
 	pkgver = 7.6.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.salome-platform.org
 	arch = i686
 	arch = x86_64
@@ -16,13 +18,15 @@ pkgbase = salome-kernel
 	depends = omniorb416
 	depends = omniorbpy36
 	depends = omninotify-omniorb416
-	depends = hdf5
+	depends = hdf5-1.8
 	depends = graphviz
 	depends = libxml2
 	depends = cppunit
 	depends = lapack
+	depends = net-tools
+	depends = openmpi
 	source = salome-kernel.profile
-	md5sums = 0190508dd75e07f6b8f6230660477c11
+	md5sums = caa0cf581852ab625fff04a9f0100f5b
 
 pkgname = salome-kernel
 
diff --git a/PKGBUILD b/PKGBUILD
index 2345e2d7adde..abab345b382a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,23 @@
 
 pkgname=salome-kernel
 pkgver=7.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - KERNEL Module"
 url="http://www.salome-platform.org"
-depends=('python2' 'python2-numpy' 'boost-libs' 'omniorb416' 'omniorbpy36' 'omninotify-omniorb416' 'hdf5' 'graphviz' 'libxml2' 'cppunit' 'lapack')
+depends=('python2' 'python2-numpy' 'boost-libs' 'omniorb416' 'omniorbpy36' 'omninotify-omniorb416' 'hdf5-1.8' 'graphviz' 'libxml2' 'cppunit' 'lapack' 'net-tools' 'openmpi')
 makedepends=('doxygen' 'python2-sphinx' 'git' 'swig2')
 arch=('i686' 'x86_64')
 license=('LGPL')
-source=(salome-kernel.profile)
+source=("salome-kernel.profile")
+# options=(debug !strip)
 
 # "http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz"
 #_source=KERNEL_SRC_${pkgver}
 
 _source=kernel
-_installdir=/opt/salome/kernel
+_basedir=/opt/salome
+_installdir=${_basedir}
+_profiledir=${_basedir}/env.d
 
 prepare() {
   msg "Connecting to git server..."
@@ -65,8 +68,17 @@ build() {
   mkdir -p "$srcdir/$_source/build"
   cd "$srcdir/$_source/build"
 
+  # -DCMAKE_BUILD_TYPE=Debug \
+  # -DCMAKE_VERBOSE_MAKEFILE=On \
+  # -DSALOME_CMAKE_DEBUG=On
+
   cmake .. \
      -DCMAKE_INSTALL_PREFIX=${_installdir} \
+     -DCMAKE_CXX_STANDARD=98 \
+     -DSALOME_USE_MPI=On \
+     -DSALOME_USE_LIBBATCH=On \
+     -DMPI_ROOT_DIR=/usr \
+     -DHDF5_ROOT_DIR=/opt/hdf5-1.8 \
      -DPYTHON_EXECUTABLE=/usr/bin/python2 \
      -DPTHREAD_ROOT_DIR=/usr \
      -DBOOST_ROOT_DIR=/usr \
@@ -88,9 +100,41 @@ build() {
 package() {
   cd "${srcdir}/${_source}/build"
 
-  make DESTDIR="$pkgdir" install
+  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
+  for _FILE in `find -L ${pkgdir}${_installdir}/bin/salome/test/ -iname "*.cmake"`
+  do
+    msg ${_FILE}
+    sed -i -e "s| python | python2 |" ${_FILE}
+  done
+
+  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
+
+  for _FILE in {"salome","envd","runConsole","runRemote.sh","runSalomeScript","runSession"}
+  do
+    ln -s "${_installdir}/bin/salome/appliskel/${_FILE}" "${pkgdir}${_installdir}"
+  done
+
+  for _FILE in {"getApplyPath","update_catalogs","kill_remote_containers"}
+  do
+    ln -s ${_installdir}/bin/salome/appliskel/${_FILE}.py "${pkgdir}${_installdir}"
+    ln -s ${_installdir}/bin/salome/appliskel/${_FILE}.pyc "${pkgdir}${_installdir}"
+    ln -s ${_installdir}/bin/salome/appliskel/${_FILE}.pyo "${pkgdir}${_installdir}"
+  done
+
+  ln -s /tmp "${pkgdir}${_installdir}/USERS"
+
+  # install profile
+  install -D -m755 "${srcdir}/${pkgname}.profile" \
+                   "${pkgdir}${_profiledir}/${pkgname}.sh"
 
-  install -D -m755 "$srcdir/$pkgname.profile" \
-                   "$pkgdir/etc/salome/profile.d/$pkgname.sh"
+  # install link to launcher in /usr/bin
+  install -d -m755 "${pkgdir}/usr/bin"
+  ln -s "${_installdir}/salome" "${pkgdir}/usr/bin/salome"
 }
-md5sums=('0190508dd75e07f6b8f6230660477c11')
+md5sums=('caa0cf581852ab625fff04a9f0100f5b')
diff --git a/salome-kernel.profile b/salome-kernel.profile
index 5065bf894402..4397a6042bdb 100644
--- a/salome-kernel.profile
+++ b/salome-kernel.profile
@@ -1,7 +1,26 @@
-export KERNEL_ROOT_DIR=/opt/salome/kernel
+# module var
+export KERNEL_ROOT_DIR=/opt/salome
 
-export PYTHONPATH=$KERNEL_ROOT_DIR/lib/python2.7/site-packages/salome:$PYTHONPATH
+# local vars
+_pythonver=2.7
+_kernel_path=$KERNEL_ROOT_DIR/bin/salome
+_kernel_pythonpath=$KERNEL_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
+_kernel_librarypath=$KERNEL_ROOT_DIR/lib/salome
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$KERNEL_ROOT_DIR/lib/salome
+# PYTHONPATH
+if [[ $PYTHONPATH != *${_kernel_pythonpath}* ]]; then
+  export PYTHONPATH=${_kernel_pythonpath}:$PYTHONPATH
+fi
+if [[ $PYTHONPATH != *${_kernel_path}* ]]; then
+  export PYTHONPATH=${_kernel_path}:$PYTHONPATH
+fi
 
-export PATH=$PATH:$KERNEL_ROOT_DIR/bin/salome
+# LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != *${_kernel_librarypath}* ]]; then
+  export LD_LIBRARY_PATH=${_kernel_librarypath}:$LD_LIBRARY_PATH
+fi
+
+# PATH
+if [[ $PATH != *${_kernel_path}* ]]; then
+  export PATH=${_kernel_path}:$PATH
+fi