summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD78
-rw-r--r--salome-hexablock.profile32
-rw-r--r--salome-hexablock.sh52
4 files changed, 109 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c058bd7bcc25..65456c020df1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Jun 3 17:25:40 UTC 2016
+# Tue Dec 20 13:59:04 UTC 2016
pkgbase = salome-hexablock
pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - HEXABLOCK Module
- pkgver = 7.6.0
- pkgrel = 2
+ pkgver = 7.8.0
+ pkgrel = 1
url = http://www.salome-platform.org
arch = i686
arch = x86_64
@@ -11,10 +11,12 @@ pkgbase = salome-hexablock
makedepends = doxygen
makedepends = python2-sphinx
makedepends = swig2
- depends = salome-geom>=7.6.0
- depends = salome-geom<7.7.0
- source = salome-hexablock.profile
- md5sums = 566edb75962f9d51c991648e48c198fa
+ depends = salome-geom>=7.8.0
+ depends = salome-geom<7.9.0
+ source = http://files.salome-platform.org/Salome/Salome7.8.0/src7.8.0.tar.gz
+ source = salome-hexablock.sh
+ md5sums = 0f6de10ad9d9c646fce3ca21a7dab46a
+ md5sums = 126ed628ad633e662af1a14dfe05a460
pkgname = salome-hexablock
diff --git a/PKGBUILD b/PKGBUILD
index 4ee52a812154..8f0e22890677 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,33 @@
# Maintainer: Michele Mocciola <mickele>
pkgname=salome-hexablock
-pkgver=7.6.0
-pkgrel=2
+pkgver=7.8.0
+pkgrel=1
pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - HEXABLOCK Module"
url="http://www.salome-platform.org"
-depends=('salome-geom>=7.6.0' 'salome-geom<7.7.0')
+depends=("salome-geom>=${pkgver}" "salome-geom<${pkgver:0:2}$((${pkgver:2:1}+1)).0")
makedepends=('doxygen' 'python2-sphinx' 'swig2')
arch=('i686' 'x86_64')
license=('LGPL')
-source=(${pkgname}.profile)
+source=("http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz" "${pkgname}.sh")
-_source=hexablock
+#_source=hexablock
+_source=HEXABLOCK_SRC
_basedir=/opt/salome
_installdir=${_basedir}
_profiledir=${_basedir}/env.d
prepare() {
- msg "Connecting to git server..."
+# msg "Connecting to git server..."
+# if [[ -d ${_source} ]] ; then
+# rm -rf ${_source}
+# fi
+# git clone git://git.salome-platform.org/modules/${_source}.git
+# cd ${_source}
+# git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
+# msg "GIT checkout done or server timeout"
- if [[ -d ${_source} ]] ; then
- rm -rf ${_source}
- fi
-
- git clone git://git.salome-platform.org/modules/${_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" * `
@@ -45,16 +45,33 @@ build() {
mkdir -p "$srcdir/$_source/build"
cd "$srcdir/$_source/build"
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=$_installdir \
- -DCMAKE_CXX_STANDARD=98 \
- -DPYTHON_EXECUTABLE=/usr/bin/python2 \
- -DSWIG_EXECUTABLE=/usr/bin/swig-2 \
- -DLIBXML2_ROOT_DIR=/usr \
- -DLibXml2_DIR=/usr/lib/cmake/libxml2 \
- -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
- -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2 \
- -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2
+ # generic options
+ cmake_options+=" -DCMAKE_BUILD_TYPE=Release"
+ cmake_options+=" -DCMAKE_INSTALL_PREFIX=${_installdir}"
+
+ # debug options
+ cmake_options+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF"
+ cmake_options+=" -DSALOME_CMAKE_DEBUG:BOOL=OFF"
+
+ # mpi
+ cmake_options+=" -DSALOME_USE_MPI:BOOL=ON"
+
+ # python2
+ cmake_options+=" -DPYTHON_EXECUTABLE=/usr/bin/python2"
+
+ # sphinx-2
+ cmake_options+=" -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2"
+ cmake_options+=" -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2"
+
+ # swig2
+ cmake_options+=" -DSWIG_EXECUTABLE=/usr/bin/swig-2"
+
+ # libxml2
+ cmake_options+=" -DLIBXML2_ROOT_DIR=/usr"
+ cmake_options+=" -DLibXml2_DIR=/usr/lib/cmake/libxml2"
+ cmake_options+=" -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2"
+
+ cmake ${cmake_options} ..
make
}
@@ -70,10 +87,11 @@ package() {
sed -i -e "s|${pkgdir}||" ${_FILE}
done
- rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
-
- install -D -m755 "$srcdir/$pkgname.profile" \
- "${pkgdir}${_profiledir}/${pkgname}.sh"
+ # install profile
+ install -D -m755 "${srcdir}/${pkgname}.sh" \
+ "${pkgdir}${_profiledir}/${pkgname}.sh"
+ rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
}
-md5sums=('566edb75962f9d51c991648e48c198fa')
+md5sums=('0f6de10ad9d9c646fce3ca21a7dab46a'
+ '126ed628ad633e662af1a14dfe05a460')
diff --git a/salome-hexablock.profile b/salome-hexablock.profile
deleted file mode 100644
index 61fd8697ffe9..000000000000
--- a/salome-hexablock.profile
+++ /dev/null
@@ -1,32 +0,0 @@
-# module var
-export HEXABLOCK_ROOT_DIR=/opt/salome
-
-# local vars
-_pythonver=2.7
-_hexablock_path=$HEXABLOCK_ROOT_DIR/bin/salome
-_hexablock_librarypath=$HEXABLOCK_ROOT_DIR/lib/salome
-_hexablock_pythonpath=$HEXABLOCK_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
-_paraviewver=4.2
-_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 != *${_hexablock_pythonpath}* ]]; then
- export PYTHONPATH=${_hexablock_pythonpath}:$PYTHONPATH
-fi
-
-# LD_LIBRARY_PATH
-if [[ $LD_LIBRARY_PATH != *${_paraview_librarypath}* ]]; then
- export LD_LIBRARY_PATH=${_paraview_librarypath}:$LD_LIBRARY_PATH
-fi
-if [[ $LD_LIBRARY_PATH != *${_hexablock_librarypath}* ]]; then
- export LD_LIBRARY_PATH=${_hexablock_librarypath}:$LD_LIBRARY_PATH
-fi
-
-# PATH
-if [[ $PATH != *${_hexablock_path}* ]]; then
- export PATH=${_hexablock_path}:$PATH
-fi
diff --git a/salome-hexablock.sh b/salome-hexablock.sh
new file mode 100644
index 000000000000..b9ac43bd5fe0
--- /dev/null
+++ b/salome-hexablock.sh
@@ -0,0 +1,52 @@
+# module var
+export HEXABLOCK_ROOT_DIR=/opt/salome
+
+# local vars
+_hexablock_pythonver=2.7
+_hexablock_paraviewver=5.0
+_hexablock_path=$HEXABLOCK_ROOT_DIR/bin/salome
+_hexablock_librarypath=$HEXABLOCK_ROOT_DIR/lib/salome
+_hexablock_pythonpath=$HEXABLOCK_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
+_hexablock_paraview_pythonpath="/usr/lib/paraview-${_hexablock_paraviewver}/site-packages:/usr/lib/paraview-${_hexablock_paraviewver}/site-packages/vtk"
+_hexablock_paraview_librarypath="/usr/lib/paraview-${_hexablock_paraviewver}"
+
+# PYTHONPATH
+if [[ $PYTHONPATH != ${_hexablock_pythonpath} && $PYTHONPATH != *:${_hexablock_pythonpath}&& $PYTHONPATH != ${_hexablock_pythonpath}:* && $PYTHONPATH != *:${_hexablock_pythonpath}:* ]]; then
+ if [[ -z "$PYTHONPATH" ]]; then
+ export PYTHONPATH=${_hexablock_pythonpath}
+ else
+ export PYTHONPATH=${_hexablock_pythonpath}:$PYTHONPATH
+ fi
+fi
+if [[ $PYTHONPATH != ${_hexablock_paraview_pythonpath} && $PYTHONPATH != *:${_hexablock_paraview_pythonpath} && $PYTHONPATH != ${_hexablock_paraview_pythonpath}:* && $PYTHONPATH != *:${_hexablock_paraview_pythonpath}:* ]]; then
+ if [[ -z "$PYTHONPATH" ]]; then
+ export PYTHONPATH=${_hexablock_paraview_pythonpath}
+ else
+ export PYTHONPATH=${_hexablock_paraview_pythonpath}:$PYTHONPATH
+ fi
+fi
+
+# LD_LIBRARY_PATH
+if [[ $LD_LIBRARY_PATH != ${_hexablock_librarypath} && $LD_LIBRARY_PATH != *:${_hexablock_librarypath} && $LD_LIBRARY_PATH != ${_hexablock_librarypath}:* && $LD_LIBRARY_PATH != *:${_hexablock_librarypath}:* ]]; then
+ if [[ -z "$LD_LIBRARY_PATH" ]]; then
+ export LD_LIBRARY_PATH=${_hexablock_librarypath}
+ else
+ export LD_LIBRARY_PATH=${_hexablock_librarypath}:$LD_LIBRARY_PATH
+ fi
+fi
+if [[ $LD_LIBRARY_PATH != ${_hexablock_paraview_librarypath} && $LD_LIBRARY_PATH != *:${_hexablock_paraview_librarypath} && $LD_LIBRARY_PATH != ${_hexablock_paraview_librarypath}:* && $LD_LIBRARY_PATH != *:${_hexablock_paraview_librarypath}:* ]]; then
+ if [[ -z "$LD_LIBRARY_PATH" ]]; then
+ export LD_LIBRARY_PATH=${_hexablock_paraview_librarypath}
+ else
+ export LD_LIBRARY_PATH=${_hexablock_paraview_librarypath}:$LD_LIBRARY_PATH
+ fi
+fi
+
+# PATH
+if [[ $PATH != ${_hexablock_path} && $PATH != *:${_hexablock_path} && $PATH != ${_hexablock_path}:* && $PATH != *:${_hexablock_path}:* ]]; then
+ if [ -z "$PATH" ]; then
+ export PATH=${_hexablock_path}
+ else
+ export PATH=${_hexablock_path}:$PATH
+ fi
+fi