Commit 83763f20 authored by incardon's avatar incardon

Fixing build for numerics

parent 41fbf469
......@@ -9,7 +9,7 @@ parallel (
checkout scm
stage ('build_gin')
{
sh "./build_pdata.sh $WORKSPACE $NODE_NAME numerics"
sh "./build.sh $WORKSPACE $NODE_NAME numerics"
}
stage ('run_gin')
......@@ -35,7 +35,7 @@ parallel (
checkout scm
stage ('build_sb15')
{
sh "./build_pdata.sh $WORKSPACE $NODE_NAME numerics"
sh "./build.sh $WORKSPACE $NODE_NAME numerics"
}
stage ('run_sb15')
......
......@@ -40,9 +40,10 @@ then
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
elif [ x"$3" == x"numerics" ]; then
CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
branch=$(git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3)
CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$branch -m -s -c "--prefix=/home/jenkins/openfpm_install"
mv $HOME/openfpm_vars $HOME/openfpm_vars_$branch
source $HOME/openfpm_vars_$branch
make $3
else
CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install --no-recursion"
......@@ -98,9 +99,9 @@ else
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
elif [ x"$3" == x"numerics" ]; then
./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
branch=$(git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3)
./install -i $HOME/$branch -m -s -c "--prefix=/home/jenkins/openfpm_install"
source $HOME/openfpm_vars_$branch
make $3
else
./install -i $HOME/$5 -m -s -c "--prefix=/Users/jenkins/openfpm_install --no-recursion"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment