From 786c2c203816dc884a62f3dfc695f2ad536652ab Mon Sep 17 00:00:00 2001 From: Erik B Knudsen Date: Fri, 24 Nov 2023 15:44:11 +0100 Subject: [PATCH] allow prefix build --- Ubuntu_22.04/dagmc-install.sh | 28 +++++++++++++++++++++++---- Ubuntu_22.04/double_down-install.sh | 30 ++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/Ubuntu_22.04/dagmc-install.sh b/Ubuntu_22.04/dagmc-install.sh index 3054f97..b3fd70f 100755 --- a/Ubuntu_22.04/dagmc-install.sh +++ b/Ubuntu_22.04/dagmc-install.sh @@ -12,6 +12,15 @@ WD=`pwd` name=`basename $0` package_name='dagmc' +install_prefix="/opt" +if [ "x" != "x$LOCAL_INSTALL_PREFIX" ]; then + install_prefix=$LOCAL_INSTALL_PREFIX +fi +build_prefix="$HOME/openmc" +if [ "x" != "x$OPENMC_BUILD_PREFIX" ]; then + build_prefix=$OPENMC_BUILD_PREFIX +fi + #if there is a .done-file then skip this step if [ ! -e ${name}.done ]; then @@ -23,10 +32,21 @@ if [ ! -e ${name}.done ]; then ccores=$1 fi - mkdir -p $HOME/openmc/DAGMC - cd $HOME/openmc/DAGMC - git clone --single-branch --branch develop --depth 1 https://github.com/svalinn/DAGMC.git - mkdir build + mkdir -p ${build_prefix}/openmc/DAGMC + cd ${build_prefix}/openmc/DAGMC + if [ ! -e DAGMC ]; then + git clone --branch develop https://github.com/svalinn/DAGMC.git + cd DAGMC + else + cd DAGMC; git pull + fi + + for patch in `ls ${WD}/../patches/dagmc_*.patch`; do + patch -p1 < $patch + done + + cd .. + mkdir -p build cd build cmake ../DAGMC -DBUILD_TALLY=ON \ -DMOAB_DIR=$HOME/openmc/MOAB \ diff --git a/Ubuntu_22.04/double_down-install.sh b/Ubuntu_22.04/double_down-install.sh index a24a959..e807ef0 100755 --- a/Ubuntu_22.04/double_down-install.sh +++ b/Ubuntu_22.04/double_down-install.sh @@ -16,6 +16,15 @@ WD=`pwd` name=`basename $0` package_name='double_down' +install_prefix="/opt" +if [ "x" != "x$LOCAL_INSTALL_PREFIX" ]; then + install_prefix=$LOCAL_INSTALL_PREFIX +fi +build_prefix="$HOME/openmc" +if [ "x" != "x$OPENMC_BUILD_PREFIX" ]; then + build_prefix=$OPENMC_BUILD_PREFIX +fi + #if there is a .done-file then skip this step if [ ! -e ${name}.done ]; then sudo apt-get install --yes doxygen\ @@ -27,18 +36,21 @@ if [ ! -e ${name}.done ]; then ccores=$1 fi - mkdir -p $HOME/openmc/double-down - cd $HOME/openmc/double-down - git clone --single-branch --branch develop --depth 1 https://github.com/pshriwise/double-down.git - mkdir build - cd build - cmake ../double-down -DMOAB_DIR=$HOME/openmc/MOAB \ - -DCMAKE_INSTALL_PREFIX=$HOME/openmc/double-down + mkdir -p ${build_prefix}/openmc/double-down + cd ${build_prefix}/openmc/double-down + if [ ! -d double-down ]; then + git clone --single-branch --branch develop --depth 1 https://github.com/pshriwise/double-down.git + fi - make -j $ccores + mkdir -p build + cd build + cmake ../double-down -DMOAB_DIR=${install_prefix} \ + -DCMAKE_INSTALL_PREFIX=${install_prefix} + make -j ${ccores} make install - cd ${WD} + #touch a lock file to avoid uneccessary rebuilds + cd $WD touch ${name}.done else echo double-down appears to be already installed \(lock file ${name}.done exists\) - skipping.